耗材参数

controllers/drug_stock_api_contorller.go

@@ -1998,6 +1998,7 @@ func (this *StockDrugApiController) GetUserDetailInfo() {
 	}
 	adminUserInfo := this.GetAdminUserInfo()
 	userDetails, err, total := service.FindDrugStockUserDetailById(adminUserInfo.CurrentOrgId, order_id)
+
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"list":  userDetails,

controllers/gobal_config_api_controller.go

@@ -1787,14 +1787,16 @@ func (c *GobalConfigApiController) GetDrugAutoMaticList() {
 	drugConfig, _ := service.GetDrugStockConfig(orgId)
 	list, err := service.GetDrugAutoMaticList(orgId, warehous_out_id, record_time, warehouse_out_order_number)
 	drugList, err := service.GetAllBaseDrugList(orgId)
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateConfig)
 		return
 	}
 	c.ServeSuccessJSON(map[string]interface{}{
-		"list":       list,
-		"drugConfig": drugConfig,
-		"drugList":   drugList,
+		"list":             list,
+		"drugConfig":       drugConfig,
+		"drugList":         drugList,
+		"manufacturerList": manufacturerList,
 	})
 }
 

controllers/stock_in_api_controller.go

@@ -93,8 +93,6 @@ func StockManagerApiRegistRouters() {
 func (c *StockManagerApiController) CreateWarehouse() {
 
 	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)
 
@@ -122,8 +120,6 @@ func (c *StockManagerApiController) CreateWarehouse() {
 		Ctime:            ctime,
 		Status:           1,
 		WarehousingTime:  warehousingDate.Unix(),
-		Dealer:           dealer_id,
-		Manufacturer:     manufacturer_id,
 		Type:             types,
 	}
 	service.AddSigleWarehouse(&warehousing)
@@ -210,6 +206,8 @@ func (c *StockManagerApiController) CreateWarehouse() {
 
 				remark, _ := items["remark"].(string)
 
+				manufacturer := int64(items["manufacturer"].(float64))
+				dealer := int64(items["dealer"].(float64))
 				warehouseInfo := &models.WarehousingInfo{
 					WarehousingOrder: warehousing.WarehousingOrder,
 					WarehousingId:    warehousing.ID,
@@ -226,9 +224,9 @@ func (c *StockManagerApiController) CreateWarehouse() {
 					Remark:           remark,
 					OrgId:            adminUserInfo.CurrentOrgId,
 					Type:             types,
-					Manufacturer:     manufacturer_id,
-					Dealer:           dealer_id,
+					Manufacturer:     manufacturer,
 					StockCount:       warehousing_count,
+					Dealer:           dealer,
 				}
 				warehousingInfo = append(warehousingInfo, warehouseInfo)
 
@@ -464,8 +462,6 @@ func (c *StockManagerApiController) EditWarehouse() {
 	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)
@@ -493,8 +489,6 @@ func (c *StockManagerApiController) EditWarehouse() {
 		Status:           1,
 		WarehousingTime:  warehousingDate.Unix(),
 		Type:             warehouse.Type,
-		Dealer:           dealer_id,
-		Manufacturer:     manufacturer_id,
 	}
 
 	service.EditWarehousing(warehousing)
@@ -583,6 +577,9 @@ func (c *StockManagerApiController) EditWarehouse() {
 
 				remark, _ := items["remark"].(string)
 
+				manufacturer := int64(items["manufacturer"].(float64))
+				dealer := int64(items["dealer"].(float64))
+
 				if items["id"] == nil || reflect.TypeOf(items["id"]).String() != "float64" {
 					utils.ErrorLog("id")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -607,8 +604,9 @@ func (c *StockManagerApiController) EditWarehouse() {
 						Remark:           remark,
 						OrgId:            adminUserInfo.CurrentOrgId,
 						Type:             types,
-						Manufacturer:     manufacturer_id,
-						Dealer:           dealer_id,
+						Manufacturer:     manufacturer,
+						Dealer:           dealer,
+						StockCount:       warehousing_count,
 					}
 					warehousingInfo = append(warehousingInfo, warehouseInfo)
 
@@ -630,8 +628,9 @@ func (c *StockManagerApiController) EditWarehouse() {
 						Remark:           remark,
 						OrgId:            adminUserInfo.CurrentOrgId,
 						Type:             types,
-						Manufacturer:     manufacturer_id,
-						Dealer:           dealer_id,
+						Manufacturer:     manufacturer,
+						Dealer:           dealer,
+						StockCount:       warehousing_count,
 					}
 					upDateWarehousingInfo = append(upDateWarehousingInfo, warehouseInfo)
 				}
@@ -1042,8 +1041,7 @@ func (c *StockManagerApiController) EditReturnInfo() {
 }
 
 func (c *StockManagerApiController) CreateWarehouseOut() {
-	dealer_id, _ := c.GetInt64("dealer_id", 0)
-	manufacturer_id, _ := c.GetInt64("manufacturer_id", 0)
+
 	types, _ := c.GetInt64("type", 0)
 
 	ctime := time.Now().Unix()
@@ -1076,8 +1074,6 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 		Ctime:                   ctime,
 		Status:                  1,
 		WarehouseOutTime:        warehousingOutDate.Unix(),
-		Dealer:                  dealer_id,
-		Manufacturer:            manufacturer_id,
 		Type:                    types,
 	}
 	service.AddSigleWarehouseOut(&warehouseOut)
@@ -1105,7 +1101,7 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 				}
 
 				good_id := int64(items["good_id"].(float64))
-				fmt.Println("stockout223232324343445456465656565565665", good_id)
+
 				if items["good_type_id"] == nil || reflect.TypeOf(items["good_type_id"]).String() != "float64" {
 					utils.ErrorLog("good_type_id")
 					c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -1131,6 +1127,8 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 				total := float64(count) * price
 				remark := items["remark"].(string)
 
+				manufacturer := int64(items["manufacturer"].(float64))
+
 				warehouseOutInfo := &models.WarehouseOutInfo{
 					WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
 					WarehouseOutId:          warehouseOut.ID,
@@ -1144,8 +1142,7 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 					Remark:                  remark,
 					OrgId:                   adminUserInfo.CurrentOrgId,
 					Type:                    types,
-					Manufacturer:            manufacturer_id,
-					Dealer:                  dealer_id,
+					Manufacturer:            manufacturer,
 				}
 				warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
@@ -1284,8 +1281,6 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 	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)
@@ -1309,8 +1304,6 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 		ID:               warehouseOut.ID,
 		Mtime:            mtime,
 		WarehouseOutTime: warehouseOutDate.Unix(),
-		Manufacturer:     manufacturer_id,
-		Dealer:           dealer_id,
 	}
 
 	service.EditWarehouseOut(tempWarehouseOut)
@@ -1371,6 +1364,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 				}
 				id := int64(items["id"].(float64))
 
+				manufacturer := int64(items["manufacturer"].(float64))
 				if id == 0 {
 					warehouseOutInfo := &models.WarehouseOutInfo{
 						WarehouseOutOrderNumber: warehouseOut.WarehouseOutOrderNumber,
@@ -1385,8 +1379,6 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 						Remark:                  remark,
 						OrgId:                   adminUserInfo.CurrentOrgId,
 						Type:                    types,
-						Manufacturer:            manufacturer_id,
-						Dealer:                  dealer_id,
 						IsSys:                   0,
 						SysRecordTime:           0,
 					}
@@ -1422,8 +1414,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 						OrgId:                   adminUserInfo.CurrentOrgId,
 						Mtime:                   time.Now().Unix(),
 						Type:                    types,
-						Manufacturer:            manufacturer_id,
-						Dealer:                  dealer_id,
+						Manufacturer:            manufacturer,
 						IsSys:                   is_sys,
 						SysRecordTime:           sys_record_time,
 					}
@@ -3615,9 +3606,11 @@ func (this *StockManagerApiController) PostSearchGoodList() {
 	orgId := adminUserInfo.CurrentOrgId
 	list, _ := service.GetSearchGoodList(keyword, orgId)
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	dealerList, _ := service.GetAllDealerList(orgId)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list":             list,
 		"manufacturerList": manufacturerList,
+		"dealerList":       dealerList,
 	})
 }
 
