Merge branch '20201014_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20201014_xt_api_new_branch

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9531
+httpport = 9529
 runmode = dev
 
 #

controllers/drug_stock_api_contorller.go

@@ -71,8 +71,6 @@ func DrugStockManagerApiRegistRouters() {
 func (c *StockDrugApiController) CreateDrugWarehouse() {
 
 	warehousing_time := c.GetString("warehousing_time")
-	dealer_id, _ := c.GetInt64("dealer_id", 0)
-	manufacturer_id, _ := c.GetInt64("manufacturer_id", 0)
 
 	types, _ := c.GetInt64("type", 0)
 
@@ -100,8 +98,6 @@ func (c *StockDrugApiController) CreateDrugWarehouse() {
 		Ctime:            ctime,
 		Status:           1,
 		WarehousingTime:  warehousingDate.Unix(),
-		Dealer:           dealer_id,
-		Manufacturer:     manufacturer_id,
 		Type:             types,
 	}
 	service.AddSigleDrugWarehouse(&warehousing)
@@ -144,12 +140,6 @@ func (c *StockDrugApiController) CreateDrugWarehouse() {
 				last_price, _ := strconv.ParseFloat(items["last_price"].(string), 64)
 				total := float64(warehousing_count) * last_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) * last_price
 
 				var productDates int64
@@ -183,7 +173,7 @@ func (c *StockDrugApiController) CreateDrugWarehouse() {
 
 				}
 
-				lot_number, _ := items["lot_number"].(string)
+				number, _ := items["number"].(string)
 
 				batch_number, _ := items["batch_number"].(string)
 
@@ -193,14 +183,14 @@ func (c *StockDrugApiController) CreateDrugWarehouse() {
 					return
 				}
 				max_unit, _ := items["max_unit"].(string)
-				fmt.Println("最大单位00000000000000000000000000000000", max_unit)
+
 				if items["min_unit"] == nil || reflect.TypeOf(items["min_unit"]).String() != "string" {
 					utils.ErrorLog("min_unit")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 					return
 				}
 				min_unit, _ := items["min_unit"].(string)
-				fmt.Println("最下单位0090000000000000000000", min_unit)
+
 				var remark string
 				if items["remark"] == nil || reflect.TypeOf(items["remark"]).String() != "string" {
 					remark = ""
@@ -208,11 +198,15 @@ func (c *StockDrugApiController) CreateDrugWarehouse() {
 					remark = items["remark"].(string)
 				}
 
+				manufacturer := int64(items["manufacturer"].(float64))
+
+				dealer := int64(items["dealer"].(float64))
+
 				warehouseInfo := &models.DrugWarehouseInfo{
 					WarehousingOrder: warehousing.WarehousingOrder,
 					WarehousingId:    warehousing.ID,
 					DrugId:           drug_id,
-					Number:           lot_number,
+					Number:           number,
 					ProductDate:      productDates,
 					ExpiryDate:       expiryDates,
 					WarehousingCount: warehousing_count,
@@ -223,9 +217,8 @@ func (c *StockDrugApiController) CreateDrugWarehouse() {
 					Remark:           remark,
 					OrgId:            adminUserInfo.CurrentOrgId,
 					Type:             types,
-					Manufacturer:     manufacturer_id,
-					Dealer:           dealer_id,
-					//RetailPrice:      retail_price,
+					Manufacturer:     manufacturer,
+					Dealer:           dealer,
 					StockMaxNumber:   warehousing_count,
 					RetailTotalPrice: retail_price_total,
 					BatchNumber:      batch_number,
@@ -396,9 +389,6 @@ func (c *StockDrugApiController) GetDrugWarehouseList() {
 	types, _ := c.GetInt64("type", 0)
 	keywords := c.GetString("keywords")
 
-	fmt.Println(start_time)
-	fmt.Println(end_time)
-
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	var startTime int64
@@ -423,7 +413,24 @@ func (c *StockDrugApiController) GetDrugWarehouseList() {
 	}
 
 	adminUserInfo := c.GetAdminUserInfo()
-	warehouseList, total, err := service.FindAllDrugWarehousingList(adminUserInfo.CurrentOrgId, page, limit, startTime, endTime, types, keywords)
+	fmt.Println("hhh2h3h23h2h32h3h2h32h32h3h2h3", keywords)
+	//按药品名称搜索
+	var ids []int64
+	var idArray []int64
+	list, _ := service.GetDrugNameByKeyword(keywords, adminUserInfo.CurrentOrgId)
+	for _, item := range list {
+		ids = append(ids, item.ID)
+	}
+
+	//查找入库单详情
+	if len(ids) > 0 {
+		info, _ := service.GetDrugWarehouseOrderDetailTwo(ids, adminUserInfo.CurrentOrgId, startTime, endTime)
+		for _, it := range info {
+			idArray = append(idArray, it.WarehousingId)
+		}
+	}
+
+	warehouseList, total, err := service.FindAllDrugWarehousingListOne(adminUserInfo.CurrentOrgId, page, limit, startTime, endTime, types, keywords, idArray)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"list":  warehouseList,
@@ -445,6 +452,7 @@ func (c *StockDrugApiController) GetDrugWarehouseInfoList() {
 	warehousing, err := service.FindDrugWarehousingById(id, admin.CurrentOrgId)
 
 	manufacturerList, _ := service.GetAllManufacturerList(admin.CurrentOrgId)
+	dealerList, _ := service.GetAllDealerList(admin.CurrentOrgId)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 		return
@@ -461,6 +469,7 @@ func (c *StockDrugApiController) GetDrugWarehouseInfoList() {
 			"info":             warehousingInfo,
 			"warehousing":      warehousing,
 			"manufacturerList": manufacturerList,
+			"dealerList":       dealerList,
 		})
 	} else {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -472,8 +481,6 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 	warehousing_time := c.GetString("warehousing_time")
 	id, _ := c.GetInt64("id", 0)
 	types, _ := c.GetInt64("type", 0)
-	//manufacturer_id, _ := c.GetInt64("manufacturer_id", 0)
-	//dealer_id, _ := c.GetInt64("dealer_id", 0)
 
 	if id == 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -501,8 +508,6 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 		Status:           1,
 		WarehousingTime:  warehousingDate.Unix(),
 		Type:             warehouse.Type,
-		//Dealer:           dealer_id,
-		//Manufacturer:     manufacturer_id,
 	}
 
 	service.EditDrugWarehousingOne(warehousing, id)
@@ -548,14 +553,6 @@ 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) * last_price
-
 				if items["last_price"] == nil || reflect.TypeOf(items["last_price"]).String() != "string" {
 					utils.ErrorLog("last_price")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -596,12 +593,7 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 
 				}
 
-				if items["lot_number"] == nil || reflect.TypeOf(items["lot_number"]).String() != "string" {
-					utils.ErrorLog("lot_number")
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-					return
-				}
-				number, _ := items["lot_number"].(string)
+				number, _ := items["number"].(string)
 
 				batch_number, _ := items["batch_number"].(string)
 
@@ -623,19 +615,9 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 				}
 				id := int64(items["id"].(float64))
 
-				//if items["dealer"] == nil || reflect.TypeOf(items["dealer"]).String() != "float64" {
-				//	utils.ErrorLog("dealer")
-				//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-				//	return
-				//}
-				//dealer := int64(items["dealer"].(float64))
-				//
-				if items["manufacturer"] == nil || reflect.TypeOf(items["manufacturer"]).String() != "float64" {
-					utils.ErrorLog("manufacturer")
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-					return
-				}
 				manufacturer := int64(items["manufacturer"].(float64))
+
+				dealer := int64(items["dealer"].(float64))
 				if id == 0 {
 					warehouseInfo := &models.DrugWarehouseInfo{
 						WarehousingOrder: warehouse.WarehousingOrder,
@@ -653,7 +635,7 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 						OrgId:            adminUserInfo.CurrentOrgId,
 						Type:             types,
 						Manufacturer:     manufacturer,
-						//Dealer:           dealer,
+						Dealer:           dealer,
 						RetailPrice:      last_price,
 						RetailTotalPrice: retail_price_total,
 						BatchNumber:      batch_number,
@@ -680,12 +662,13 @@ func (c *StockDrugApiController) EditDrugWarehouse() {
 						OrgId:            adminUserInfo.CurrentOrgId,
 						Type:             types,
 						Manufacturer:     manufacturer,
-						//Dealer:           dealer,
+						Dealer:           dealer,
 						RetailPrice:      last_price,
 						RetailTotalPrice: retail_price_total,
 						StockMaxNumber:   warehousing_count,
 						MaxUnit:          max_unit,
 						MinUnit:          min_unit,
+						BatchNumber:      batch_number,
 					}
 					upDateWarehousingInfo = append(upDateWarehousingInfo, warehouseInfo)
 				}
@@ -1122,8 +1105,7 @@ func (c *StockDrugApiController) EditDrugReturnInfo() {
 }
 
 func (c *StockDrugApiController) CreateDrugWarehouseOut() {
-	dealer_id, _ := c.GetInt64("dealer_id", 0)
-	manufacturer_id, _ := c.GetInt64("manufacturer_id", 0)
+
 	types, _ := c.GetInt64("type", 0)
 
 	ctime := time.Now().Unix()
@@ -1156,11 +1138,9 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 		Ctime:                   ctime,
 		Status:                  1,
 		WarehouseOutTime:        warehousingOutDate.Unix(),
-		Dealer:                  dealer_id,
-		Manufacturer:            manufacturer_id,
 		Type:                    types,
 	}
-	service.AddSigleDrugWarehouseOut(&warehouseOut)
+
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
 	if err != nil {
@@ -1199,19 +1179,54 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 				}
 				price, _ := strconv.ParseFloat(items["price"].(string), 64)
 
-				if items["last_price"] == nil || reflect.TypeOf(items["last_price"]).String() != "string" {
-					utils.ErrorLog("last_price")
-					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-					return
-				}
-				last_price, _ := strconv.ParseFloat(items["last_price"].(string), 64)
-
+				//if items["last_price"] == nil || reflect.TypeOf(items["last_price"]).String() != "string" {
+				//	utils.ErrorLog("last_price")
+				//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+				//	return
+				//}
+				//last_price, _ := strconv.ParseFloat(items["last_price"].(string), 64)
+				//fmt.Println(last_price)
 				count, _ := strconv.ParseInt(items["count"].(string), 10, 64)
 
 				total := float64(count) * price
-				retail_price_total := float64(count) * last_price
+				retail_price_total := float64(count) * price
 				remark := items["remark"].(string)
 				max_unit := items["max_unit"].(string)
+				dealer := int64(items["dealer"].(float64))
+				fmt.Println("dealer2222222222222222222", dealer)
+				manufacturer := int64(items["manufacturer"].(float64))
+				fmt.Println("manufacturer22222222222222", manufacturer)
+				number := items["number"].(string)
+				batch_number := items["batch_number"].(string)
+				var productDates int64
+				var expiryDates int64
+				if items["expiry_date"] == nil || reflect.TypeOf(items["expiry_date"]).String() != "string" {
+					expiryDates = 0
+				} else {
+					if len(items["expiry_date"].(string)) == 0 {
+						expiryDates = 0
+
+					} else {
+						expiryDate, _ := items["expiry_date"].(string)
+						expiry_date, _ := utils.ParseTimeStringToTime("2006-01-02", expiryDate)
+						expiryDates = expiry_date.Unix()
+
+					}
+
+				}
+				if items["product_date"] == nil || reflect.TypeOf(items["product_date"]).String() != "string" {
+					productDates = 0
+				} else {
+					if len(items["product_date"].(string)) == 0 {
+						productDates = 0
+
+					} else {
+						productDate, _ := items["product_date"].(string)
+						product_date, _ := utils.ParseTimeStringToTime("2006-01-02", productDate)
+						productDates = product_date.Unix()
+					}
+
+				}
 
 				warehouseOutInfo := &models.DrugWarehouseOutInfo{
 					WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
@@ -1225,11 +1240,16 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 					Remark:                  remark,
 					OrgId:                   adminUserInfo.CurrentOrgId,
 					Type:                    types,
-					Manufacturer:            manufacturer_id,
-					Dealer:                  dealer_id,
-					RetailPrice:             last_price,
+					Manufacturer:            manufacturer,
+					Dealer:                  dealer,
+					RetailPrice:             price,
 					RetailTotalPrice:        retail_price_total,
 					CountUnit:               max_unit,
+					ExpiryDate:              expiryDates,
+					ProductDate:             productDates,
+					Number:                  number,
+					BatchNumber:             batch_number,
+					IsSys:                   0,
 				}
 				warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
@@ -1238,32 +1258,51 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 	}
 
 	//调用出库逻辑
-	//for _, item := range warehousingOutInfo {
-	//
-	//	// 出库流程
-	//	// 1.查询改药品在药品库的规格信息，并将处方里的规格进行换算（尽量将拆零单位转换成包装单位）
-	//	drup, _ := service.FindBaseDrugLibRecord(item.OrgId, item.DrugId)
-	//	if drup.ID > 0 {
-	//		prescribingNumber := item.Count
-	//
-	//		service.AutoDrugDeliverInfo(item.OrgId, prescribingNumber, &warehouseOut, &drup, item)
-	//
-	//	}
-	//
-	//}
+	for _, item := range warehousingOutInfo {
+		//获取药品库存
+		info, _ := service.GetDrugTotalCount(item.DrugId, item.OrgId)
+		if item.Count > info.Count {
+
+			goodObj, _ := service.GetDrugByGoodId(item.DrugId)
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg":        "1",
+				"drug_name":  goodObj.DrugName,
+				"dose":       goodObj.Dose,
+				"dose_unit":  goodObj.DoseUnit,
+				"min_number": goodObj.MinNumber,
+				"min_unit":   goodObj.MinUnit,
+				"max_unit":   goodObj.MaxUnit,
+			})
+			return
+		} else {
+			service.AddSigleDrugWarehouseOut(&warehouseOut)
+			// 出库流程
+			// 1.查询改药品在药品库的规格信息，并将处方里的规格进行换算（尽量将拆零单位转换成包装单位）
+			drup, _ := service.FindBaseDrugLibRecord(item.OrgId, item.DrugId)
+			if drup.ID > 0 {
+				prescribingNumber := item.Count
+				service.AutoDrugDeliverInfo(item.OrgId, prescribingNumber, &warehouseOut, &drup, item)
+			}
+		}
 
-	errs := service.CreateDrugWarehousingOutInfo(warehousingOutInfo)
-	info, _ := service.FindLastDrugWarehousingOutInfo(warehouseOut.WarehouseOutOrderNumber)
-	if errs != nil {
-		utils.ErrorLog(errs.Error())
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockOutFail)
-		return
 	}
 
+	//errs := service.CreateDrugWarehousingOutInfo(warehousingOutInfo)
+	//info, _ := service.FindLastDrugWarehousingOutInfo(warehouseOut.WarehouseOutOrderNumber)
+	//if errs != nil {
+	//	utils.ErrorLog(errs.Error())
+	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockOutFail)
+	//	return
+	//}
+
 	c.ServeSuccessJSON(map[string]interface{}{
-		"info":                  info,
-		"msg":                   "出库成功",
-		"warehousing_out_order": warehousing_out_order,
+		"msg":        "2",
+		"drug_name":  "",
+		"dose":       "",
+		"dose_unit":  "",
+		"min_number": "",
+		"min_unit":   "",
+		"max_unit":   "",
 	})
 
 }
