Merge remote-tracking branch 'origin/20211122' into 20211122

controllers/supply_order_api_contorller.go

@@ -1416,21 +1416,42 @@ func (this *SupplyOrderApiController) GetAllGoodOderList() {
 func (this *SupplyOrderApiController) GetGoodOrderDetail() {
 
 	id, _ := this.GetInt64("id")
+	ids := this.GetString("ids")
 	orgId := this.GetAdminUserInfo().CurrentOrgId
-	out, err := service.GetGoodOrderDetail(id, orgId)
-	list, _ := service.GetSupplyWarehouseOutById(id, orgId)
-	drugList, _ := service.GetSupplyDrugList(orgId)
-	goodList, _ := service.GetSupplyGoodList(orgId)
-	if err == nil {
-		this.ServeSuccessJSON(map[string]interface{}{
-			"out":      out,
-			"list":     list,
-			"goodList": goodList,
-			"drugList": drugList,
-		})
-	} else {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	if len(ids) == 0 {
+		out, err := service.GetGoodOrderDetail(id, orgId)
+		list, _ := service.GetSupplyWarehouseOutById(id, orgId)
+		drugList, _ := service.GetSupplyDrugList(orgId)
+		goodList, _ := service.GetSupplyGoodList(orgId)
+		if err == nil {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"out":      out,
+				"list":     list,
+				"goodList": goodList,
+				"drugList": drugList,
+			})
+		} 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)
+		drugList, _ := service.GetSupplyDrugList(orgId)
+		goodList, _ := service.GetSupplyGoodList(orgId)
+		if err == nil {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"out":      out,
+				"list":     list,
+				"goodList": goodList,
+				"drugList": drugList,
+			})
+		} else {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		}
 	}
+
 }
 
 func (this *SupplyOrderApiController) UpdateGoodOrder() {
@@ -2676,6 +2697,8 @@ func (this *SupplyOrderApiController) ModefyGoodOrder() {
 	//获取购货单的数据
 	goodOrder, _ := service.GetAllGoodOrderById(id, orgId)
 	drugList, _ := service.GetSupplyDrugList(orgId)
+	//获取已有关联的退货单
+	cancelList, _ := service.GetSupplyCancelWarehouse(id, orgId)
 	//查询是否存在退货单
 	_, errcode := service.GetSupplyCancelOrderById(id, orgId)
 	//无退库单
@@ -2710,6 +2733,7 @@ func (this *SupplyOrderApiController) ModefyGoodOrder() {
 		service.UpdateGoodSupplyFlow(id, orgId)
 		if err == nil {
 			this.ServeSuccessJSON(map[string]interface{}{
+				"cancelList":   cancelList,
 				"purcaseOrder": purcaseOrder,
 				"goodOrder":    goodOrder,
 				"drugList":     drugList,
@@ -2721,6 +2745,7 @@ func (this *SupplyOrderApiController) ModefyGoodOrder() {
 		}
 	} else if errcode == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
+			"cancelList":   cancelList,
 			"purcaseOrder": purcaseOrder,
 			"goodOrder":    goodOrder,
 			"drugList":     drugList,

models/supply.models.go

@@ -391,10 +391,11 @@ func (VmSpSupplierWarehouseCancel) TableName() string {
 }
 
 type VmSpSupplierWarehousingOutOrder struct {
-	ProjectId      int64 `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	IsSource       int64 `gorm:"column:is_source" json:"is_source" form:"is_source"`
-	Count          int64 `gorm:"column:count" json:"count" form:"count"`
-	WarehouseOutId int64 `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	ProjectId      int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	IsSource       int64  `gorm:"column:is_source" json:"is_source" form:"is_source"`
+	Count          int64  `gorm:"column:count" json:"count" form:"count"`
+	WarehouseOutId int64  `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	SupplyUnit     string `gorm:"column:supply_unit" json:"supply_unit" form:"supply_unit"`
 }
 
 func (VmSpSupplierWarehousingOutOrder) TableName() string {
@@ -402,9 +403,10 @@ func (VmSpSupplierWarehousingOutOrder) TableName() string {
 }
 
 type VmSpSupplierWarehousingCancelOrder struct {
-	ProjectId int64 `gorm:"column:project_id" json:"project_id" form:"project_id"`
-	IsSource  int64 `gorm:"column:is_source" json:"is_source" form:"is_source"`
-	Count     int64 `gorm:"column:count" json:"count" form:"count"`
+	ProjectId  int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	IsSource   int64  `gorm:"column:is_source" json:"is_source" form:"is_source"`
+	Count      int64  `gorm:"column:count" json:"count" form:"count"`
+	SupplyUnit string `gorm:"column:supply_unit" json:"supply_unit" form:"supply_unit"`
 }
 
 func (VmSpSupplierWarehousingCancelOrder) TableName() string {

service/supply_service.go

@@ -427,6 +427,12 @@ func GetSupplyWarehouseOutById(id int64, user_org_id int64) (order []*models.SpS
 	return order, err
 }
 
+func GetSupplyWarehouseOutByIdOne(id int64, user_org_id int64, ids []string) (order []*models.SpSupplierWarehousingOutOrder, err error) {
+
+	err = XTReadDB().Where("warehouse_out_id = ? and status = 1 and user_org_id = ? and project_id in(?)", id, user_org_id, ids).Find(&order).Error
+	return order, err
+}
+
 func GetAllGoodOderList(check_id int64, keyword string, page int64, limit int64, startime int64, endtime int64, orgid int64) (out []*models.VmSupplierWarehouseOut, total int64, err error) {
 	db := XTReadDB().Model(&out).Where("sgj_xt.xt_supplier_warehouse_out.status = 1")
 	likeKey := "%" + keyword + "%"