@@ -3695,10 +3688,12 @@ func (this *StockManagerApiController) GetStockListById() {
 	}
 	manufacturerList, _ := service.GetAllManufacturerList(orgId)
 	list, total, _ := service.GetStockListById(id, orgId, limit, page, startTime, endTime)
+	outList, _, _ := service.GetStockOutList(id, orgId, limit, page, startTime, endTime)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list":             list,
 		"total":            total,
 		"manufacturerList": manufacturerList,
+		"outList":          outList,
 	})
 }
 

service/gobal_config_service.go

@@ -548,7 +548,7 @@ func GetDrugStockFlow(drugid int64, startime int64, endtime int64, page int64, l
 		db = db.Where("x.drug_id = ?", drugid)
 	}
 
-	err = db.Joins("left join xt_base_drug as t on t.id = x.drug_id and t.status = 1 and t.org_id = ?", orgid).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.total_price,x.dealer,x.remark,x.org_id,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.batch_number,t.drug_name,t.drug_type,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,t.last_price,t.manufacturer").Offset(offset).Count(&total).Order("x.ctime desc").Scan(&list).Error
+	err = db.Joins("left join xt_base_drug as t on t.id = x.drug_id and t.status = 1 and t.org_id = ?", orgid).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.total_price,x.dealer,x.remark,x.org_id,x.is_return,x.warehousing_order,x.type,x.retail_price,x.retail_total_price,x.batch_number,x.ctime,t.drug_name,t.drug_type,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,t.last_price,t.manufacturer").Offset(offset).Count(&total).Order("x.ctime desc").Scan(&list).Error
 	return list, total, err
 }
 