@@ -1298,7 +1337,27 @@ func (c *StockDrugApiController) GetDrugWarehouseOutList() {
 	}
 
 	adminUserInfo := c.GetAdminUserInfo()
-	warehouseOutList, total, err := service.FindAllDrugWarehouseOutList(adminUserInfo.CurrentOrgId, page, limit, startTime, endTime, types, keywords)
+
+	var ids []int64
+	var goodids []int64
+	if len(keywords) > 0 {
+		//查询商品名称
+		list, _ := service.GetDrugNameByKeyword(keywords, adminUserInfo.CurrentOrgId)
+		for _, item := range list {
+			goodids = append(goodids, item.ID)
+		}
+
+		if len(goodids) > 0 {
+			//出库详情但里面查询
+			info, _ := service.GetDrugWarehouseOrderDetail(goodids, adminUserInfo.CurrentOrgId, startTime, endTime)
+			for _, it := range info {
+				ids = append(ids, it.WarehouseOutId)
+			}
+		}
+
+	}
+
+	warehouseOutList, total, err := service.FindAllDrugWarehouseOutListOne(adminUserInfo.CurrentOrgId, page, limit, startTime, endTime, types, keywords, ids)
 	fmt.Println(err)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
@@ -1351,10 +1410,12 @@ func (c *StockDrugApiController) GetDrugWarehouseOutInfoList() {
 	warehouseOutInfo, _ := service.FindDrugWarehouseOutInfoById(id, adminInfo.CurrentOrgId)
 	warehouseOut, _ := service.FindDrugWareHouseOutById(id, adminInfo.CurrentOrgId)
 	manulist, _ := service.GetAllManufacturerList(adminInfo.CurrentOrgId)
+	dealerList, _ := service.GetAllDealerList(adminInfo.CurrentOrgId)
 	c.ServeSuccessJSON(map[string]interface{}{
-		"list":     warehouseOutInfo,
-		"info":     warehouseOut,
-		"manulist": manulist,
+		"list":       warehouseOutInfo,
+		"info":       warehouseOut,
+		"manulist":   manulist,
+		"dealerList": dealerList,
 	})
 
 }
@@ -1362,8 +1423,6 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 	warehouse_out_time := c.GetString("warehouse_out_time")
 	id, _ := c.GetInt64("id", 0)
 	types, _ := c.GetInt64("type", 0)
-	manufacturer_id, _ := c.GetInt64("manufacturer_id", 0)
-	dealer_id, _ := c.GetInt64("dealer_id", 0)
 
 	if id == 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -1387,8 +1446,6 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 		ID:               warehouseOut.ID,
 		Mtime:            mtime,
 		WarehouseOutTime: warehouseOutDate.Unix(),
-		Manufacturer:     manufacturer_id,
-		Dealer:           dealer_id,
 	}
 
 	service.EditDrugWarehouseOut(tempWarehouseOut)
@@ -1431,7 +1488,7 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 					return
 				}
 				price, _ := strconv.ParseFloat(items["price"].(string), 64)
-
+				fmt.Println("price23223232323232323232323232322322", price)
 				if items["retail_price"] == nil || reflect.TypeOf(items["retail_price"]).String() != "string" {
 					utils.ErrorLog("retail_price")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -1451,6 +1508,41 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 				}
 				id := int64(items["id"].(float64))
 
