新功能开发

controllers/drug_stock_api_contorller.go

@@ -58,7 +58,7 @@ func DrugStockManagerApiRegistRouters() {
 	//beego.Router("/api/drugreturn/config", &StockDrugApiController{}, "get:GetAllSalesReturnConfig")
 	//
 	////库存查询
-	//beego.Router("/api/drugstock/query", &StockDrugApiController{}, "get:GetQueryInfo")
+	beego.Router("/api/drugstock/query", &StockDrugApiController{}, "get:GetDrugQueryInfo")
 	//
 	//beego.Router("/api/drugstock/detail", &StockDrugApiController{}, "get:GetDetailInfo")
 	//
@@ -89,7 +89,7 @@ func (c *StockDrugApiController) CreateDrugWarehouse() {
 	timeArr := strings.Split(timeStr, "-")
 	total, _ := service.FindAllWarehouseTotal(adminUserInfo.CurrentOrgId)
 	total = total + 1
-	warehousing_order := "RKD" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+	warehousing_order := "YPRKD" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
 	operation_time := time.Now().Unix()
 	creater := adminUserInfo.AdminUser.Id
 	warehousing := models.DrugWarehouse{
@@ -144,6 +144,14 @@ func (c *StockDrugApiController) CreateDrugWarehouse() {
 				price, _ := strconv.ParseFloat(items["price"].(string), 64)
 				total := float64(warehousing_count) * price
 
+				if items["retail_price"] == nil || reflect.TypeOf(items["retail_price"]).String() != "string" {
+					utils.ErrorLog("retail_price")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				retail_price, _ := strconv.ParseFloat(items["retail_price"].(string), 64)
+				retail_price_total := float64(warehousing_count) * retail_price
+
 				var productDates int64
 				var expiryDates int64
 
@@ -208,6 +216,8 @@ func (c *StockDrugApiController) CreateDrugWarehouse() {
 					Type:             types,
 					Manufacturer:     manufacturer_id,
 					Dealer:           dealer_id,
+					RetailPrice:      retail_price,
+					RetailTotalPrice: retail_price_total,
 				}
 				warehousingInfo = append(warehousingInfo, warehouseInfo)
 
@@ -520,6 +530,14 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 				price, _ := strconv.ParseFloat(items["price"].(string), 64)
 				total := float64(warehousing_count) * price
 
+				if items["retail_price"] == nil || reflect.TypeOf(items["retail_price"]).String() != "string" {
+					utils.ErrorLog("retail_price")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				retail_price, _ := strconv.ParseFloat(items["retail_price"].(string), 64)
+				retail_price_total := float64(warehousing_count) * retail_price
+
 				var productDates int64
 				var expiryDates int64
 
@@ -592,6 +610,8 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 						Type:             types,
 						Manufacturer:     manufacturer_id,
 						Dealer:           dealer_id,
+						RetailPrice:      retail_price,
+						RetailTotalPrice: retail_price_total,
 					}
 					warehousingInfo = append(warehousingInfo, warehouseInfo)
 
@@ -614,6 +634,8 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 						Type:             types,
 						Manufacturer:     manufacturer_id,
 						Dealer:           dealer_id,
+						RetailPrice:      retail_price,
+						RetailTotalPrice: retail_price_total,
 					}
 					upDateWarehousingInfo = append(upDateWarehousingInfo, warehouseInfo)
 				}
@@ -701,7 +723,7 @@ func (c *StockDrugApiController) CreateDrugSalesReturn() {
 	timeArr := strings.Split(timeStr, "-")
 	total, _ := service.FindAllSalesReturnTotal(adminUserInfo.CurrentOrgId)
 	total = total + 1
-	orderNumber := "THD" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
+	orderNumber := "YPTHD" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
 
 	salesReturn := models.DrugSalesReturn{
 		OrderNumber:  orderNumber,
@@ -748,24 +770,39 @@ func (c *StockDrugApiController) CreateDrugSalesReturn() {
 
 					return
 				}
-
 				count, _ := strconv.ParseInt(return_count, 10, 64)
-				price, _ := strconv.ParseFloat(items["price"].(string), 10)
+
+				if items["price"] == nil || reflect.TypeOf(items["price"]).String() != "string" {
+					utils.ErrorLog("price")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				price, _ := strconv.ParseFloat(items["price"].(string), 64)
 				total := float64(count) * price
 
+				if items["retail_price"] == nil || reflect.TypeOf(items["retail_price"]).String() != "string" {
+					utils.ErrorLog("retail_price")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				retail_price, _ := strconv.ParseFloat(items["retail_price"].(string), 64)
+				retail_price_total := float64(count) * retail_price
+
 				salesReturnInfo := &models.DrugSalesReturnInfo{
-					OrderNumber:   salesReturn.OrderNumber,
-					SalesReturnId: salesReturn.ID,
-					DrugId:        drug_id,
-					Count:         count,
-					Price:         price,
-					Total:         total,
-					Status:        1,
-					Ctime:         ctime,
-					OrgId:         adminUserInfo.CurrentOrgId,
-					Type:          types,
-					Manufacturer:  manufacturer_id,
-					Dealer:        dealer_id,
+					OrderNumber:      salesReturn.OrderNumber,
+					SalesReturnId:    salesReturn.ID,
+					DrugId:           drug_id,
+					Count:            count,
+					Price:            price,
+					Total:            total,
+					Status:           1,
+					Ctime:            ctime,
+					OrgId:            adminUserInfo.CurrentOrgId,
+					Type:             types,
+					Manufacturer:     manufacturer_id,
+					Dealer:           dealer_id,
+					RetailPrice:      retail_price,
+					RetailTotalPrice: retail_price_total,
 				}
 
 				salesReturnInfos = append(salesReturnInfos, salesReturnInfo)
@@ -776,7 +813,7 @@ func (c *StockDrugApiController) CreateDrugSalesReturn() {
 	errs := service.CreateDrugSalesReturnInfo(salesReturnInfos)
 	if errs != nil {
 		utils.ErrorLog(errs.Error())
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateReturnFail)
 		return
 	}
 
@@ -865,8 +902,10 @@ func (this *StockDrugApiController) DeleteDrugSalesReturnInfo() {
 }
 func (this *StockDrugApiController) GetDrugSalesReturnInfoList() {
 	id, _ := this.GetInt64("id", 0)
-	list, _ := service.FindAllDrugSalesReturnInfoById(id)
-	salesReturn, _ := service.FindAllDrugSalesReturnById(id)
+	adminUserInfo := this.GetAdminUserInfo()
+
+	list, _ := service.FindAllDrugSalesReturnInfoById(id, adminUserInfo.CurrentOrgId)
+	salesReturn, _ := service.FindAllDrugSalesReturnById(id, adminUserInfo.CurrentOrgId)
 
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list":        list,
@@ -948,36 +987,61 @@ func (c *StockDrugApiController) EditDrugReturnInfo() {
 				}
 				id := int64(items["id"].(float64))
 
+				if items["price"] == nil || reflect.TypeOf(items["price"]).String() != "string" {
+					utils.ErrorLog("price")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+
+				price, _ := strconv.ParseFloat(items["price"].(string), 64)
+				total := float64(count) * price
+
+				if items["retail_price"] == nil || reflect.TypeOf(items["retail_price"]).String() != "string" {
+					utils.ErrorLog("retail_price")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				retail_price, _ := strconv.ParseFloat(items["retail_price"].(string), 64)
+				retail_price_total := float64(count) * retail_price
+
 				if id == 0 {
 					returnInfo := &models.DrugSalesReturnInfo{
-						DrugId:        drug_id,
-						Count:         count,
-						Status:        1,
-						Ctime:         ctime,
-						OrgId:         adminUserInfo.CurrentOrgId,
-						OrderNumber:   sales.OrderNumber,
-						SalesReturnId: sales.ID,
-						Mtime:         time.Now().Unix(),
-						Type:          types,
-						Manufacturer:  manufacturer_id,
-						Dealer:        dealer_id,
+						DrugId:           drug_id,
+						Count:            count,
+						Status:           1,
+						Ctime:            ctime,
+						OrgId:            adminUserInfo.CurrentOrgId,
+						OrderNumber:      sales.OrderNumber,
+						SalesReturnId:    sales.ID,
+						Mtime:            time.Now().Unix(),
+						Type:             types,
+						Manufacturer:     manufacturer_id,
+						Dealer:           dealer_id,
+						RetailPrice:      retail_price,
+						RetailTotalPrice: retail_price_total,
+						Total:            total,
+						Price:            price,
 					}
 					returnInfos = append(returnInfos, returnInfo)
 
 				} else {
 					returnInfo := &models.DrugSalesReturnInfo{
-						ID:            id,
-						DrugId:        drug_id,
-						Count:         count,
-						Status:        1,
-						Ctime:         ctime,
-						OrgId:         adminUserInfo.CurrentOrgId,
-						OrderNumber:   sales.OrderNumber,
-						SalesReturnId: sales.ID,
-						Mtime:         time.Now().Unix(),
-						Type:          types,
-						Manufacturer:  manufacturer_id,
-						Dealer:        dealer_id,
+						ID:               id,
+						DrugId:           drug_id,
+						Count:            count,
+						Status:           1,
+						Ctime:            ctime,
+						OrgId:            adminUserInfo.CurrentOrgId,
+						OrderNumber:      sales.OrderNumber,
+						SalesReturnId:    sales.ID,
+						Mtime:            time.Now().Unix(),
+						Type:             types,
+						Manufacturer:     manufacturer_id,
+						Dealer:           dealer_id,
+						RetailPrice:      retail_price,
+						RetailTotalPrice: retail_price_total,
+						Total:            total,
+						Price:            price,
 					}
 					upDateReturnInfos = append(upDateReturnInfos, returnInfo)
 				}
@@ -997,7 +1061,7 @@ func (c *StockDrugApiController) EditDrugReturnInfo() {
 
 	if errs != nil {
 		utils.ErrorLog(errs.Error())
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateReturnFail)
 		return
 	}
 
@@ -1030,7 +1094,7 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 	warehousing_out_order := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000"
 	number, _ := strconv.ParseInt(warehousing_out_order, 10, 64)
 	number = number + total
-	warehousing_out_order = "CKD" + strconv.FormatInt(number, 10)
+	warehousing_out_order = "YPCKD" + strconv.FormatInt(number, 10)
 	operation_time := time.Now().Unix()
 	creater := adminUserInfo.AdminUser.Id
 
@@ -1083,9 +1147,17 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 				}
 				price, _ := strconv.ParseFloat(items["price"].(string), 64)
 
+				if items["retail_price"] == nil || reflect.TypeOf(items["retail_price"]).String() != "string" {
+					utils.ErrorLog("retail_price")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				retail_price, _ := strconv.ParseFloat(items["retail_price"].(string), 64)
+
 				count, _ := strconv.ParseInt(items["count"].(string), 10, 64)
 
 				total := float64(count) * price
+				retail_price_total := float64(count) * retail_price
 				remark := items["remark"].(string)
 
 				warehouseOutInfo := &models.DrugWarehouseOutInfo{
@@ -1102,6 +1174,8 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 					Type:                    types,
 					Manufacturer:            manufacturer_id,
 					Dealer:                  dealer_id,
+					RetailPrice:             retail_price,
+					RetailTotalPrice:        retail_price_total,
 				}
 				warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
@@ -1112,7 +1186,7 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 	info, _ := service.FindLastDrugWarehousingOutInfo(warehouseOut.WarehouseOutOrderNumber)
 	if errs != nil {
 		utils.ErrorLog(errs.Error())
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockOutFail)
 		return
 	}
 
@@ -1203,8 +1277,9 @@ func (this *StockDrugApiController) DeleteDrugWarehouseOutInfo() {
 }
 func (c *StockDrugApiController) GetDrugWarehouseOutInfoList() {
 	id, _ := c.GetInt64("id", 0)
-	warehouseOutInfo, _ := service.FindDrugWarehouseOutInfoById(id)
-	warehouseOut, _ := service.FindDrugWareHouseOutById(id)
+	adminInfo := c.GetAdminUserInfo()
+	warehouseOutInfo, _ := service.FindDrugWarehouseOutInfoById(id, adminInfo.CurrentOrgId)
+	warehouseOut, _ := service.FindDrugWareHouseOutById(id, adminInfo.CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"list": warehouseOutInfo,
 		"info": warehouseOut,
@@ -1234,7 +1309,7 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 		return
 	}
 
-	warehouseOut, _ := service.FindDrugWareHouseOutById(id)
+	warehouseOut, _ := service.FindDrugWareHouseOutById(id, adminUserInfo.CurrentOrgId)
 
 	tempWarehouseOut := models.DrugWarehouseOut{
 		ID:               warehouseOut.ID,
@@ -1285,7 +1360,16 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 				}
 				price, _ := strconv.ParseFloat(items["price"].(string), 64)
 
+				if items["retail_price"] == nil || reflect.TypeOf(items["retail_price"]).String() != "string" {
+					utils.ErrorLog("retail_price")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				retail_price, _ := strconv.ParseFloat(items["retail_price"].(string), 64)
+
 				total := float64(count) * price
+				retail_price_total := float64(count) * retail_price
+
 				remark := items["remark"].(string)
 
 				if items["id"] == nil || reflect.TypeOf(items["id"]).String() != "float64" {
@@ -1312,6 +1396,8 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 						Dealer:                  dealer_id,
 						IsSys:                   0,
 						SysRecordTime:           0,
+						RetailPrice:             retail_price,
+						RetailTotalPrice:        retail_price_total,
 					}
 					warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
@@ -1348,6 +1434,8 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 						Dealer:                  dealer_id,
 						IsSys:                   is_sys,
 						SysRecordTime:           sys_record_time,
+						RetailPrice:             retail_price,
+						RetailTotalPrice:        retail_price_total,
 					}
 					upDateWarehouseOutInfos = append(upDateWarehouseOutInfos, warehouseOutInfo)
 				}
@@ -1367,7 +1455,7 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 
 	if errs != nil {
 		utils.ErrorLog(errs.Error())
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockOutFail)
 		return
 	}
 
@@ -1447,17 +1535,37 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 
 				count, _ := strconv.ParseInt(return_count, 10, 64)
 
+				if items["price"] == nil || reflect.TypeOf(items["price"]).String() != "string" {
+					utils.ErrorLog("price")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				price, _ := strconv.ParseFloat(items["price"].(string), 64)
+				total := float64(count) * price
+
+				if items["retail_price"] == nil || reflect.TypeOf(items["retail_price"]).String() != "string" {
+					utils.ErrorLog("retail_price")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				retail_price, _ := strconv.ParseFloat(items["retail_price"].(string), 64)
+				retail_price_total := float64(count) * retail_price
+
 				cancelStockInfo := &models.DrugCancelStockInfo{
-					OrderNumber:   cancelStock.OrderNumber,
-					CancelStockId: cancelStock.ID,
-					DrugId:        drug_id,
-					Count:         count,
-					Status:        1,
-					Ctime:         ctime,
-					OrgId:         adminUserInfo.CurrentOrgId,
-					Type:          types,
-					Manufacturer:  manufacturer_id,
-					Dealer:        dealer_id,
+					OrderNumber:      cancelStock.OrderNumber,
+					CancelStockId:    cancelStock.ID,
+					DrugId:           drug_id,
+					Count:            count,
+					Status:           1,
+					Ctime:            ctime,
+					OrgId:            adminUserInfo.CurrentOrgId,
+					Type:             types,
+					Manufacturer:     manufacturer_id,
+					Dealer:           dealer_id,
+					Total:            total,
+					RetailPrice:      retail_price,
+					RetailTotalPrice: retail_price_total,
+					Price:            price,
 				}
 				cancelStockInfos = append(cancelStockInfos, cancelStockInfo)
 
@@ -1478,9 +1586,10 @@ func (c *StockDrugApiController) CreateDrugCancelStock() {
 }
 func (c *StockDrugApiController) GetDrugCancelStockInfoList() {
 	id, _ := c.GetInt64("id", 0)
+	adminUserInfo := c.GetAdminUserInfo()
 
-	cancelStockInfoList, _ := service.FindDrugCancelStockInfoById(id)
-	info, _ := service.FindCancelStockById(id)
+	cancelStockInfoList, _ := service.FindDrugCancelStockInfoById(id, adminUserInfo.CurrentOrgId)
+	info, _ := service.FindCancelStockById(id, adminUserInfo.CurrentOrgId)
 
 	c.ServeSuccessJSON(map[string]interface{}{
 		"list": cancelStockInfoList,
@@ -1633,6 +1742,24 @@ func (c *StockDrugApiController) EditDrugCancelStock() {
 
 				count, _ := strconv.ParseInt(items["count"].(string), 10, 64)
 
+				//count, _ := strconv.ParseInt(return_count, 10, 64)
+
+				if items["price"] == nil || reflect.TypeOf(items["price"]).String() != "string" {
+					utils.ErrorLog("price")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				price, _ := strconv.ParseFloat(items["price"].(string), 64)
+				total := float64(count) * price
+
+				if items["retail_price"] == nil || reflect.TypeOf(items["retail_price"]).String() != "string" {
+					utils.ErrorLog("retail_price")
+					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				retail_price, _ := strconv.ParseFloat(items["retail_price"].(string), 64)
+				retail_price_total := float64(count) * retail_price
+
 				if items["id"] == nil || reflect.TypeOf(items["id"]).String() != "float64" {
 					utils.ErrorLog("id")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -1642,34 +1769,42 @@ func (c *StockDrugApiController) EditDrugCancelStock() {
 
 				if id == 0 {
 					cancelStockInfo := &models.DrugCancelStockInfo{
-						DrugId:        drug_id,
-						Count:         count,
-						Status:        1,
-						Ctime:         ctime,
-						OrgId:         adminUserInfo.CurrentOrgId,
-						OrderNumber:   cancelStock.OrderNumber,
-						CancelStockId: cancelStock.ID,
-						Mtime:         time.Now().Unix(),
-						Type:          types,
-						Manufacturer:  manufacturer_id,
-						Dealer:        dealer_id,
+						DrugId:           drug_id,
+						Count:            count,
+						Status:           1,
+						Ctime:            ctime,
+						OrgId:            adminUserInfo.CurrentOrgId,
+						OrderNumber:      cancelStock.OrderNumber,
+						CancelStockId:    cancelStock.ID,
+						Mtime:            time.Now().Unix(),
+						Type:             types,
+						Manufacturer:     manufacturer_id,
+						Dealer:           dealer_id,
+						RetailPrice:      retail_price,
+						RetailTotalPrice: retail_price_total,
+						Price:            price,
+						Total:            total,
 					}
 					cancelStockInfos = append(cancelStockInfos, cancelStockInfo)
 
 				} else {
 					cancelStockInfo := &models.DrugCancelStockInfo{
-						ID:            id,
-						DrugId:        drug_id,
-						Count:         count,
-						Status:        1,
-						Ctime:         ctime,
-						OrgId:         adminUserInfo.CurrentOrgId,
-						OrderNumber:   cancelStock.OrderNumber,
-						CancelStockId: cancelStock.ID,
-						Mtime:         time.Now().Unix(),
-						Type:          types,
-						Manufacturer:  manufacturer_id,
-						Dealer:        dealer_id,
+						ID:               id,
+						DrugId:           drug_id,
+						Count:            count,
+						Status:           1,
+						Ctime:            ctime,
+						OrgId:            adminUserInfo.CurrentOrgId,
+						OrderNumber:      cancelStock.OrderNumber,
+						CancelStockId:    cancelStock.ID,
+						Mtime:            time.Now().Unix(),
+						Type:             types,
+						Manufacturer:     manufacturer_id,
+						Dealer:           dealer_id,
+						RetailPrice:      retail_price,
+						RetailTotalPrice: retail_price_total,
+						Price:            price,
+						Total:            total,
 					}
 					upDateCancelStockInfos = append(upDateCancelStockInfos, cancelStockInfo)
 				}
@@ -1689,7 +1824,7 @@ func (c *StockDrugApiController) EditDrugCancelStock() {
 
 	if errs != nil {
 		utils.ErrorLog(errs.Error())
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateCancelStockFail)
 		return
 	}
 
@@ -1703,11 +1838,13 @@ func (c *StockDrugApiController) GetAllConfig() {
 	adminUserInfo := c.GetAdminUserInfo()
 	manufacturer, _ := service.FindAllManufacturer(adminUserInfo.CurrentOrgId)
 	dealer, _ := service.FindAllDealer(adminUserInfo.CurrentOrgId)
+	stockIns, _ := service.FindStockInNumber(adminUserInfo.CurrentOrgId)
 	drugs, _ := service.GetDrugs(adminUserInfo.CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"manufacturer": manufacturer,
 		"dealer":       dealer,
 		"drugs":        drugs,
+		"numbers":      stockIns,
 	})
 }
 
@@ -1724,3 +1861,20 @@ func (c *StockDrugApiController) GetAllDrugStock() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 	}
 }
+
+func (c *StockDrugApiController) GetDrugQueryInfo() {
+	page, _ := c.GetInt64("page", -1)
+	limit, _ := c.GetInt64("limit", -1)
+	keyword := c.GetString("keyword")
+
+	adminUserInfo := c.GetAdminUserInfo()
+	list, total, err := service.FindAllStockInfo(adminUserInfo.CurrentOrgId, page, limit, keyword)
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list":  list,
+			"total": total,
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}

controllers/gobal_config_api_controller.go

@@ -29,7 +29,10 @@ type GobalConfigApiController struct {
 
 func GobalConfigRegistRouters() {
 	beego.Router("/api/stock/automaticreduce/isopen", &GobalConfigApiController{}, "post:PostStockConfig")
+	beego.Router("/api/drugstock/automaticreduce/isopen", &GobalConfigApiController{}, "post:PostDrugStockConfig")
+
 	beego.Router("/api/automaticreduce/get", &GobalConfigApiController{}, "get:GetConfig")
+	beego.Router("/api/drugstockautomaticreduce/get", &GobalConfigApiController{}, "get:GetDrugStockConfig")
 
 	beego.Router("/api/print/template/commit", &GobalConfigApiController{}, "post:PostPrintTemplateTwo")
 
@@ -113,6 +116,49 @@ func (c *GobalConfigApiController) PostStockConfig() {
 	return
 }
 
+func (c *GobalConfigApiController) PostDrugStockConfig() {
+	is_open, _ := c.GetInt64("is_open", 0)
+	adminUserInfo := c.GetAdminUserInfo()
+	org_id := adminUserInfo.CurrentOrgId
+	config := models.DrugStockConfig{
+		OrgId:      org_id,
+		IsOpen:     is_open,
+		Status:     1,
+		CreateTime: time.Now().Unix(),
+		UpdateTime: time.Now().Unix(),
+	}
+
+	errs, configs := service.FindDrugStockAutomaticReduceRecordByOrgId(org_id)
+
+	if errs == gorm.ErrRecordNotFound {
+		err := service.CreateDrugAutomaticReduceRecord(&config)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+			return
+		}
+
+	} else if errs == nil {
+		modifyConfig := models.DrugStockConfig{
+			ID:         configs.ID,
+			OrgId:      org_id,
+			IsOpen:     is_open,
+			Status:     1,
+			CreateTime: time.Now().Unix(),
+			UpdateTime: time.Now().Unix(),
+		}
+		err := service.UpdateDrugStockAutomaticReduceRecord(&modifyConfig)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
+			return
+		}
+	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"is_open": is_open,
+	})
+
+	return
+}
+
 func (c *GobalConfigApiController) GetConfig() {
 	adminUserInfo := c.GetAdminUserInfo()
 	_, config := service.FindAutomaticReduceRecordByOrgId(adminUserInfo.CurrentOrgId)
@@ -121,6 +167,14 @@ func (c *GobalConfigApiController) GetConfig() {
 	})
 }
 
+func (c *GobalConfigApiController) GetDrugStockConfig() {
+	adminUserInfo := c.GetAdminUserInfo()
+	_, config := service.FindDrugStockAutomaticReduceRecordByOrgId(adminUserInfo.CurrentOrgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"config": config,
+	})
+}
+
 func (c *GobalConfigApiController) PostPrintTemplate() {
 	template_id, _ := c.GetInt64("template_id", 0)
 	adminUserInfo := c.GetAdminUserInfo()

controllers/manager_center_api_controller.go

@@ -345,6 +345,7 @@ func (c *ManagerCenterApiController) GetBaseDrugLibList() {
 }
 
 func (c *ManagerCenterApiController) CreateMedicineInsurancePercent() {
+	module, _ := c.GetInt64("module", 0)
 	adminInfo := c.GetAdminUserInfo()
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
@@ -356,43 +357,46 @@ func (c *ManagerCenterApiController) CreateMedicineInsurancePercent() {
 
 	var mips []*models.MedicineInsurancePercentage
 	var errs error
+	record_time := time.Now().Unix()
 
 	if dataBody["mip"] != nil && reflect.TypeOf(dataBody["mip"]).String() == "[]interface {}" {
-		thisCancelStock, _ := dataBody["cancelStock"].([]interface{})
-		if len(thisCancelStock) > 0 {
-			for _, item := range thisCancelStock {
+		mip_map, _ := dataBody["mip"].([]interface{})
+		if len(mip_map) > 0 {
+			for _, item := range mip_map {
 				items := item.(map[string]interface{})
 
-				if items["drug_id"] == nil || reflect.TypeOf(items["drug_id"]).String() != "float64" {
-					utils.ErrorLog("drug_id")
+				if items["type_id"] == nil || reflect.TypeOf(items["type_id"]).String() != "float64" {
+					utils.ErrorLog("type_id")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 					return
 				}
-				drug_id := int64(items["drug_id"].(float64))
+				type_id := int64(items["type_id"].(float64))
 
-				if items["type"] == nil || reflect.TypeOf(items["type"]).String() != "float64" {
-					utils.ErrorLog("type")
+				if items["medicine_insurance_type"] == nil || reflect.TypeOf(items["medicine_insurance_type"]).String() != "float64" {
+					utils.ErrorLog("medicine_insurance_type")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 					return
 				}
-				types := int64(items["type"].(float64))
+				types := int64(items["medicine_insurance_type"].(float64))
 
-				if items["percent"] == nil || reflect.TypeOf(items["percent"]).String() != "float64" {
+				if items["percent"] == nil || reflect.TypeOf(items["percent"]).String() != "string" {
 					utils.ErrorLog("percent")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 					return
 				}
-				percent := items["percent"].(float64)
-
+				percent, _ := strconv.ParseFloat(items["percent"].(string), 64)
+				//percent := items["percent"].(float64)
 				mip_temp := &models.MedicineInsurancePercentage{
-					DrugId:                drug_id,
+					TypeId:                type_id,
 					Status:                1,
 					Ctime:                 time.Now().Unix(),
 					Mtime:                 time.Now().Unix(),
-					RecordTime:            time.Now().Unix(),
+					RecordTime:            record_time,
 					MedicineInsuranceType: types,
 					UserOrgId:             adminInfo.CurrentOrgId,
 					Percent:               percent,
+					Module:                module,
+					GoodId:                0,
 				}
 				mips = append(mips, mip_temp)
 
@@ -401,7 +405,6 @@ func (c *ManagerCenterApiController) CreateMedicineInsurancePercent() {
 
 		for _, item := range mips {
 			errs = service.CreateMedicineInsurancePercentage(item)
-
 		}
 	}
 
@@ -1233,7 +1236,7 @@ func (c *ManagerCenterApiController) CreateGoodInfo() {
 	is_special_diseases, _ := c.GetInt64("is_special_diseases", 0)
 	is_record, _ := c.GetInt64("is_record")
 	statistics_category, _ := c.GetInt64("statistics_category")
-	good_status, _ := c.GetInt64("good_status")
+	good_status := c.GetString("good_status")
 
 	default_count, _ := c.GetInt64("default_count")
 	sign, _ := c.GetInt64("sign")
@@ -1333,7 +1336,7 @@ func (c *ManagerCenterApiController) ModifyGoodInfo() {
 	is_special_diseases, _ := c.GetInt64("is_special_diseases", 0)
 	is_record, _ := c.GetInt64("is_record")
 	statistics_category, _ := c.GetInt64("statistics_category")
-	good_status, _ := c.GetInt64("good_status")
+	good_status := c.GetString("good_status")
 
 	default_count, _ := c.GetInt64("default_count")
 	sign, _ := c.GetInt64("sign")
@@ -1472,8 +1475,10 @@ func (c *ManagerCenterApiController) GetGoodInfoById() {
 
 func (c *ManagerCenterApiController) GetMedicineInsurancePercent() {
 	adminUser := c.GetAdminUserInfo()
-	drug_id, _ := c.GetInt64("drug_id", 0)
-	mip, err := service.GetLastMedicineInsurance(adminUser.CurrentOrgId, drug_id)
+	type_id, _ := c.GetInt64("type_id", 0)
+	module, _ := c.GetInt64("module", 0)
+
+	mip, err := service.GetLastMedicineInsurance(adminUser.CurrentOrgId, type_id, module)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"mip": mip,

controllers/stock_in_api_controller.go

@@ -1534,7 +1534,7 @@ func (c *StockManagerApiController) GetCancelStockInfoList() {
 	id, _ := c.GetInt64("id", 0)
 
 	cancelStockInfoList, _ := service.FindCancelStockInfoById(id)
-	info, _ := service.FindCancelStockById(id)
+	info, _ := service.FindCancelStockById(id, c.GetAdminUserInfo().CurrentOrgId)
 
 	c.ServeSuccessJSON(map[string]interface{}{
 		"list": cancelStockInfoList,
@@ -1643,7 +1643,7 @@ func (c *StockManagerApiController) EditCancelStock() {
 		return
 	}
 
-	cancelStock, _ := service.FindCancelStockById(id)
+	cancelStock, _ := service.FindCancelStockById(id, c.GetAdminUserInfo().CurrentOrgId)
 
 	tempCancelStock := models.CancelStock{
 		ID:           cancelStock.ID,
@@ -1776,7 +1776,7 @@ func (c *StockManagerApiController) GetQueryInfo() {
 	keyword := c.GetString("keyword")
 
 	adminUserInfo := c.GetAdminUserInfo()
-	list, total, err := service.FindAllStockInfo(adminUserInfo.CurrentOrgId, page, limit, keyword)
+	list, total, err := service.FindAllDrugStockInfo(adminUserInfo.CurrentOrgId, page, limit, keyword)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"list":  list,

enums/error_code.go

@@ -130,6 +130,12 @@ const ( // ErrorCode
 
 	ErrorCodeCreateStockInFail = 20001
 
+	ErrorCodeCreateReturnFail = 50001
+
+	ErrorCodeCreateStockOutFail = 50002
+
+	ErrorCodeCreateCancelStockFail = 50003
+
 	ErrorCodeScheduleTemplateNotExist = 10001
 
 	ErrorCodeSystemError  = 6666

models/drug.go

@@ -82,8 +82,10 @@ type MedicineInsurancePercentage struct {
 	Status                int64   `gorm:"column:status" json:"status" form:"status"`
 	Ctime                 int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
 	Mtime                 int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	DrugId                int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	TypeId                int64   `gorm:"column:type_id" json:"drug_id" form:"type_id"`
 	RecordTime            int64   `gorm:"column:record_time" json:"record_time" form:"record_time"`
+	Module                int64   `gorm:"column:module" json:"module" form:"module"`
+	GoodId                int64   `gorm:"column:good_id" json:"good_id" form:"good_id"`
 }
 
 func (MedicineInsurancePercentage) TableName() string {

models/drug_stock.go

@@ -49,21 +49,23 @@ func (DrugWarehouseInfo) TableName() string {
 }
 
 type DrugWarehouseOut struct {
-	ID                      int64  `gorm:"column:id" json:"id" form:"id"`
-	WarehouseOutOrderNumber string `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
-	OperationTime           int64  `gorm:"column:operation_time" json:"operation_time" form:"operation_time"`
-	Creater                 int64  `gorm:"column:creater" json:"creater" form:"creater"`
-	OrgId                   int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	Modifier                int64  `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	Remark                  string `gorm:"column:remark" json:"remark" form:"remark"`
-	Ctime                   int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime                   int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Status                  int64  `gorm:"column:status" json:"status" form:"status"`
-	WarehouseOutTime        int64  `gorm:"column:warehouse_out_time" json:"warehouse_out_time" form:"warehouse_out_time"`
-	Dealer                  int64  `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Manufacturer            int64  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	Type                    int64  `gorm:"column:type" json:"type" form:"type"`
-	IsSys                   int64  `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	ID                      int64         `gorm:"column:id" json:"id" form:"id"`
+	WarehouseOutOrderNumber string        `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	OperationTime           int64         `gorm:"column:operation_time" json:"operation_time" form:"operation_time"`
+	Creater                 int64         `gorm:"column:creater" json:"creater" form:"creater"`
+	OrgId                   int64         `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Modifier                int64         `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Remark                  string        `gorm:"column:remark" json:"remark" form:"remark"`
+	Ctime                   int64         `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                   int64         `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status                  int64         `gorm:"column:status" json:"status" form:"status"`
+	WarehouseOutTime        int64         `gorm:"column:warehouse_out_time" json:"warehouse_out_time" form:"warehouse_out_time"`
+	Dealer                  int64         `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer            int64         `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Type                    int64         `gorm:"column:type" json:"type" form:"type"`
+	IsSys                   int64         `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	Manufacturers           *Manufacturer `gorm:"ForeignKey:Manufacturer;AssociationForeignKey:ID" json:"manufacturers"`
+	Dealers                 *Dealer       `gorm:"ForeignKey:Dealer;AssociationForeignKey:ID" json:"dealers"`
 }
 
 func (DrugWarehouseOut) TableName() string {
@@ -101,19 +103,21 @@ func (DrugWarehouseOutInfo) TableName() string {
 }
 
 type DrugSalesReturn struct {
-	ID           int64  `gorm:"column:id" json:"id" form:"id"`
-	OrderNumber  string `gorm:"column:order_number" json:"order_number" form:"order_number"`
-	OperaTime    int64  `gorm:"column:opera_time" json:"opera_time" form:"opera_time"`
-	Total        int64  `gorm:"column:total" json:"total" form:"total"`
-	Creater      int64  `gorm:"column:creater" json:"creater" form:"creater"`
-	Ctime        int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime        int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Status       int64  `gorm:"column:status" json:"status" form:"status"`
-	OrgId        int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	ReturnTime   int64  `gorm:"column:return_time" json:"return_time" form:"return_time"`
-	Manufacturer int64  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	Dealer       int64  `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Type         int64  `gorm:"column:type" json:"type" form:"type"`
+	ID            int64         `gorm:"column:id" json:"id" form:"id"`
+	OrderNumber   string        `gorm:"column:order_number" json:"order_number" form:"order_number"`
+	OperaTime     int64         `gorm:"column:opera_time" json:"opera_time" form:"opera_time"`
+	Total         int64         `gorm:"column:total" json:"total" form:"total"`
+	Creater       int64         `gorm:"column:creater" json:"creater" form:"creater"`
+	Ctime         int64         `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime         int64         `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status        int64         `gorm:"column:status" json:"status" form:"status"`
+	OrgId         int64         `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	ReturnTime    int64         `gorm:"column:return_time" json:"return_time" form:"return_time"`
+	Manufacturer  int64         `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer        int64         `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Type          int64         `gorm:"column:type" json:"type" form:"type"`
+	Manufacturers *Manufacturer `gorm:"ForeignKey:Manufacturer;AssociationForeignKey:ID" json:"manufacturers"`
+	Dealers       *Dealer       `gorm:"ForeignKey:Dealer;AssociationForeignKey:ID" json:"dealers"`
 }
 
 func (DrugSalesReturn) TableName() string {
@@ -147,19 +151,21 @@ func (DrugSalesReturnInfo) TableName() string {
 }
 
 type DrugCancelStock struct {
-	ID           int64  `gorm:"column:id" json:"id" form:"id"`
-	OrderNumber  string `gorm:"column:order_number" json:"order_number" form:"order_number"`
-	OperaTime    int64  `gorm:"column:opera_time" json:"opera_time" form:"opera_time"`
-	Total        int64  `gorm:"column:total" json:"total" form:"total"`
-	Creater      int64  `gorm:"column:creater" json:"creater" form:"creater"`
-	Ctime        int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime        int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Status       int64  `gorm:"column:status" json:"status" form:"status"`
-	OrgId        int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	ReturnTime   int64  `gorm:"column:return_time" json:"return_time" form:"return_time"`
-	Dealer       int64  `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Manufacturer int64  `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	Type         int64  `gorm:"column:type" json:"type" form:"type"`
+	ID            int64         `gorm:"column:id" json:"id" form:"id"`
+	OrderNumber   string        `gorm:"column:order_number" json:"order_number" form:"order_number"`
+	OperaTime     int64         `gorm:"column:opera_time" json:"opera_time" form:"opera_time"`
+	Total         int64         `gorm:"column:total" json:"total" form:"total"`
+	Creater       int64         `gorm:"column:creater" json:"creater" form:"creater"`
+	Ctime         int64         `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime         int64         `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status        int64         `gorm:"column:status" json:"status" form:"status"`
+	OrgId         int64         `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	ReturnTime    int64         `gorm:"column:return_time" json:"return_time" form:"return_time"`
+	Dealer        int64         `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer  int64         `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Type          int64         `gorm:"column:type" json:"type" form:"type"`
+	Manufacturers *Manufacturer `gorm:"ForeignKey:Manufacturer;AssociationForeignKey:ID" json:"manufacturers"`
+	Dealers       *Dealer       `gorm:"ForeignKey:Dealer;AssociationForeignKey:ID" json:"dealers"`
 }
 
 func (DrugCancelStock) TableName() string {

models/gobal_models.go

@@ -14,6 +14,19 @@ func (GobalConfig) TableName() string {
 	return "xt_gobal_config"
 }
 
+type DrugStockConfig struct {
+	ID         int64 `gorm:"column:id" json:"id" form:"id"`
+	OrgId      int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	IsOpen     int64 `gorm:"column:is_open" json:"is_open" form:"is_open"`
+	Status     int64 `gorm:"column:status" json:"status" form:"status"`
+	CreateTime int64 `gorm:"column:create_time" json:"create_time" form:"create_time"`
+	UpdateTime int64 `gorm:"column:update_time" json:"update_time" form:"update_time"`
+}
+
+func (DrugStockConfig) TableName() string {
+	return "xt_drug_stock_config"
+}
+
 type SystemPrescription struct {
 	ID                         int64   `gorm:"column:id" json:"id" form:"id"`
 	UserOrgId                  int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`

models/good_models.go

@@ -52,7 +52,7 @@ type GoodInfo struct {
 	IsSpecialDiseases      int64     `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
 	IsRecord               int64     `gorm:"column:is_record" json:"is_record" form:"is_record"`
 	StatisticsCategory     int64     `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`
-	GoodStatus             int64     `gorm:"column:good_status" json:"good_status" form:"good_status"`
+	GoodStatus             string    `gorm:"column:good_status" json:"good_status" form:"good_status"`
 	DefaultCount           int64     `gorm:"column:default_count" json:"default_count" form:"default_count"`
 	Sign                   int64     `gorm:"column:sign" json:"sign" form:"sign"`
 	IsDefault              int64     `gorm:"column:is_default" json:"is_default" form:"is_default"`
@@ -63,7 +63,7 @@ type GoodInfo struct {
 	IsDoctorUse            int64     `gorm:"column:is_doctor_use" json:"is_doctor_use" form:"is_doctor_use"`
 	Agent                  string    `gorm:"column:agent" json:"agent" form:"agent"`
 	GoodNumber             string    `gorm:"column:good_number" json:"good_number" form:"good_number"`
-	GoodsType              GoodsType `gorm:"ForeignKey:ID;AssociationForeignKey:GoodTypeId" `
+	GoodsType              GoodsType `gorm:"ForeignKey:ID;AssociationForeignKey:GoodTypeId" json:"type"`
 }
 
 func (GoodInfo) TableName() string {

service/drug_stock_service.go

@@ -1,6 +1,9 @@
 package service
 
-import "XT_New/models"
+import (
+	"XT_New/models"
+	"github.com/jinzhu/gorm"
+)
 
 type DrugConfig struct {
 	ID           int64        `gorm:"column:id" json:"id" form:"id"`
@@ -13,6 +16,8 @@ type DrugConfig struct {
 	OrgId        int64        `gorm:"column:org_id" json:"org_id" form:"org_id"`
 	Manufacturer int64        `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
 	DrugSpecs    []DrugConfig `gorm:"ForeignKey:DrugName;AssociationForeignKey:DrugName" json:"drug_specs"`
+	RetailPrice  float64      `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	LastPrice    float64      `gorm:"column:last_price" json:"last_price" form:"last_price"`
 }
 
 func (DrugConfig) TableName() string {
@@ -40,9 +45,68 @@ type MedicineInsuranceDate struct {
 	RecordTime int64
 }
 
-func GetLastMedicineInsurance(orgID int64, drug_id int64) (mip []*models.MedicineInsurancePercentage, err error) {
+func GetLastMedicineInsurance(orgID int64, type_id int64, module int64) (mip []*models.MedicineInsurancePercentage, err error) {
 	var mip_other models.MedicineInsurancePercentage
-	err = readDb.Model(&models.MedicineInsurancePercentage{}).Where("user_org_id = ? AND status=1 AND  drug_id = ?", orgID, drug_id).Last(&mip_other).Error
-	err = readDb.Model(&models.MedicineInsurancePercentage{}).Where("user_org_id = ? AND status=1 AND record_time = ? AND drug_id = ?", orgID, mip_other.RecordTime, drug_id).Find(&mip).Error
+	err = readDb.Model(&models.MedicineInsurancePercentage{}).Where("user_org_id = ? AND status=1 AND  type_id = ? AND module = ?", orgID, type_id, module).Last(&mip_other).Error
+	err = readDb.Model(&models.MedicineInsurancePercentage{}).Where("user_org_id = ? AND status=1 AND record_time = ? AND type_id = ? AND module = ?", orgID, mip_other.RecordTime, type_id, module).Find(&mip).Error
+	return
+}
+
+type DrugWarehouseInfo struct {
+	ID     int64  `gorm:"column:id" json:"id" form:"id"`
+	Number string `gorm:"column:number" json:"number" form:"number"`
+	Status int64  `gorm:"column:status" json:"status" form:"status"`
+	OrgId  int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+}
+
+func (DrugWarehouseInfo) TableName() string {
+	return "xt_drug_warehouse_info"
+}
+func FindStockInNumber(orgId int64) (stockIns []*DrugWarehouseInfo, err error) {
+	err = readDb.Model(&DrugWarehouseInfo{}).Where("org_id = ? AND status = 1", orgId).Group("number").Find(&stockIns).Error
+	return
+}
+
+type DrugStockInfo struct {
+	ID          int64   `gorm:"column:id" json:"id" form:"id"`
+	DrugName    string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	DrugSpec    string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
+	RetailPrice float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	LastPrice   float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	DrugStatus  string  `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
+	Status      int64   `gorm:"column:status" json:"status" form:"status"`
+	Ctime       int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime       int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	OrgId       int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	DrugCode    string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+
+	QueryWarehousingInfo  []models.DrugWarehouseInfo    `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"query_drug_warehousing_info"`
+	QuerySalesReturnInfo  []models.DrugSalesReturnInfo  `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"query_drug_sales_return_info"`
+	QueryWarehouseOutInfo []models.DrugWarehouseOutInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"query_drug_warehouseout_info"`
+	QueryCancelStockInfo  []models.DrugCancelStockInfo  `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"query_drug_cancel_stock_info"`
+}
+
+func (DrugStockInfo) TableName() string {
+	return "xt_base_drug"
+}
+
+func FindAllDrugStockInfo(orgId int64, page int64, limit int64, keyword string) (list []*DrugStockInfo, total int64, err error) {
+	db := readDb.Model(&DrugStockInfo{})
+	db = db.Where("xt_base_drug.org_id = ? AND xt_base_drug.status = 1", orgId)
+	db = db.Preload("QueryWarehousingInfo", func(db *gorm.DB) *gorm.DB {
+		return db.Where("org_id = ? AND status = 1", orgId)
+	})
+	db = db.Preload("QuerySalesReturnInfo", "org_id = ? AND status = 1", orgId)
+	db = db.Preload("QueryWarehouseOutInfo", func(db *gorm.DB) *gorm.DB {
+		return db.Where("org_id = ? AND status = 1", orgId)
+	})
+	db = db.Preload("QueryCancelStockInfo", "org_id = ? AND status = 1", orgId)
+	if len(keyword) > 0 {
+		likeKey := "%" + keyword + "%"
+		db = db.Where("xt_base_drug.drug_name LIKE ? OR xt_base_drug.drug_spec LIKE ?", likeKey, likeKey)
+	}
+	db = db.Count(&total)
+	offset := (page - 1) * limit
+	err = db.Offset(offset).Limit(limit).Order("ctime desc").Find(&list).Error
 	return
 }

service/gobal_config_service.go

@@ -10,16 +10,30 @@ func CreateAutomaticReduceRecord(config *models.GobalConfig) (err error) {
 	return
 }
 
+func CreateDrugAutomaticReduceRecord(config *models.DrugStockConfig) (err error) {
+	err = writeDb.Model(&models.DrugStockConfig{}).Create(config).Error
+	return
+}
+
 func FindAutomaticReduceRecordByOrgId(org_id int64) (err error, config models.GobalConfig) {
 	err = readDb.Model(&models.GobalConfig{}).Where("status = 1 AND org_id = ?", org_id).Find(&config).Error
 	return
 }
 
+func FindDrugStockAutomaticReduceRecordByOrgId(org_id int64) (err error, config models.DrugStockConfig) {
+	err = readDb.Model(&models.DrugStockConfig{}).Where("status = 1 AND org_id = ?", org_id).Find(&config).Error
+	return
+}
 func UpdateAutomaticReduceRecord(config *models.GobalConfig) (err error) {
 	err = writeDb.Save(config).Error
 	return
 }
 
+func UpdateDrugStockAutomaticReduceRecord(config *models.DrugStockConfig) (err error) {
+	err = writeDb.Save(config).Error
+	return
+}
+
 func CreatePrintTemplateRecord(template *models.GobalTemplate) (err error) {
 	err = writeDb.Model(&models.GobalTemplate{}).Create(template).Error
 	return

service/stock_service.go

@@ -224,15 +224,24 @@ func FindGoodInfoList(orgId int64, page int64, limit int64, keyword string, is_u
 	offset := (page - 1) * limit
 	db := readDb.Model(&models.GoodInfo{})
 	db = db.Where("org_id = ? AND status = 1", orgId)
+	db = db.Preload("GoodsType", "org_id = ? AND status = 1", orgId)
 	if len(keyword) > 0 {
 		likeKey := "%" + keyword + "%"
 		db = db.Where("good_code LIKE ? OR specification_name LIKE ?", likeKey, likeKey)
 	} else {
 		if is_use > 0 {
-			db = db.Where("good_status = ?", is_use)
+			if is_use == 1 {
+				db = db.Where("find_in_set('停用',good_status) = 0")
+			} else {
+				db = db.Where("find_in_set('停用',good_status) > 0")
+			}
 		}
 		if is_charge > 0 {
-			db = db.Where(" good_status = ?", is_charge)
+			if is_charge == 1 {
+				db = db.Where("find_in_set('收费',good_status) > 0")
+			} else {
+				db = db.Where("find_in_set('收费',good_status) = 0")
+			}
 		}
 		if good_kind > 0 {
 			db = db.Where(" good_kind = ?", good_kind)
@@ -359,7 +368,7 @@ func CreateDrugWarehousingInfo(warehousingInfo []*models.DrugWarehouseInfo) (err
 	if len(warehousingInfo) > 0 {
 		utx := writeDb.Begin()
 		if len(warehousingInfo) > 0 {
-			thisSQL := "INSERT INTO xt_warehouse_info (warehousing_id, drug_id, number, product_date,expiry_date,warehousing_count,price,total_price,dealer,manufacturer,remark,ctime,mtime,status,org_id,warehousing_order,type,retail_price,retail_total_price) VALUES "
+			thisSQL := "INSERT INTO xt_drug_warehouse_info (warehousing_id, drug_id, number, product_date,expiry_date,warehousing_count,price,total_price,dealer,manufacturer,remark,ctime,mtime,status,org_id,warehousing_order,type,retail_price,retail_total_price) VALUES "
 			insertParams := make([]string, 0)
 			insertData := make([]interface{}, 0)
 			for _, info := range warehousingInfo {
@@ -607,7 +616,7 @@ func CreateDrugSalesReturnInfo(salesReturnInfo []*models.DrugSalesReturnInfo) (e
 	if len(salesReturnInfo) > 0 {
 		utx := writeDb.Begin()
 		if len(salesReturnInfo) > 0 {
-			thisSQL := "INSERT INTO xt_sales_return_info (drug_id,sales_return_id, count, price,total,ctime,status,org_id,order_number,type,dealer,manufacturer,retail_price,retail_total_price) VALUES "
+			thisSQL := "INSERT INTO xt_drug_sales_return_info (drug_id,sales_return_id, count, price,total,ctime,status,org_id,order_number,type,dealer,manufacturer,retail_price,retail_total_price) VALUES "
 			insertParams := make([]string, 0)
 			insertData := make([]interface{}, 0)
 			for _, info := range salesReturnInfo {
@@ -682,8 +691,8 @@ func FindAllReturnList(orgId int64, page int64, limit int64, startTime int64, en
 	return
 }
 
-func FindAllDrugReturnList(orgId int64, page int64, limit int64, startTime int64, endTime int64, types int64, keywords string) (list []*models.SalesReturn, total int64, err error) {
-	db := readDb.Model(&models.SalesReturn{})
+func FindAllDrugReturnList(orgId int64, page int64, limit int64, startTime int64, endTime int64, types int64, keywords string) (list []*models.DrugSalesReturn, total int64, err error) {
+	db := readDb.Model(&models.DrugSalesReturn{})
 	db = db.Where("xt_drug_sales_return.org_id = ? AND xt_drug_sales_return.status = 1 ", orgId)
 
 	if len(keywords) > 0 {
@@ -715,8 +724,35 @@ func FindCancelStockInfoById(id int64) (list []*models.CancelStockInfo, err erro
 	return list, err
 }
 
-func FindDrugCancelStockInfoById(id int64) (list []*models.DrugCancelStockInfo, err error) {
-	err = readDb.Model(&models.DrugCancelStockInfo{}).Where("cancel_stock_id = ? AND status = 1", id).Find(&list).Error
+type DrugCancelStockInfo struct {
+	ID               int64   `gorm:"column:id" json:"id" form:"id"`
+	DrugId           int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	CancelStockId    int64   `gorm:"column:cancel_stock_id" json:"cancel_stock_id" form:"cancel_stock_id"`
+	Count            int64   `gorm:"column:count" json:"count" form:"count"`
+	Price            float64 `gorm:"column:price" json:"price" form:"price"`
+	Total            float64 `gorm:"column:total" json:"total" form:"total"`
+	ProductDate      int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate       int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	Ctime            int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime            int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status           int64   `gorm:"column:status" json:"status" form:"status"`
+	OrgId            int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	OrderNumber      string  `gorm:"column:order_number" json:"order_number" form:"order_number"`
+	Type             int64   `gorm:"column:type" json:"type" form:"type"`
+	Dealer           int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer     int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	RetailPrice      float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	RetailTotalPrice float64 `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	Number           string  `gorm:"column:number" json:"number" form:"number"`
+	Drug             *Drug   `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug"`
+}
+
+func (DrugCancelStockInfo) TableName() string {
+	return "xt_drug_cancel_stock_info"
+}
+
+func FindDrugCancelStockInfoById(id int64, org_id int64) (list []*DrugCancelStockInfo, err error) {
+	err = readDb.Model(&DrugCancelStockInfo{}).Preload("Drug", "status = 1 AND org_id = ? ", org_id).Where("cancel_stock_id = ? AND status = 1", id).Find(&list).Error
 	return list, err
 }
 
@@ -809,7 +845,7 @@ func CreateDrugWarehousingOutInfo(warehouseOutInfo []*models.DrugWarehouseOutInf
 			insertParams := make([]string, 0)
 			insertData := make([]interface{}, 0)
 			for _, info := range warehouseOutInfo {
-				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
 				insertData = append(insertData, info.WarehouseOutId)
 				insertData = append(insertData, info.DrugId)
 				insertData = append(insertData, info.ProductDate)
@@ -878,7 +914,6 @@ func FindAllWarehouseOutList(orgId int64, page int64, limit int64, startTime int
 	err = db.Offset(offset).Limit(limit).Order("xt_warehouse_out.ctime desc").Find(&list).Error
 	return list, total, err
 
-	return
 }
 
 func FindAllDrugWarehouseOutList(orgId int64, page int64, limit int64, startTime int64, endTime int64, types int64, keywords string) (list []*models.DrugWarehouseOut, total int64, err error) {
@@ -903,7 +938,6 @@ func FindAllDrugWarehouseOutList(orgId int64, page int64, limit int64, startTime
 	err = db.Offset(offset).Limit(limit).Order("xt_drug_warehouse_out.ctime desc").Find(&list).Error
 	return list, total, err
 
-	return
 }
 
 func FindWarehouseOutInfoById(id int64) (list []*models.WarehouseOutInfo, err error) {
@@ -911,8 +945,39 @@ func FindWarehouseOutInfoById(id int64) (list []*models.WarehouseOutInfo, err er
 	return list, err
 }
 
-func FindDrugWarehouseOutInfoById(id int64) (list []*models.DrugWarehouseOutInfo, err error) {
-	err = readDb.Model(&models.DrugWarehouseOutInfo{}).Where("warehouse_out_id = ? AND status = 1 AND count <> 0 AND good_id <> 0", id).Order("good_type_id desc").Find(&list).Error
+type DrugWarehouseOutInfo struct {
+	ID                      int64   `gorm:"column:id" json:"id" form:"id"`
+	WarehouseOutId          int64   `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	DrugId                  int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	WarehousingOutTarget    int64   `gorm:"column:warehousing_out_target" json:"warehousing_out_target" form:"warehousing_out_target"`
+	Count                   int64   `gorm:"column:count" json:"count" form:"count"`
+	Price                   float64 `gorm:"column:price" json:"price" form:"price"`
+	TotalPrice              float64 `gorm:"column:total_price" json:"total_price" form:"total_price"`
+	ProductDate             int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate              int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	Mtime                   int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Ctime                   int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Status                  int64   `gorm:"column:status" json:"status" form:"status"`
+	OrgId                   int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Remark                  string  `gorm:"column:remark" json:"remark" form:"remark"`
+	IsCancel                int64   `gorm:"column:is_cancel" json:"is_cancel" form:"is_cancel"`
+	WarehouseOutOrderNumber string  `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	Type                    int64   `gorm:"column:type" json:"type" form:"type"`
+	Dealer                  int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer            int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	IsSys                   int64   `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	SysRecordTime           int64   `gorm:"column:sys_record_time" json:"sys_record_time" form:"sys_record_time"`
+	RetailPrice             float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	RetailTotalPrice        float64 `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	Drug                    *Drug   `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug"`
+}
+
+func (DrugWarehouseOutInfo) TableName() string {
+	return "xt_drug_warehouse_out_info"
+}
+
+func FindDrugWarehouseOutInfoById(id int64, org_id int64) (list []*DrugWarehouseOutInfo, err error) {
+	err = readDb.Model(&DrugWarehouseOutInfo{}).Preload("Drug", "status = 1 AND org_id = ?", org_id).Where("warehouse_out_id = ? AND status = 1 ", id).Find(&list).Error
 	return list, err
 }
 
@@ -1188,9 +1253,9 @@ func FindWareHouseOutById(id int64) (*models.WarehouseOut, error) {
 	return warehouseOut, err
 }
 
-func FindDrugWareHouseOutById(id int64) (*models.DrugWarehouseOut, error) {
+func FindDrugWareHouseOutById(id int64, org_id int64) (*models.DrugWarehouseOut, error) {
 	warehouseOut := &models.DrugWarehouseOut{}
-	err := readDb.Model(&models.DrugWarehouseOut{}).Where("id = ? AND status = 1", id).First(&warehouseOut).Error
+	err := readDb.Model(&models.DrugWarehouseOut{}).Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ? ", org_id).Where("id = ? AND status = 1", id).First(&warehouseOut).Error
 	return warehouseOut, err
 }
 
@@ -1308,8 +1373,35 @@ func FindAllSalesReturnInfoById(id int64) (list []*models.SalesReturnInfo, err e
 	return
 }
 
-func FindAllDrugSalesReturnInfoById(id int64) (list []*models.DrugSalesReturnInfo, err error) {
-	err = readDb.Model(&models.DrugSalesReturnInfo{}).Where("sales_return_id = ? AND status = 1", id).Find(&list).Error
+type DrugSalesReturnInfo struct {
+	ID               int64   `gorm:"column:id" json:"id" form:"id"`
+	DrugId           int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	SalesReturnId    int64   `gorm:"column:sales_return_id" json:"sales_return_id" form:"sales_return_id"`
+	Count            int64   `gorm:"column:count" json:"count" form:"count"`
+	Price            float64 `gorm:"column:price" json:"price" form:"price"`
+	Total            float64 `gorm:"column:total" json:"total" form:"total"`
+	ProductDate      int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate       int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	Ctime            int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime            int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status           int64   `gorm:"column:status" json:"status" form:"status"`
+	OrgId            int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	OrderNumber      string  `gorm:"column:order_number" json:"order_number" form:"order_number"`
+	Type             int64   `gorm:"column:type" json:"type" form:"type"`
+	Dealer           int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer     int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	RetailPrice      float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	RetailTotalPrice float64 `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	Number           string  `gorm:"column:number" json:"number" form:"number"`
+	Drug             *Drug   `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug"`
+}
+
+func (DrugSalesReturnInfo) TableName() string {
+	return "xt_drug_sales_return_info"
+}
+
+func FindAllDrugSalesReturnInfoById(id int64, org_id int64) (list []*DrugSalesReturnInfo, err error) {
+	err = readDb.Model(&DrugSalesReturnInfo{}).Preload("Drug", "status = 1 AND org_id = ?", org_id).Where("sales_return_id = ? AND status = 1 AND org_id = ?", id, org_id).Find(&list).Error
 	return
 }
 
@@ -1318,8 +1410,8 @@ func FindAllSalesReturnById(id int64) (salesReturn models.SalesReturn, err error
 	return
 }
 
-func FindAllDrugSalesReturnById(id int64) (salesReturn models.DrugSalesReturn, err error) {
-	err = readDb.Model(&models.DrugSalesReturn{}).Where("id = ? AND status = 1", id).First(&salesReturn).Error
+func FindAllDrugSalesReturnById(id int64, org_id int64) (salesReturn models.DrugSalesReturn, err error) {
+	err = readDb.Model(&models.DrugSalesReturn{}).Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Where("id = ? AND status = 1", id).First(&salesReturn).Error
 	return
 }
 
@@ -1520,8 +1612,8 @@ func EditDrugCancelStock(sales models.DrugCancelStock) {
 
 }
 
-func FindCancelStockById(id int64) (cancelStock models.CancelStock, err error) {
-	err = readDb.Model(&models.CancelStock{}).Where("id = ? AND status = 1", id).First(&cancelStock).Error
+func FindCancelStockById(id int64, org_id int64) (cancelStock models.CancelStock, err error) {
+	err = readDb.Model(&models.CancelStock{}).Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Where("id = ? AND status = 1", id).First(&cancelStock).Error
 	return cancelStock, err
 
 }