@@ -576,7 +576,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").Offset(offset).Count(&total).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").Offset(offset).Count(&total).Order("x.ctime desc").Scan(&list).Error
 	return list, total, err
 }
 

service/stock_service.go

@@ -2782,7 +2782,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,x.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").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
 
 }
@@ -2804,7 +2804,7 @@ func GetStockOutList(good_id int64, orgid int64, limit int64, page int64, starti
 	if good_id > 0 {
 		db = db.Where("x.good_id = ?", good_id)
 	}
-	err = db.Select("x.id,x.warehouse_out_id,x.warehouse_info_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").Offset(offset).Count(&total).Scan(&info).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.warehouse_info_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.warehouse_out_order_number").Offset(offset).Count(&total).Scan(&info).Error
 	return info, total, err
 }
 
@@ -2843,7 +2843,17 @@ func GetAutoDiallysisBefor(startime int64, endtime int64, orgid int64) (info []*
 
 func GetOutStockTotalCountFour(startime int64, endtime int64, orgid int64) (autoMatic []*models.NewXtAutomaticReduceDetail, err error) {
 
-	err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and x.record_time >=? and x.record_time<=? and `status` = 1)  as b GROUP BY good_id", orgid, startime, endtime).Scan(&autoMatic).Error
+	if startime > 0 {
+		err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and x.record_time >=?  and `status` = 1)  as b GROUP BY good_id", orgid, startime).Scan(&autoMatic).Error
+	} else {
+		err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and `status` = 1)  as b GROUP BY good_id", orgid).Scan(&autoMatic).Error
+	}
+
+	if endtime > 0 {
+		err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and x.record_time <=?  and `status` = 1)  as b GROUP BY good_id", orgid, endtime).Scan(&autoMatic).Error
+	} else {
+		err = XTReadDB().Raw("SELECT good_id,SUM(b.count) as count FROM (SELECT DISTINCT x.patient_id,x.good_id,x.count FROM xt_automatic_reduce_detail as x WHERE x.org_id = ? and `status` = 1)  as b GROUP BY good_id", orgid).Scan(&autoMatic).Error
+	}
 
 	return autoMatic, err
 

service/warhouse_service.go

@@ -879,9 +879,8 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 			}
 		}
 		fmt.Println("newcount9999999999999999999999999999999", goods.NewCount)
-		
+
 		maxNumber = goods.Count
-		
 
 		if warehouse.StockCount < maxNumber {
 			return errors.New("库存数量不足")
@@ -1019,7 +1018,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 		goods.Count = deliver_number - stock_number
 
 		ConsumablesDelivery(orgID, patient_id, record_time, goods, warehouseOut, count)
-		
+
 	}
 	return nil
 }
@@ -1280,7 +1279,7 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 			Type:                    1,
 			Manufacturer:            0,
 			Dealer:                  0,
-			IsSys:                   2,
+			IsSys:                   1,
 			SysRecordTime:           record_time,
 			GoodTypeId:              goods.GoodTypeId,
 			GoodId:                  goods.GoodId,
@@ -1308,7 +1307,7 @@ func ConsumablesDeliveryOne(orgID int64, record_time int64, goods *models.Wareho
 				Type:                    1,
 				Manufacturer:            0,
 				Dealer:                  0,
-				IsSys:                   2,
+				IsSys:                   1,
 				SysRecordTime:           record_time,
 				GoodTypeId:              goods.GoodTypeId,
 				GoodId:                  goods.GoodId,
@@ -1431,7 +1430,7 @@ func ConsumablesDeliveryDeleteOne(orgID int64, record_time int64, good_yc *model
 			Type:          1,
 			Manufacturer:  0,
 			Dealer:        0,
-			IsSys:         2,
+			IsSys:         1,
 			SysRecordTime: record_time,
 			GoodTypeId:    good_yc.GoodTypeId,
 			GoodId:        good_yc.GoodId,