+				dealer := int64(items["dealer"].(float64))
+				manufacturer := int64(items["manufacturer"].(float64))
+
+				batch_number := items["batch_number"].(string)
+				number := items["number"].(string)
+
+				var productDates int64
+				var expiryDates int64
+				if items["expiry_date"] == nil || reflect.TypeOf(items["expiry_date"]).String() != "string" {
+					expiryDates = 0
+				} else {
+					if len(items["expiry_date"].(string)) == 0 {
+						expiryDates = 0
+
+					} else {
+						expiryDate, _ := items["expiry_date"].(string)
+						expiry_date, _ := utils.ParseTimeStringToTime("2006-01-02", expiryDate)
+						expiryDates = expiry_date.Unix()
+
+					}
+
+				}
+				if items["product_date"] == nil || reflect.TypeOf(items["product_date"]).String() != "string" {
+					productDates = 0
+				} else {
+					if len(items["product_date"].(string)) == 0 {
+						productDates = 0
+
+					} else {
+						productDate, _ := items["product_date"].(string)
+						product_date, _ := utils.ParseTimeStringToTime("2006-01-02", productDate)
+						productDates = product_date.Unix()
+					}
+
+				}
 				if id == 0 {
 					warehouseOutInfo := &models.DrugWarehouseOutInfo{
 						WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
@@ -1464,12 +1556,16 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 						Remark:                  remark,
 						OrgId:                   adminUserInfo.CurrentOrgId,
 						Type:                    types,
-						Manufacturer:            manufacturer_id,
-						Dealer:                  dealer_id,
+						Manufacturer:            manufacturer,
+						Dealer:                  dealer,
 						IsSys:                   0,
 						SysRecordTime:           0,
 						RetailPrice:             retail_price,
 						RetailTotalPrice:        retail_price_total,
+						BatchNumber:             batch_number,
+						Number:                  number,
+						ProductDate:             productDates,
+						ExpiryDate:              expiryDates,
 					}
 					warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
@@ -1502,12 +1598,16 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 						OrgId:                   adminUserInfo.CurrentOrgId,
 						Mtime:                   time.Now().Unix(),
 						Type:                    types,
-						Manufacturer:            manufacturer_id,
-						Dealer:                  dealer_id,
+						Manufacturer:            manufacturer,
+						Dealer:                  dealer,
 						IsSys:                   is_sys,
 						SysRecordTime:           sys_record_time,
 						RetailPrice:             retail_price,
 						RetailTotalPrice:        retail_price_total,
+						BatchNumber:             batch_number,
+						Number:                  number,
+						ProductDate:             productDates,
+						ExpiryDate:              expiryDates,
 					}
 					upDateWarehouseOutInfos = append(upDateWarehouseOutInfos, warehouseOutInfo)
 				}

controllers/gobal_config_api_controller.go

@@ -2023,12 +2023,16 @@ func (c *GobalConfigApiController) GetSingleOrderDetail() {
 	id, _ := c.GetInt64("id")
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 	list, err := service.GetSingleOrderDetail(id, orgId)
+	dealerList, err := service.GetAllDealerList(orgId)
+	manufacturerList, err := service.GetAllManufacturerList(orgId)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 		return
 	}
 	c.ServeSuccessJSON(map[string]interface{}{
-		"list": list,
+		"list":             list,
+		"dealerList":       dealerList,
+		"manufacturerList": manufacturerList,
 	})
 }
 

controllers/manager_center_api_controller.go

