11月8日库存管理

controllers/supply_order_api_contorller.go

@@ -103,6 +103,9 @@ func SupplyOrderApiRegistRouters() {
 	beego.Router("/api/supply/deletereturnorderbyid", &SupplyOrderApiController{}, "Get:DeleteReturnOrderById")
 	//反审核退货单
 	beego.Router("/api/supply/modefyreturnorder", &SupplyOrderApiController{}, "Get:ModefyReturnOrder")
+
+	//获取采购数据
+	beego.Router("/api/supply/getgoodorderdetaillist", &SupplyOrderApiController{}, "Get:GetGoodOrderDetailList")
 }
 
 //判断前端参数是否为空
@@ -3083,7 +3086,7 @@ func (this *SupplyOrderApiController) ModefyGoodOrder() {
 	for _, it := range goodOrder {
 
 		if it.IsSource == 1 {
-			out, _ := service.GetDrugWarehosueInfoByWarehousingId(it.ProjectId, it.WarehousingId, orgId)
+			out, _ := service.GetDrugWarehosueInfoByWarehousingId(it.ProjectId, id, orgId)
 
 			if out.ID > 0 {
 				this.ServeSuccessJSON(map[string]interface{}{
@@ -3097,7 +3100,8 @@ func (this *SupplyOrderApiController) ModefyGoodOrder() {
 			}
 		}
 		if it.IsSource == 2 {
-			out, _ := service.GetGoodWarehouseInfoByWarehousingId(it.ProjectId, it.WarehousingId, orgId)
+			fmt.Println("hh23323233232232332232323232332", it.WarehouseOutId)
+			out, _ := service.GetGoodWarehouseInfoByWarehousingId(it.ProjectId, id, orgId)
 			if out.ID > 0 {
 				this.ServeSuccessJSON(map[string]interface{}{
 					"cancelList":   "",
@@ -3657,3 +3661,74 @@ func (this *SupplyOrderApiController) ModefyReturnOrder() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 	}
 }
+
+func (this *SupplyOrderApiController) GetGoodOrderDetailList() {
+	id, _ := this.GetInt64("id")
+	ids := this.GetString("ids")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	if len(ids) == 0 {
+		out, err := service.GetGoodOrderDetail(id, orgId)
+		list, _ := service.GetSupplyWarehouseOutById(id, orgId)
+		for _, item := range list {
+
+			if item.IsSource == 1 {
+				waresingList, _ := service.GetAllDrugWaresingList(item.ProjectId, orgId)
+				medical, _ := service.GetBaseDrugMedical(item.ProjectId)
+				item.DrugWarehouseInfo = waresingList
+				item.SpBaseDrug = medical
+			}
+			if item.IsSource == 2 {
+				waresingList, _ := service.GetAllGoodWaresingList(item.ProjectId, orgId)
+
+				item.GoodWarehouseInfo = waresingList
+			}
+		}
+		drugList, _ := service.GetSupplyDrugList(orgId)
+		goodList, _ := service.GetSupplyGoodList(orgId)
+		supplyList, _ := service.GetSupplierList(orgId)
+		if err == nil {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"out":        out,
+				"list":       list,
+				"goodList":   goodList,
+				"drugList":   drugList,
+				"supplyList": supplyList,
+			})
+		} else {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		}
+	}
+	if len(ids) > 0 {
+		idArray := strings.Split(ids, ",")
+		out, err := service.GetGoodOrderDetail(id, orgId)
+		list, _ := service.GetSupplyWarehouseOutByIdOne(id, orgId, idArray)
+		for _, item := range list {
+			if item.IsSource == 1 {
+				waresingList, _ := service.GetAllDrugWaresingList(item.ProjectId, orgId)
+				medical, _ := service.GetBaseDrugMedical(item.ProjectId)
+				item.DrugWarehouseInfo = waresingList
+				item.SpBaseDrug = medical
+			}
+			if item.IsSource == 2 {
+				waresingList, _ := service.GetAllGoodWaresingList(item.ProjectId, orgId)
+
+				item.GoodWarehouseInfo = waresingList
+			}
+		}
+		drugList, _ := service.GetSupplyDrugList(orgId)
+		goodList, _ := service.GetSupplyGoodList(orgId)
+		supplyList, _ := service.GetSupplierList(orgId)
+		if err == nil {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"out":        out,
+				"list":       list,
+				"goodList":   goodList,
+				"drugList":   drugList,
+				"supplyList": supplyList,
+			})
+		} else {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		}
+	}
+}

service/supply_service.go

@@ -554,7 +554,7 @@ func GetAllGoodOrderById(id int64, orgid int64) (order []*models.VSpSupplierWare
 	if orgid > 0 {
 		db = db.Where("o.user_org_id =? and o.is_warehouse= 1", orgid)
 	}
-	err = db.Select("o.id,o.order_number,o.project_id,o.count as count,o.supply_unit,o.is_source,o.warehousing_id").Find(&order).Error
+	err = db.Select("o.id,o.order_number,o.project_id,o.count as count,o.supply_unit,o.is_source,o.warehousing_id,o.warehouse_out_id").Find(&order).Error
 	return order, err
 }
 

service/warhouse_service.go

@@ -3008,7 +3008,7 @@ func AutoDrugDeliverInfoNight(orgID int64, prescribingNumber int64, warehouseout
 
 		warehouseOutInfo := &models.DrugWarehouseOutInfo{
 			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
-			WarehouseOutId:          warehouseout.ID,
+			WarehouseOutId:          advice.WarehouseOutId,
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
 			Remark:                  advice.Remark,
@@ -3043,7 +3043,7 @@ func AutoDrugDeliverInfoNight(orgID int64, prescribingNumber int64, warehouseout
 
 		drugWareInfo, _ := GetLastWarehouseOutInfoById(advice.DrugId)
 		drugflow := models.DrugFlow{
-			WarehouseOutId:          warehouseout.ID,
+			WarehouseOutId:          advice.WarehouseOutId,
 			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
 			DrugId:                  advice.DrugId,
 			Number:                  warehouse.Number,
@@ -3110,7 +3110,7 @@ func AutoDrugDeliverInfoNight(orgID int64, prescribingNumber int64, warehouseout
 		// 当该批次的库存数量小于出库数量的话，则先把该批次出库完后，再进行递归出库
 		warehouseOutInfo := &models.DrugWarehouseOutInfo{
 			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
-			WarehouseOutId:          warehouseout.ID,
+			WarehouseOutId:          advice.WarehouseOutId,
 			Status:                  1,
 			Ctime:                   time.Now().Unix(),
 			Remark:                  advice.Remark,
@@ -3144,7 +3144,7 @@ func AutoDrugDeliverInfoNight(orgID int64, prescribingNumber int64, warehouseout
 		}
 		drugWareInfo, _ := GetLastWarehouseOutInfoById(advice.DrugId)
 		drugflow := models.DrugFlow{
-			WarehouseOutId:          warehouseout.ID,
+			WarehouseOutId:          advice.WarehouseOutId,
 			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
 			DrugId:                  advice.DrugId,
 			Number:                  warehouse.Number,