@@ -2198,10 +2198,12 @@ func (c *ManagerCenterApiController) GetAllDrugList() {
 
 	list, err := service.GetAllDrugList(orgId)
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	dealerList, _ := service.GetAllDealerList(orgId)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"list":             list,
 			"manufacturerList": manufacturerList,
+			"dealerList":       dealerList,
 		})
 	} else {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
@@ -2213,10 +2215,12 @@ func (c *ManagerCenterApiController) GetSearchDrugList() {
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 	list, err := service.GetSearchDrugList(keyword, orgId)
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	dealerList, _ := service.GetAllDealerList(orgId)
 	if err == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"list":             list,
 			"manufacturerList": manufacturerList,
+			"dealerList":       dealerList,
 		})
 	} else {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -3633,9 +3633,9 @@ func (c *DialysisAPIController) CreateStockOutInfo() {
 
 		//查询是否有库存
 		for _, item := range consumables {
-			warehouse, err := service.FindFirstWarehousingInfoByStock(item.GoodId, item.GoodTypeId)
-			fmt.Println("库存数量00000000000000000000", warehouse.StockCount)
-			if err != nil {
+			warehouse, _ := service.FindFirstWarehousingInfoByStockTwo(item.GoodId, item.GoodTypeId)
+
+			if item.Count > warehouse.Count {
 				goodObj, _ := service.GetGoodInformationByGoodId(item.GoodId)
 				c.ServeSuccessJSON(map[string]interface{}{
 					"message":            "1",
@@ -4260,9 +4260,9 @@ func (c *DialysisAPIController) CreateOtherStockOutInfo() {
 	fmt.Println("前端数据9999999999999", beforePrepares)
 	//查询是否有库存
 	for _, item := range beforePrepares {
-		warehouse, err := service.FindFirstWarehousingInfoByStock(item.GoodId, item.GoodTypeId)
-		fmt.Println("库存数量00000000000000000000", warehouse.StockCount)
-		if err != nil {
+		warehouse, _ := service.FindFirstWarehousingInfoByStockTwo(item.GoodId, item.GoodTypeId)
+
+		if item.Count > warehouse.Count {
 			goodObj, _ := service.GetGoodInformationByGoodId(item.GoodId)
 			c.ServeSuccessJSON(map[string]interface{}{
 				"message":            "1",

controllers/stock_in_api_controller.go

@@ -91,6 +91,8 @@ func StockManagerApiRegistRouters() {
 	beego.Router("/api/good/getsingleoutorderdetail", &StockManagerApiController{}, "Get:GetSingleOutOrderDetail")
 	beego.Router("/api/stock/getexportstocklist", &StockManagerApiController{}, "Get:GetExprotStockList")
 	beego.Router("/api/stock/getoutexprotlist", &StockManagerApiController{}, "Get:GetOutExprotList")
+	beego.Router("/api/stock/getsinglecancelorder", &StockManagerApiController{}, "Get:GetSingleCancelOrder")
+	beego.Router("/api/stock/getcancelstockorderprint", &StockManagerApiController{}, "Get:GetCancelStockOrderPrint")
 
 }
 
@@ -562,8 +564,6 @@ func (c *StockManagerApiController) EditWarehouse() {
 				var productDates int64
 				var expiryDates int64
 
-				fmt.Println()
-
 				if items["expiry_date"] == nil || reflect.TypeOf(items["expiry_date"]).String() != "string" {
 					expiryDates = 0
 				} else {
@@ -1087,7 +1087,6 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 	operation_time := time.Now().Unix()
 	creater := adminUserInfo.AdminUser.Id
 
-	_, errcode := service.FindStockOutByIsSys(adminUserInfo.CurrentOrgId, 0, operation_time)
 	warehouseOut := models.WarehouseOut{
 		WarehouseOutOrderNumber: warehousing_out_order,
 		OperationTime:           operation_time,
@@ -1098,9 +1097,6 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 		WarehouseOutTime:        warehousingOutDate.Unix(),
 		Type:                    types,
 	}
-	if errcode == gorm.ErrRecordNotFound {
-		service.AddSigleWarehouseOut(&warehouseOut)
-	}
 
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
@@ -1146,7 +1142,7 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 					return
 				}
 				price, _ := strconv.ParseFloat(items["price"].(string), 64)
-
+				fmt.Println("999999992932323232323223232322323", price)
 				count, _ := strconv.ParseInt(items["count"].(string), 10, 64)
 
 				total := float64(count) * price
@@ -1182,7 +1178,7 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 					}
 					productDate = theTime.Unix()
 				}
-
+				license_number := items["license_number"].(string)
 				warehouseOutInfo := &models.WarehouseOutInfo{
 					WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 					WarehouseOutId:          warehouseOut.ID,
@@ -1201,6 +1197,7 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 					ExpiryDate:              expiryDate,
 					ProductDate:             productDate,
 					Dealer:                  dealer,
+					LicenseNumber:           license_number,
 				}
 				warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
@@ -1225,9 +1222,9 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 	//出库逻辑
 	for _, item := range warehousingOutInfo {
 		//查询库存
-		warehouse, err := service.FindFirstWarehousingInfoByStockTwo(item.GoodId, item.GoodTypeId)
+		warehouse, _ := service.FindFirstWarehousingInfoByStockTwo(item.GoodId, item.GoodTypeId)
 		fmt.Println("库存数量组吗", warehouse.Count)
-		if err != nil {
+		if item.Count > warehouse.Count {
 			goodObj, _ := service.GetGoodInformationByGoodId(item.GoodId)
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg":                "1",
@@ -1236,8 +1233,12 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 			})
 			return
 		} else {
+			fmt.Println("jiage223444444444444444444", item.Price)
+			_, errcodes := service.FindStockOutByIsSys(adminUserInfo.CurrentOrgId, 0, operation_time)
+			if errcodes == gorm.ErrRecordNotFound {
+				service.AddSigleWarehouseOut(&warehouseOut)
+			}
 			parseDateErr := service.ConsumablesDeliveryOne(adminUserInfo.CurrentOrgId, warehousingOutDate.Unix(), item, &warehouseOut, item.Count)
-			fmt.Println(parseDateErr)
 			if parseDateErr != nil {
 				utils.ErrorLog(parseDateErr.Error())
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
@@ -1461,6 +1462,8 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 
 				number := items["number"].(string)
 
+				license_number := items["license_number"].(string)
+				fmt.Println("hhh23h2h32h3h232h3h23h2h3h23h2h3h23h2h3", license_number)
 				timeLayout := "2006-01-02"
 				loc, _ := time.LoadLocation("Local")
 				expiry_date := items["expiry_date"].(string)
@@ -1507,6 +1510,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 						ProductDate:             productDate,
 						Dealer:                  dealer,
 						Manufacturer:            manufacturer,
+						LicenseNumber:           license_number,
 					}
 					warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
@@ -1547,6 +1551,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 						ExpiryDate:              expiryDate,
 						ProductDate:             productDate,
 						Dealer:                  dealer,
+						LicenseNumber:           license_number,
 					}
 					upDateWarehouseOutInfos = append(upDateWarehouseOutInfos, warehouseOutInfo)
 				}
@@ -1672,6 +1677,17 @@ func (c *StockManagerApiController) CreateCancelStock() {
 		}
 	}
 	errs := service.CreateCancelStockInfo(cancelStockInfos)
+
+	// 改变入库单的值
+	for _, item := range cancelStockInfos {
+		fmt.Println("经理俄2433444 我认为侮辱侮辱侮辱侮辱侮辱侮辱我无污染武荣", item.GoodId, item.OrgId)
+		//查询该耗材的入库记录
+		list, _ := service.GetWarehoureOrderInfoList(item.GoodId, item.OrgId)
+		//调用退库的方法
+		parseDateErr := service.UpdateCancelOut(list, item.Count)
+		fmt.Println("999999999999", parseDateErr)
+	}
+
 	if errs != nil {
 		utils.ErrorLog(errs.Error())
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCancelStockFail)
@@ -1776,9 +1792,6 @@ func (this *StockManagerApiController) DeleteCancelStockInfo() {
 func (c *StockManagerApiController) EditCancelStock() {
 	cancel_time := c.GetString("cancel_time")
 	id, _ := c.GetInt64("id", 0)
-	types, _ := c.GetInt64("type", 0)
-	manufacturer_id, _ := c.GetInt64("manufacturer_id", 0)
-	dealer_id, _ := c.GetInt64("dealer_id", 0)
 
 	if id == 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -1799,11 +1812,9 @@ func (c *StockManagerApiController) EditCancelStock() {
 	cancelStock, _ := service.FindCancelStockById(id, c.GetAdminUserInfo().CurrentOrgId)
 
 	tempCancelStock := models.CancelStock{
-		ID:           cancelStock.ID,
-		Mtime:        mtime,
-		ReturnTime:   cancelDate.Unix(),
-		Manufacturer: manufacturer_id,
-		Dealer:       dealer_id,
+		ID:         cancelStock.ID,
+		Mtime:      mtime,
+		ReturnTime: cancelDate.Unix(),
 	}
 
 	service.EditCancelStock(tempCancelStock)
@@ -1865,9 +1876,6 @@ func (c *StockManagerApiController) EditCancelStock() {
 						OrderNumber:   cancelStock.OrderNumber,
 						CancelStockId: cancelStock.ID,
 						Mtime:         time.Now().Unix(),
-						Type:          types,
-						Manufacturer:  manufacturer_id,
-						Dealer:        dealer_id,
 					}
 					cancelStockInfos = append(cancelStockInfos, cancelStockInfo)
 
@@ -1883,9 +1891,6 @@ func (c *StockManagerApiController) EditCancelStock() {
 						OrderNumber:   cancelStock.OrderNumber,
 						CancelStockId: cancelStock.ID,
 						Mtime:         time.Now().Unix(),
-						Type:          types,
-						Manufacturer:  manufacturer_id,
-						Dealer:        dealer_id,
 					}
 					upDateCancelStockInfos = append(upDateCancelStockInfos, cancelStockInfo)
 				}
@@ -1895,11 +1900,42 @@ func (c *StockManagerApiController) EditCancelStock() {
 	var errs error
 	if len(cancelStockInfos) > 0 {
 		errs = service.CreateCancelStockInfo(cancelStockInfos)
+		// 改变入库单的值
+		for _, item := range cancelStockInfos {
+			//查询该耗材的入库记录
+			list, _ := service.GetWarehoureOrderInfoList(item.GoodId, item.OrgId)
+			//调用退库的方法
+			parseDateErr := service.UpdateCancelOut(list, item.Count)
+			if parseDateErr != nil {
+				utils.ErrorLog(errs.Error())
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
+				return
+			}
+
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "编辑成功",
+			})
+		}
 	}
 
 	if len(upDateCancelStockInfos) > 0 {
 		for _, item := range upDateCancelStockInfos {
+
 			errs = service.UpDateCancelStockInfo(item)
+			list, _ := service.GetWarehoureOrderInfoList(item.GoodId, item.OrgId)
+			//调用退库的方法
+			parseDateErr := service.UpdateCancelOut(list, item.Count)
+			fmt.Println("999999999999", parseDateErr)
+
+			if parseDateErr != nil {
+				utils.ErrorLog(errs.Error())
+				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateStockInFail)
+				return
+			}
+
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "编辑成功",
+			})
 		}
 	}
 
@@ -3897,11 +3933,12 @@ func (this *StockManagerApiController) GetStockDrugCount() {
 	count, _ := service.GetStockDrugCount(startTime, endTime, orgId)
 	outList, _ := service.GetAutoDiallysisBefor(startTime, endTime, orgId)
 	autoCount, _ := service.GetOutStockTotalCountFour(startTime, endTime, orgId)
-
+	totalCount, _ := service.GetCancelOutTotalCount(startTime, endTime, orgId)
 	this.ServeSuccessJSON(map[string]interface{}{
-		"count":     count,
-		"outList":   outList,
-		"autoCount": autoCount,
+		"count":      count,
+		"outList":    outList,
+		"autoCount":  autoCount,
+		"totalCount": totalCount,
 	})
 }
 
@@ -3982,7 +4019,7 @@ func (this *StockManagerApiController) GetExprotStockList() {
 		}
 		endTime = theTime.Unix()
 	}
-
+	fmt.Println("ids2222222222222222", ids)
 	list, _ := service.GetExprotStockList(orgId, ids, startTime, endTime)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list": list,
@@ -4026,3 +4063,23 @@ func (this *StockManagerApiController) GetOutExprotList() {
 		"count": outCount,
 	})
 }
+
+func (this *StockManagerApiController) GetSingleCancelOrder() {
+
+	id, _ := this.GetInt64("id")
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	order, _ := service.GetSingleCancelOrder(id, orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": order,
+	})
+}
+
+func (this *StockManagerApiController) GetCancelStockOrderPrint() {
+	id := this.GetString("id")
+	idStr := strings.Split(id, ",")
+	list, _ := service.GetCancelStockOrderPrint(idStr)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": list,
+	})
+}

models/drug_stock.go

@@ -102,6 +102,8 @@ type DrugWarehouseOutInfo struct {
 	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"`
+	Number                  string  `gorm:"column:number" json:"number" form:"number"`
+	BatchNumber             string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
 }
 
 func (DrugWarehouseOutInfo) TableName() string {

models/self_drug_models.go

@@ -451,6 +451,10 @@ type BloodDrugWarehouseInfo struct {
 	DrugSpec         string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
 	Creater          int64   `gorm:"column:creater" json:"creater" form:"creater"`
 	MinUnit          string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	MaxUnit          string  `json:"max_unit"`
+	MinNumber        int64   `json:"min_number"`
+	Dose             float64 `json:"dose"`
+	DoseUnit         string  `json:"dose_unit"`
 }
 
 type BloodDrugCancelStockInfo struct {
@@ -536,6 +540,10 @@ type BloodDrugWarehouseOutInfo struct {
 	DrugSpec                string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
 	Creater                 int64   `gorm:"column:creater" json:"creater" form:"creater"`
 	MinUnit                 string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	MaxUnit                 string  `json:"max_unit"`
+	MinNumber               int64   `json:"min_number"`
+	Dose                    float64 `json:"dose"`
+	DoseUnit                string  `json:"dose_unit"`
 }
 
 type XtMonitorConfig struct {
@@ -588,6 +596,7 @@ type StDrugWarehouseInfo struct {
 	RetailTotalPrice float64 `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
 	StockMaxNumber   int64   `gorm:"column:stock_max_number" json:"stock_max_number"`
 	StockMinNumber   int64   `gorm:"column:stock_min_number" json:"stock_min_number"`
+	BatchNumber      string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
 	DrugName         string  `json:"drug_name"`
 	DrugType         int64   `json:"drug_type"`
 	MaxUnit          string  `json:"max_unit"`
@@ -608,6 +617,7 @@ type VmDrugWarehouseOutInfo struct {
 	Count                   int64   `gorm:"column:count" json:"count" form:"count"`
 	CountUnit               string  `gorm:"column:count_unit" json:"count_unit" form:"count_unit"`
 	Price                   float64 `gorm:"column:price" json:"price" form:"price"`
+	BuyPrice                float64 `gorm:"column:buy_price" json:"buy_price" form:"buy_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"`
@@ -633,4 +643,6 @@ type VmDrugWarehouseOutInfo struct {
 	DoseUnit                string  `json:"dose_unit"`
 	LastPrice               string  `json:"last_price"`
 	DrugName                string  `json:"drug_name"`
+	Number                  string  `json:"number"`
+	BatchNumber             string  `json:"batch_number"`
 }

models/stock_models.go

@@ -97,6 +97,7 @@ type StWarehousingInfo struct {
 	PackingUnit       string  `json:"packing_unit"`
 	TotalCount        int64   `json:"total_count"`
 	SpecificationName string  `json:"specification_name"`
+	LicenseNumber     string  `gorm:"column:license_number" json:"license_number" form:"license_number"`
 }
 
 func (StWarehousingInfo) TableName() string {
@@ -146,6 +147,7 @@ type VmWarehousingInfo struct {
 	WarehousingCount  int64       `gorm:"column:warehousing_count" json:"warehousing_count"`
 	WarehousingUnit   string      `gorm:"column:warehousing_unit" json:"warehousing_unit"`
 	Price             float64     `gorm:"column:price" json:"price"`
+	BuyPrice          float64     `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
 	TotalPrice        float64     `gorm:"column:total_price" json:"total_price"`
 	Dealer            int64       `gorm:"column:dealer" json:"dealer"`
 	Manufacturer      int64       `gorm:"column:manufacturer" json:"manufacturer"`
@@ -219,6 +221,7 @@ type WarehouseOutInfo struct {
 	SysRecordTime           int64        `gorm:"column:sys_record_time" json:"sys_record_time"`
 	PatientId               int64        `gorm:"column:patient_id" json:"patient_id"`
 	Number                  string       `gorm:"column:number" json:"number" form:"number"`
+	LicenseNumber           string       `gorm:"column:license_number" json:"license_number" form:"license_number"`
 }
 
 func (WarehouseOutInfo) TableName() string {
@@ -271,6 +274,12 @@ func (SalesReturnInfo) TableName() string {
 	return "xt_sales_return_info"
 }
 
+type VmCancelStockInfo struct {
+	GoodId int64 `gorm:"column:good_id" json:"good_id"`
+	Count  int64 `gorm:"column:count" json:"count"`
+	OrgId  int64 `gorm:"column:org_id" json:"org_id"`
+}
+
 type CancelStockInfo struct {
 	ID            int64       `gorm:"column:id" json:"id"`
 	GoodId        int64       `gorm:"column:good_id" json:"good_id"`
@@ -428,6 +437,7 @@ type WarehouseOutInfoOne struct {
 	MinUnit                 string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
 	Number                  string  `gorm:"column:number" json:"number" form:"number"`
 	PackingUnit             string  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	LicenseNumber           string  `gorm:"column:license_number" json:"license_number" form:"license_number"`
 }
 
 type WarehouseOutInfoTwo struct {

models/stock_query_models.go

@@ -8,6 +8,7 @@ type StockInfo struct {
 	GoodTypeId            int64                   `gorm:"column:good_type_id" json:"good_type_id"`
 	GoodUnit              int64                   `gorm:"column:good_unit" json:"good_unit"`
 	MinUnit               string                  `gorm:"column:min_unit" json:"min_unit"`
+	PackingUnit           string                  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
 	QueryWarehousingInfo  []QueryWarehousingInfo  `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"query_warehousing_info"`
 	QuerySalesReturnInfo  []QuerySalesReturnInfo  `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"query_sales_return_info"`
 	QueryWarehouseOutInfo []QueryWarehouseOutInfo `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"query_warehouseout_info"`

service/gobal_config_service.go

@@ -256,14 +256,14 @@ func GetDrugInOrderDetail(startime int64, endtime int64, orgid int64, orderType
 
 	if len(keyword) > 0 {
 
-		db = db.Where("x.warehousing_order like ? or t.drug_spec like ? or s.creater like ?", likeKey, likeKey, likeKey)
+		db = db.Where("x.warehousing_order like ? or t.drug_name like ? or s.creater like ?", likeKey, likeKey, likeKey)
 
 	}
 
 	if manufacturerId > 0 {
-		err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.price,x.total_price,x.dealer,t.manufacturer,x.remark,x.ctime,x.org_id,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,t.drug_type,t.drug_name,t.drug_spec,t.min_unit,s.creater").Joins("left join xt_base_drug as t on t.id = x.drug_id and t.org_id = ? and t.status =1", orgid).Where("t.manufacturer = ?", manufacturerId).Joins("left join xt_drug_warehouse as s on s.id = x.warehousing_id and s.org_id = ? and s.status =1", orgid).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&drugInfo).Error
+		err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.price,x.total_price,x.dealer,t.manufacturer,x.remark,x.ctime,x.org_id,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,t.drug_type,t.drug_name,t.drug_spec,t.min_unit,t.dose,t.dose_unit,t.max_unit,t.min_number,s.creater").Joins("left join xt_base_drug as t on t.id = x.drug_id and t.org_id = ? and t.status =1", orgid).Where("t.manufacturer = ?", manufacturerId).Joins("left join xt_drug_warehouse as s on s.id = x.warehousing_id and s.org_id = ? and s.status =1", orgid).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&drugInfo).Error
 	} else {
-		err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.price,x.total_price,x.dealer,t.manufacturer,x.remark,x.ctime,x.org_id,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,t.drug_type,t.drug_name,t.drug_spec,t.min_unit,s.creater").Joins("left join xt_base_drug as t on t.id = x.drug_id and t.org_id = ? and t.status =1", orgid).Joins("left join xt_drug_warehouse as s on s.id = x.warehousing_id and s.org_id = ? and s.status =1", orgid).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&drugInfo).Error
+		err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.price,x.total_price,x.dealer,t.manufacturer,x.remark,x.ctime,x.org_id,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,t.drug_type,t.drug_name,t.drug_spec,t.min_unit,t.dose,t.dose_unit,t.max_unit,t.min_number,s.creater").Joins("left join xt_base_drug as t on t.id = x.drug_id and t.org_id = ? and t.status =1", orgid).Joins("left join xt_drug_warehouse as s on s.id = x.warehousing_id and s.org_id = ? and s.status =1", orgid).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&drugInfo).Error
 	}
 
 	return drugInfo, total, err
@@ -327,13 +327,13 @@ func GetDrugOutOrder(startime int64, endtime int64, orgid int64, orderType int64
 	}
 
 	if len(keyword) > 0 {
-		db = db.Where("x.warehouse_out_order_number like ? or b.drug_spec like ? or t.creater like ?", likeKey, likeKey, likeKey)
+		db = db.Where("x.warehouse_out_order_number like ? or b.drug_name like ? or t.creater like ?", likeKey, likeKey, likeKey)
 	}
 
 	if manufacturerId > 0 {
-		err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.warehousing_out_target,x.count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,x.manufacturer,x.is_sys,x.sys_record_time,x.retail_price,x.retail_total_price,b.drug_name,b.drug_spec,b.drug_type,b.min_unit,t.creater").Joins("left join xt_base_drug as b on b.id = x.drug_id and b.org_id = ? and b.status =1", orgid).Joins("left join xt_drug_warehouse_out as t on t.id = x.warehouse_out_id and t.org_id = ? and t.status  =1", orgid).Where("t.manufacturer = ?", manufacturerId).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&outinfo).Error
+		err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.warehousing_out_target,x.count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,x.manufacturer,x.is_sys,x.sys_record_time,x.retail_price,x.retail_total_price,b.drug_name,b.drug_spec,b.drug_type,b.min_unit,b.max_unit,b.min_number,b.dose,b.dose_unit,t.creater").Joins("left join xt_base_drug as b on b.id = x.drug_id and b.org_id = ? and b.status =1", orgid).Joins("left join xt_drug_warehouse_out as t on t.id = x.warehouse_out_id and t.org_id = ? and t.status  =1", orgid).Where("t.manufacturer = ?", manufacturerId).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&outinfo).Error
 	} else {
-		err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.warehousing_out_target,x.count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,x.manufacturer,x.is_sys,x.sys_record_time,x.retail_price,x.retail_total_price,b.drug_name,b.drug_spec,b.drug_type,b.min_unit,t.creater").Joins("left join xt_base_drug as b on b.id = x.drug_id and b.org_id = ? and b.status =1", orgid).Joins("left join xt_drug_warehouse_out as t on t.id = x.warehouse_out_id and t.org_id = ? and t.status  =1", orgid).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&outinfo).Error
+		err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.warehousing_out_target,x.count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,x.manufacturer,x.is_sys,x.sys_record_time,x.retail_price,x.retail_total_price,b.drug_name,b.drug_spec,b.drug_type,b.min_unit,b.max_unit,b.min_number,b.dose,b.dose_unit,t.creater").Joins("left join xt_base_drug as b on b.id = x.drug_id and b.org_id = ? and b.status =1", orgid).Joins("left join xt_drug_warehouse_out as t on t.id = x.warehouse_out_id and t.org_id = ? and t.status  =1", orgid).Order("x.ctime desc").Count(&total).Offset(offset).Limit(limit).Scan(&outinfo).Error
 	}
 
 	return outinfo, total, err
@@ -540,6 +540,8 @@ func GetDrugStockList(page int64, limit int64, keyword string, drugcategory int6
 func GetDrugStockFlow(drugid int64, startime int64, endtime int64, page int64, limit int64, orgid int64) (list []*models.StDrugWarehouseInfo, total int64, err error) {
 
 	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_base_drug as t").Where("t.status =1 ")
+	fmt.Println(table)
 	offset := (page - 1) * limit
 	if startime > 0 {
 		db = db.Where("x.ctime >=?", startime)
@@ -560,9 +562,11 @@ func GetDrugStockFlow(drugid int64, startime int64, endtime int64, page int64, l
 	return list, total, err
 }
 
-func GetDrugStockOutFlow(drugid int64, startime int64, endtime int64, page int64, limit int64, orgid int64, stocktype int64) (list []*models.XtDrugWarehouseOutInfo, total int64, err error) {
+func GetDrugStockOutFlow(drugid int64, startime int64, endtime int64, page int64, limit int64, orgid int64, stocktype int64) (list []*models.VmDrugWarehouseOutInfo, total int64, err error) {
 
 	db := XTReadDB().Table("xt_drug_warehouse_out_info as x").Where("x.status = 1")
+	table := XTReadDB().Table("xt_base_drug as t").Where("t.status = 1")
+	fmt.Println(table)
 	offset := (page - 1) * limit
 	if startime > 0 {
 		db = db.Where("x.ctime >=?", startime)
@@ -584,7 +588,7 @@ func GetDrugStockOutFlow(drugid int64, startime int64, endtime int64, page int64
 	if stocktype == 2 {
 		db = db.Where("x.is_sys = 1")
 	}
-	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.warehousing_out_target,x.count,x.price,x.total_price,x.product_date,x.expiry_date,x.org_id,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,x.manufacturer,x.is_sys,x.sys_record_time,x.retail_price,x.retail_total_price,x.warehouse_info_id,x.ctime").Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Scan(&list).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.warehousing_out_target,x.count,x.price,x.total_price,x.product_date,x.expiry_date,x.org_id,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,x.manufacturer,x.is_sys,x.sys_record_time,x.retail_price,x.retail_total_price,x.warehouse_info_id,x.ctime,t.drug_name,t.drug_type,t.min_number,t.min_unit,t.max_unit").Joins("left join xt_base_drug as t on t.id = x.drug_id").Count(&total).Offset(offset).Limit(limit).Order("x.ctime desc").Scan(&list).Error
 	return list, total, err
 }
 
@@ -672,7 +676,7 @@ func GetSingleOrderDetail(id int64, orgid int64) (info []*models.VmDrugWarehouse
 		db = db.Where("x.warehouse_out_id = ?", id)
 	}
 
-	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,x.is_sys,x.sys_record_time,x.retail_price,x.retail_total_price,t.drug_name,t.drug_type,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,t.last_price").Joins("left join xt_base_drug as t on t.id = x.drug_id").Group("x.drug_id").Scan(&info).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,x.is_sys,x.sys_record_time,x.retail_price,x.retail_total_price,t.drug_name,t.drug_type,t.max_unit,t.min_unit,t.min_number,x.number,x.batch_number,t.dose,t.dose_unit,t.last_price").Joins("left join xt_base_drug as t on t.id = x.drug_id").Group("x.drug_id").Scan(&info).Error
 	return info, err
 }
 

service/stock_service.go

@@ -418,11 +418,11 @@ func CreateDrugWarehousingInfo(warehousingInfo []*models.DrugWarehouseInfo) (err
 	if len(warehousingInfo) > 0 {
 		utx := writeDb.Begin()
 		if len(warehousingInfo) > 0 {
-			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,stock_max_number,max_unit,min_unit) 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,stock_max_number,max_unit,min_unit,batch_number) VALUES "
 			insertParams := make([]string, 0)
 			insertData := make([]interface{}, 0)
 			for _, info := range warehousingInfo {
-				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
 				insertData = append(insertData, info.WarehousingId)
 				insertData = append(insertData, info.DrugId)
 				insertData = append(insertData, info.Number)
@@ -445,6 +445,7 @@ func CreateDrugWarehousingInfo(warehousingInfo []*models.DrugWarehouseInfo) (err
 				insertData = append(insertData, info.StockMaxNumber)
 				insertData = append(insertData, info.MaxUnit)
 				insertData = append(insertData, info.MinUnit)
+				insertData = append(insertData, info.BatchNumber)
 			}
 			thisSQL += strings.Join(insertParams, ", ")
 			err = utx.Exec(thisSQL, insertData...).Error
@@ -740,6 +741,28 @@ func FindAllDrugWarehousingList(orgId int64, page int64, limit int64, startTime
 	return
 }
 
+func FindAllDrugWarehousingListOne(orgId int64, page int64, limit int64, startTime int64, endTime int64, types int64, keywords string, ids []int64) (list []*VMDrugWarehouse, total int64, err error) {
+	db := readDb.Model(&VMDrugWarehouse{})
+	db = db.Where("xt_drug_warehouse.org_id = ? AND xt_drug_warehouse.status = 1", orgId)
+	db = db.Preload("Manufacturers", "status = 1 AND org_id = ?", orgId)
+	db = db.Preload("Dealers", "status = 1 AND org_id = ?", orgId)
+	if len(keywords) > 0 {
+		likeKey := "%" + keywords + "%"
+		db = db.Joins("join sgj_users.sgj_user_admin_role on sgj_user_admin_role.admin_user_id = xt_drug_warehouse.creater")
+		db = db.Where(" sgj_user_admin_role.user_name LIKE ? OR xt_drug_warehouse.warehousing_order LIKE ?  OR xt_drug_warehouse.id in(?)", likeKey, likeKey, ids).Group("xt_drug_warehouse.id")
+	}
+	if startTime > 0 {
+		db = db.Where("xt_drug_warehouse.operation_time >=?", startTime)
+	}
+	if endTime > 0 {
+		db = db.Where("xt_drug_warehouse.operation_time<= ?", endTime)
+	}
+	db = db.Count(&total)
+	offset := (page - 1) * limit
+	err = db.Offset(offset).Limit(limit).Order("xt_drug_warehouse.ctime desc").Find(&list).Error
+	return
+}
+
 func FindWarehousingInfoById(id int64) (list []*models.WarehousingInfo, err error) {
 	err = readDb.Model(&models.WarehousingInfo{}).Where("warehousing_id = ? AND status = 1", id).Preload("GoodInfo").Find(&list).Error
 	return list, err
@@ -766,7 +789,7 @@ func FindDrugWarehousingInfoByIdOne(id []string, org_id int64) (list []*models.S
 	if org_id > 0 {
 		db = db.Where("x.org_id = ?", org_id)
 	}
-	err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehouseing_unit,x.max_unit,x.min_unit,x.stock_max_number,x.stock_min_number,x.price,x.remark,x.batch_number,t.manufacturer,t.dealer,t.drug_name,t.last_price,t.dose_unit,t.dose,t.min_number,t.min_unit,t.max_unit,t.drug_type").Joins("left join xt_base_drug as t on t.id = x.drug_id").Scan(&list).Error
+	err = db.Select("x.id,x.warehousing_id,x.drug_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehouseing_unit,x.stock_max_number,x.stock_min_number,x.price,x.remark,x.batch_number,x.batch_number,t.manufacturer,t.dealer,t.drug_name,t.last_price,t.dose_unit,t.dose,t.min_number,t.min_unit,t.max_unit,t.drug_type").Joins("left join xt_base_drug as t on t.id = x.drug_id").Scan(&list).Error
 	return list, err
 }
 
@@ -963,7 +986,7 @@ func FindReturnInfoById(id int64) (list []*models.SalesReturnInfo, err error) {
 }
 
 func FindCancelStockInfoById(id int64) (list []*models.CancelStockInfo, err error) {
-	err = readDb.Model(&models.CancelStockInfo{}).Where("cancel_stock_id = ? AND status = 1", id).Find(&list).Error
+	err = readDb.Model(&models.CancelStockInfo{}).Where("cancel_stock_id = ? AND status = 1", id).Preload("GoodInfo", "status = 1").Find(&list).Error
 	return list, err
 }
 
@@ -1044,11 +1067,11 @@ func CreateWarehousingOutInfo(warehouseOutInfo []*models.WarehouseOutInfo) (err
 	if len(warehouseOutInfo) > 0 {
 		utx := writeDb.Begin()
 		if len(warehouseOutInfo) > 0 {
-			thisSQL := "INSERT INTO xt_warehouse_out_info (warehouse_out_id, good_id, good_type_id, product_date,expiry_date,count,price,total_price,remark,ctime,status,org_id,warehouse_out_order_number,type,dealer,manufacturer,number) VALUES "
+			thisSQL := "INSERT INTO xt_warehouse_out_info (warehouse_out_id, good_id, good_type_id, product_date,expiry_date,count,price,total_price,remark,ctime,status,org_id,warehouse_out_order_number,type,dealer,manufacturer,number,license_number) VALUES "
 			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.GoodId)
 				insertData = append(insertData, info.GoodTypeId)
@@ -1066,6 +1089,7 @@ func CreateWarehousingOutInfo(warehouseOutInfo []*models.WarehouseOutInfo) (err
 				insertData = append(insertData, info.Dealer)
 				insertData = append(insertData, info.Manufacturer)
 				insertData = append(insertData, info.Number)
+				insertData = append(insertData, info.LicenseNumber)
 			}
 			thisSQL += strings.Join(insertParams, ", ")
 			err = utx.Exec(thisSQL, insertData...).Error
@@ -1084,11 +1108,11 @@ func CreateDrugWarehousingOutInfo(warehouseOutInfo []*models.DrugWarehouseOutInf
 	if len(warehouseOutInfo) > 0 {
 		utx := writeDb.Begin()
 		if len(warehouseOutInfo) > 0 {
-			thisSQL := "INSERT INTO xt_drug_warehouse_out_info (warehouse_out_id, drug_id, product_date,expiry_date,count,price,total_price,remark,ctime,status,org_id,warehouse_out_order_number,type,dealer,manufacturer,retail_price,retail_total_price) VALUES "
+			thisSQL := "INSERT INTO xt_drug_warehouse_out_info (warehouse_out_id, drug_id, product_date,expiry_date,count,price,total_price,remark,ctime,status,org_id,warehouse_out_order_number,type,dealer,manufacturer,retail_price,retail_total_price,number,batch_number) VALUES "
 			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)
@@ -1106,7 +1130,8 @@ func CreateDrugWarehousingOutInfo(warehouseOutInfo []*models.DrugWarehouseOutInf
 				insertData = append(insertData, info.Manufacturer)
 				insertData = append(insertData, info.RetailPrice)
 				insertData = append(insertData, info.RetailTotalPrice)
-
+				insertData = append(insertData, info.Number)
+				insertData = append(insertData, info.BatchNumber)
 			}
 			thisSQL += strings.Join(insertParams, ", ")
 			err = utx.Exec(thisSQL, insertData...).Error
@@ -1207,6 +1232,30 @@ func FindAllDrugWarehouseOutList(orgId int64, page int64, limit int64, startTime
 
 }
 
+func FindAllDrugWarehouseOutListOne(orgId int64, page int64, limit int64, startTime int64, endTime int64, types int64, keywords string, ids []int64) (list []*models.DrugWarehouseOut, total int64, err error) {
+	db := readDb.Model(&models.DrugWarehouseOut{})
+	db = db.Where("xt_drug_warehouse_out.org_id = ? AND xt_drug_warehouse_out.status = 1 ", orgId)
+
+	if len(keywords) > 0 {
+		likeKey := "%" + keywords + "%"
+		db = db.Joins("join sgj_users.sgj_user_admin_role on sgj_user_admin_role.admin_user_id = xt_drug_warehouse_out.creater")
+
+		db = db.Where("sgj_user_admin_role.user_name LIKE ? OR xt_drug_warehouse_out.warehouse_out_order_number LIKE ? or xt_drug_warehouse_out.id in(?) ", likeKey, likeKey, ids).Group("xt_drug_warehouse_out.id")
+	}
+
+	if startTime > 0 {
+		db = db.Where("xt_drug_warehouse_out.ctime >=?", startTime)
+	}
+	if endTime > 0 {
+		db = db.Where("xt_drug_warehouse_out.ctime<= ?", endTime)
+	}
+	db = db.Count(&total)
+	offset := (page - 1) * limit
+	err = db.Offset(offset).Limit(limit).Order("xt_drug_warehouse_out.ctime desc").Find(&list).Error
+	return list, total, err
+
+}
+
 func FindWarehouseOutInfoById(id int64) (list []*models.WarehouseOutInfo, err error) {
 	err = readDb.Model(&models.WarehouseOutInfo{}).Where("warehouse_out_id = ? AND status = 1 AND count <> 0 AND good_id <> 0", id).Preload("GoodInfo", "status = 1").Order("good_type_id desc").Find(&list).Error
 	return list, err
@@ -1236,6 +1285,8 @@ type DrugWarehouseOutInfo struct {
 	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"`
+	Number                  string  `gorm:"column:number" json:"number" form:"number"`
+	BatchNumber             string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
 	Drug                    *Drug   `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug"`
 }
 
@@ -1955,7 +2006,7 @@ func EditDrugCancelStock(sales models.DrugCancelStock) {
 }
 
 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
+	err = readDb.Model(&models.CancelStock{}).Where("id = ? AND status = 1", id).First(&cancelStock).Error
 	return cancelStock, err
 
 }
@@ -2396,6 +2447,7 @@ type DrugAutomaticReduceDetail struct {
 	OrgId                   int64            `gorm:"column:org_id" json:"org_id" form:"org_id"`
 	DrugId                  int64            `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
 	Count                   int64            `gorm:"column:count" json:"count" form:"count"`
+	CountUnit               string           `gorm:"column:count_unit" json:"count_unit" form:"count_unit"`
 	Drug                    *Drug            `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug"`
 	Patients                *models.Patients `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"user"`
 }
@@ -2976,7 +3028,7 @@ func GetStockListById(good_id int64, orgid int64, limit int64, page int64, start
 	if good_id > 0 {
 		db = db.Where("x.good_id = ?", good_id)
 	}
-	err = db.Select("x.id,x.warehousing_id,x.good_id,x.good_type_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehousing_unit,x.stock_count,x.price,x.total_price,x.dealer,t.manufacturer,x.remark,x.ctime,x.is_return,x.warehousing_order,x.type,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.min_unit").Joins("left join xt_good_information as t on t.id = x.good_id").Count(&total).Offset(offset).Limit(limit).Scan(&info).Error
+	err = db.Select("x.id,x.warehousing_id,x.good_id,x.good_type_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.warehousing_unit,x.stock_count,x.price,x.total_price,x.dealer,t.manufacturer,x.remark,x.ctime,x.is_return,x.warehousing_order,x.type,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.min_unit,t.buy_price").Joins("left join xt_good_information as t on t.id = x.good_id").Count(&total).Offset(offset).Limit(limit).Scan(&info).Error
 	return info, total, err
 
 }
@@ -2985,6 +3037,7 @@ func GetStockOutList(good_id int64, orgid int64, limit int64, page int64, starti
 	offset := (page - 1) * limit
 
 	db := XTReadDB().Table("xt_warehouse_out_info as x").Where("x.status= 1")
+
 	if startime > 0 {
 		db = db.Where("x.ctime>=?", startime)
 	}
@@ -3070,7 +3123,7 @@ func GetOrderDetialByOrderId(id int64, orgid int64) (out []*models.WarehouseOutI
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
 	}
-	err = db.Select("x.id,x.warehouse_out_id,x.good_id,sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,x.is_sys,x.sys_record_time,x.number,x.remark,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.packing_unit,t.min_unit").Joins("left join xt_good_information as t on t.id=x.good_id").Group("x.good_id").Order("x.ctime desc").Scan(&out).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.good_id,sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,x.is_sys,x.sys_record_time,x.number,x.remark,x.license_number,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.packing_unit,t.min_unit").Joins("left join xt_good_information as t on t.id=x.good_id").Group("x.good_id").Order("x.ctime desc").Scan(&out).Error
 	return out, err
 }
 
@@ -3098,7 +3151,7 @@ func GetOrderDetialByOrderIdOne(id []string, orgid int64) (out []*models.Warehou
 	if orgid > 0 {
 		db = db.Where("x.org_id = ?", orgid)
 	}
-	err = db.Select("x.id,x.warehouse_out_id,x.good_id,sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,x.is_sys,x.sys_record_time,x.number,x.remark,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.packing_unit,t.min_unit").Joins("left join xt_good_information as t on t.id=x.good_id").Group("x.good_id").Order("x.ctime desc").Scan(&out).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.good_id,sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,x.is_sys,x.sys_record_time,x.number,x.remark,x.license_number,t.good_name,t.good_type_id,t.specification_name,t.min_number,t.packing_unit,t.min_unit").Joins("left join xt_good_information as t on t.id=x.good_id").Group("x.good_id").Order("x.ctime desc").Scan(&out).Error
 	return out, err
 }
 
@@ -3139,7 +3192,7 @@ func GetExprotStockList(orgid int64, orderid []string, startime int64, endtime i
 	if endtime > 0 {
 		db = db.Where("x.ctime<=?", endtime)
 	}
-	err = db.Select("x.id,x.good_id,x.good_type_id,x.number,x.product_date,x.expiry_date,Sum(x.warehousing_count)as total_count,x.price,x.dealer,x.manufacturer,x.remark,t.good_name,t.packing_unit,t.specification_name,t.manufacturer,t.dealer").Joins("left join xt_good_information as t on t.id = x.good_id").Group("x.good_id").Scan(&info).Error
+	err = db.Select("x.id,x.good_id,x.good_type_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.price,x.dealer,x.manufacturer,x.remark,x.license_number,t.good_name,t.packing_unit,t.specification_name,t.manufacturer,t.dealer").Joins("left join xt_good_information as t on t.id = x.good_id").Scan(&info).Error
 
 	return info, err
 }
@@ -3182,7 +3235,7 @@ func GetOutExprotList(orgid int64, ids []string, startime int64, endtime int64)
 		db = db.Where("x.ctime<=?", endtime)
 	}
 
-	err = db.Select("x.id,x.warehouse_out_id,x.good_id,x.good_type_id,x.warehousing_out_target,Sum(x.count) as count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.remark,x.number,t.good_name,t.specification_name,t.min_number,t.packing_price,t.min_unit,t.packing_unit,t.manufacturer,t.dealer").Joins("left join xt_good_information as t on t.id = x.good_id").Group("x.good_id").Scan(&out).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.good_id,x.good_type_id,x.warehousing_out_target,x.count,x.price,x.total_price,x.product_date,x.expiry_date,x.ctime,x.org_id,x.remark,x.number,x.license_number,t.good_name,t.specification_name,t.min_number,t.packing_price,t.min_unit,t.packing_unit,t.manufacturer,t.dealer").Joins("left join xt_good_information as t on t.id = x.good_id").Scan(&out).Error
 	return out, err
 
 }
@@ -3216,3 +3269,191 @@ func FindeDrugWarehouseOutDetail(ids []string, orgid int64) (info []*models.VmDr
 	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,x.warehousing_out_target,x.count,x.count_unit,x.price,x.product_date,x.expiry_date,x.number,x.batch_number,t.drug_type,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,t.last_price,t.drug_name").Joins("left join xt_base_drug as t on t.id =x.drug_id").Scan(&info).Error
 	return info, err
 }
+
+func GetDrugNameByKeyword(keyword string, orgid int64) (basedrug []*models.XtBaseDrug, err error) {
+
+	db := XTReadDB().Table("xt_base_drug as x").Where("x.status = 1")
+	likeKey := "%" + keyword + "%"
+	if len(keyword) > 0 {
+		db = db.Where("x.drug_name like ?", likeKey)
+	}
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	err = db.Find(&basedrug).Error
+
+	return basedrug, err
+
+}
+
+func GetDrugWarehouseOrderDetail(ids []int64, orgid int64, startime int64, endtime int64) (info []*models.XtDrugWarehouseOutInfo, err error) {
+
+	db := XTReadDB().Table("xt_drug_warehouse_out_info as x").Where("x.status = 1")
+
+	if len(ids) > 0 {
+		db = db.Where("x.drug_id in(?)", ids)
+	}
+
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("x.ctime>=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.ctime<=?", endtime)
+	}
+
+	err = db.Find(&info).Error
+	return info, err
+}
+
+func GetDrugWarehouseOrderDetailTwo(ids []int64, orgid int64, startime int64, endtime int64) (info []*models.XtDrugWarehouseInfo, err error) {
+
+	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
+
+	if len(ids) > 0 {
+		db = db.Where("x.drug_id in(?)", ids)
+	}
+
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	if startime > 0 {
+		db = db.Where("x.ctime>=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.ctime<=?", endtime)
+	}
+
+	err = db.Find(&info).Error
+	return info, err
+}
+
+func GetDrugTotalCount(drugid int64, orgid int64) (info models.VmDrugWarehouseInfo, err error) {
+
+	db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1")
+	if drugid > 0 {
+		db = db.Where("x.drug_id = ?", drugid)
+	}
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	err = db.Select("x.drug_id,sum(x.stock_max_number) as count").Find(&info).Error
+	return info, err
+}
+
+func GetDrugByGoodId(drugid int64) (models.BaseDrugLib, error) {
+
+	lib := models.BaseDrugLib{}
+	err := XTReadDB().Model(&lib).Where("id = ? and status = 1", drugid).Find(&lib).Error
+	return lib, err
+}
+
+func GetWarehoureOrderInfoList(goodid int64, orgid int64) (info []*models.WarehousingInfo, err error) {
+
+	db := XTReadDB().Table("xt_warehouse_info as x").Where("x.status = 1")
+
+	if goodid > 0 {
+		db = db.Where("x.good_id = ?", goodid)
+	}
+
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+
+	err = db.Select("x.id,x.warehousing_id,x.good_id,x.good_type_id,x.number,x.product_date,x.expiry_date,x.warehousing_count,x.price,x.total_price,x.dealer,x.manufacturer,x.remark,x.is_return,x.warehousing_order,x.warehousing_unit,x.stock_count,x.license_number,x.org_id").Find(&info).Error
+	return info, err
+}
+
+func UpdateWarehousingCount(info *models.WarehousingInfo, goodid int64, orgid int64, warehousingId int64) error {
+
+	err := XTWriteDB().Model(&info).Where("good_id = ? and org_id = ? and status =1 and warehousing_id = ?", goodid, orgid, warehousingId).Updates(map[string]interface{}{"stock_count": info.StockCount}).Error
+	return err
+}
+
+func GetSingleCancelOrder(id int64, orgid int64) (info []*models.CancelStockInfo, err error) {
+
+	err = XTReadDB().Where("cancel_stock_id = ? and status = 1 and org_id = ?", id, orgid).Preload("GoodInfo", "status = 1").Find(&info).Error
+	return info, err
+}
+
+func UpdateCancelOut(list []*models.WarehousingInfo, count int64) error {
+
+	//遍历循环入库数据
+	for i, item := range list {
+		//计算每个批次剩余库存与入库数据的差 然后和退库数量比较
+		if (item.WarehousingCount - item.StockCount) >= count {
+			//如果差距大于退库数量，则直接把退库数量增加到该批次中
+			info := models.WarehousingInfo{
+				GoodId:        item.GoodId,
+				OrgId:         item.OrgId,
+				WarehousingId: item.WarehousingId,
+				StockCount:    item.StockCount + count,
+			}
+			UpdateWarehousingCount(&info, item.GoodId, item.OrgId, item.WarehousingId)
+			break
+		}
+
+		if (item.WarehousingCount - item.StockCount) < count {
+
+			//如果该批次小于退库数量,则先出库该相差数量
+			var countOne = item.WarehousingCount - item.StockCount
+
+			infoOne := models.WarehousingInfo{
+				GoodId:        item.GoodId,
+				OrgId:         item.OrgId,
+				WarehousingId: item.WarehousingId,
+				StockCount:    countOne + item.StockCount,
+			}
+
+			err := UpdateWarehousingCount(&infoOne, item.GoodId, item.OrgId, item.WarehousingId)
+			if err == nil {
+				//剩余的出库到第二个批次
+				var countTwo = count - countOne
+				infos := append(list, list[i+1])
+				var idArray []*models.WarehousingInfo
+				for _, it := range infos {
+					if it.WarehousingId != item.WarehousingId {
+						idArray = append(idArray, it)
+					}
+				}
+				//查询更新后的库存
+				UpdateCancelOut(idArray, countTwo)
+				return err
+			} else {
+				return err
+			}
+
+		}
+	}
+
+	return err
+}
+
+func GetCancelStockOrderPrint(idstr []string) (info []*models.CancelStockInfo, err error) {
+
+	if len(idstr) > 0 {
+		err = XTReadDB().Model(&info).Where("cancel_stock_id in(?)", idstr).Preload("GoodInfo", "status = 1").Find(&info).Error
+	} else {
+		err = XTReadDB().Model(&info).Preload("GoodInfo", "status = 1").Find(&info).Error
+	}
+	return info, err
+}
+
+func GetCancelOutTotalCount(startime int64, endtime int64, orgid int64) (info []*models.VmCancelStockInfo, err error) {
+
+	db := XTReadDB().Table("xt_cancel_stock_info as x").Where("x.status = 1")
+
+	if startime > 0 {
+		db = db.Where("x.ctime >=?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("x.ctime <= ?", endtime)
+	}
+	if orgid > 0 {
+		db = db.Where("x.org_id = ?", orgid)
+	}
+	err = db.Select("x.good_id,sum(x.count) as count").Group("x.good_id").Scan(&info).Error
+	return info, err
+}

service/warhouse_service.go

@@ -2,7 +2,6 @@ package service
 
 import (
 	"XT_New/models"
-	"XT_New/models/service"
 	"XT_New/utils"
 	"errors"
 	"fmt"
@@ -523,23 +522,30 @@ func AutoDrugDeliverInfo(orgID int64, prescribingNumber int64, warehouseout *mod
 	// 将该批次的剩余库存数量转换为拆零数量
 
 	stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
-	fmt.Println("88i8uu7777777777777777777777777777", stock_number)
-	fmt.Println("77777544656666666666666666", deliver_number)
+
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
 	if stock_number >= deliver_number {
+		fmt.Println("价格表32322222222222222222232322332", advice.Price)
 		warehouseOutInfo := &models.DrugWarehouseOutInfo{
 			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
 			WarehouseOutId:          warehouseout.ID,
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
-			Remark:                  "",
+			Remark:                  advice.Remark,
 			OrgId:                   orgID,
 			Type:                    1,
-			Manufacturer:            0,
-			Dealer:                  0,
+			Manufacturer:            advice.Manufacturer,
+			Dealer:                  advice.Dealer,
 			IsSys:                   0,
 			SysRecordTime:           advice.Ctime,
 			DrugId:                  advice.DrugId,
+			ExpiryDate:              advice.ExpiryDate,
+			ProductDate:             advice.ProductDate,
+			Number:                  advice.Number,
+			BatchNumber:             advice.BatchNumber,
+			Count:                   advice.Count,
+			RetailPrice:             advice.RetailPrice,
+			Price:                   advice.Price,
 		}
 
 		warehouseOutInfo.Count = deliver_number
@@ -592,14 +598,21 @@ func AutoDrugDeliverInfo(orgID int64, prescribingNumber int64, warehouseout *mod
 			WarehouseOutId:          warehouseout.ID,
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
-			Remark:                  "",
+			Remark:                  advice.Remark,
 			OrgId:                   orgID,
 			Type:                    1,
-			Manufacturer:            0,
-			Dealer:                  0,
+			Manufacturer:            advice.Manufacturer,
+			Dealer:                  advice.Dealer,
 			IsSys:                   0,
 			SysRecordTime:           advice.Ctime,
 			DrugId:                  advice.DrugId,
+			ExpiryDate:              advice.ExpiryDate,
+			ProductDate:             advice.ProductDate,
+			Number:                  advice.Number,
+			BatchNumber:             advice.BatchNumber,
+			Count:                   advice.Count,
+			RetailPrice:             advice.RetailPrice,
+			Price:                   advice.Price,
 		}
 
 		warehouseOutInfo.Count = stock_number
@@ -748,7 +761,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 	// 如果没有对应的库存，则报错
 
 	warehouse, err := FindFirstWarehousingInfoByStock(goods.GoodId, goods.GoodTypeId)
-	fmt.Println("库存数量", warehouse.StockCount)
+	fmt.Println("库存数量9999343434343434343434343434343434", warehouse.StockCount)
 	if err != nil {
 		return
 	}
@@ -829,6 +842,39 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 
 		return nil
 	} else {
+		fmt.Println("中国共产党万岁22322332323232322323232323232323")
+		// 当改批次的库存数量小于出库数量的话，则先把该批次出库完后，再进行递归出库
+		//warehouseOutInfo := &models.WarehouseOutInfo{
+		//  WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
+		//  WarehouseOutId:          warehouseOut.ID,
+		//  WarehouseInfotId:        warehouse.ID,
+		//  Status:                  1,
+		//  Ctime:                   time.Now().Unix(),
+		//  Remark:                  goods.Remark,
+		//  OrgId:                   orgID,
+		//  Type:                    1,
+		//  Manufacturer:            goods.Manufacturer,
+		//  Dealer:                  goods.Dealer,
+		//  IsSys:                   0,
+		//  SysRecordTime:           record_time,
+		//  GoodTypeId:              goods.GoodTypeId,
+		//  GoodId:                  goods.GoodId,
+		//  ExpiryDate:              goods.ExpiryDate,
+		//  ProductDate:             goods.ProductDate,
+		//  Number:                  goods.Number,
+		//  Price:                   goods.Price,
+		//  LicenseNumber:           goods.LicenseNumber,
+		//}
+		//warehouseOutInfo.Count = stock_number
+		//stockInInfo, _ :=FindLastStockInInfoRecord(goods.GoodId, orgID)
+		//fmt.Println("stockINFO2232232323223322332323223323223",stockInInfo)
+		//warehouseOutInfo.Price = stockInInfo.Price
+		//
+		//errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
+		//fmt.Println("errOne2232323232323232333232323",errOne)
+		//if errOne != nil {
+		//  return errOne
+		//}
 		// 出库完成后，要将该批次库存清零
 		warehouse.StockCount = 0
 		warehouse.Mtime = time.Now().Unix()
@@ -1098,6 +1144,7 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 	fmt.Println("8888888888888888888", deliver_number)
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
 	if stock_number >= deliver_number {
+		fmt.Println("g2332232332323232232323322332", goods.Price)
 		warehouseOutInfo := &models.WarehouseOutInfo{
 			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 			WarehouseOutId:          warehouseOut.ID,
@@ -1117,10 +1164,11 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 			ProductDate:             goods.ProductDate,
 			Number:                  goods.Number,
 			Price:                   goods.Price,
+			LicenseNumber:           goods.LicenseNumber,
 		}
 		warehouseOutInfo.Count = goods.Count
-		stockInInfo, _ := FindLastStockInInfoRecord(goods.GoodId, orgID)
-		warehouseOutInfo.Price = stockInInfo.Price
+		//stockInInfo, _ := FindLastStockInInfoRecord(goods.GoodId, orgID)
+		//warehouseOutInfo.Price = stockInInfo.Price
 
 		errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
 		if errOne != nil {
@@ -1135,12 +1183,17 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 
 		warehouse.StockCount = warehouse.StockCount - maxNumber
 		warehouse.Mtime = time.Now().Unix()
+
 		if warehouse.StockCount < 0 {
-			fmt.Println("进来33232323232232323233232", warehouse.StockCount)
+
 			return errors.New("库存数量不足")
 		}
-		return nil
+		errThree := UpDateWarehouseInfoByStock(&warehouse)
+		if errThree != nil {
+			return errThree
+		}
 	} else {
+		fmt.Println("中国共产党万岁22322332323232322323232323232323")
 		// 当改批次的库存数量小于出库数量的话，则先把该批次出库完后，再进行递归出库
 		warehouseOutInfo := &models.WarehouseOutInfo{
 			WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
@@ -1161,13 +1214,15 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 			ProductDate:             goods.ProductDate,
 			Number:                  goods.Number,
 			Price:                   goods.Price,
+			LicenseNumber:           goods.LicenseNumber,
 		}
 		warehouseOutInfo.Count = stock_number
-		stockInInfo, _ := service.FindLastStockInInfoRecord(goods.GoodId, orgID)
-		warehouseOutInfo.Price = stockInInfo.Price
-
-		errOne := service.AddSigleWarehouseOutInfo(warehouseOutInfo)
+		//stockInInfo, _ := FindLastStockInInfoRecord(goods.GoodId, orgID)
+		//fmt.Println("stockINFO2232232323223322332323223323223", stockInInfo)
+		//warehouseOutInfo.Price = stockInInfo.Price
 
+		errOne := AddSigleWarehouseOutInfo(warehouseOutInfo)
+		fmt.Println("errOne2232323232323232333232323", errOne)
 		if errOne != nil {
 			return errOne
 		}
@@ -1180,7 +1235,7 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 		}
 		// 清零完该库存后，还有剩余出库未出完，进行对应的递归操作
 		goods.Count = deliver_number - stock_number
-
+		fmt.Println("goods3333333333333333333333", goods.Count)
 		ConsumablesDeliveryOne(orgID, record_time, goods, warehouseOut, count)
 
 	}