11月8日库存管理

controllers/supply_order_api_contorller.go

@@ -20,14 +20,38 @@ type SupplyOrderApiController struct {
 
 func SupplyOrderApiRegistRouters() {
 
+	//初始化商品数据
 	beego.Router("/api/supply/getinitorder", &SupplyOrderApiController{}, "get:GetInitOrder")
+	//保存购货订单
 	beego.Router("/api/supply/savepurchaseorder", &SupplyOrderApiController{}, "post:SavePurchaseOrder")
+	//获取所有供应商
 	beego.Router("/api/supply/getallsupply", &SupplyOrderApiController{}, "get:GetAllSupply")
+	//获取供应商订单列表
 	beego.Router("/api/supply/getallpurchaseorderlist", &SupplyOrderApiController{}, "get:GetAllPurchaseOrderList")
+	//修改购货订单
 	beego.Router("/api/supply/updatepurchaseorder", &SupplyOrderApiController{}, "Post:UpdatePurchaseOrder")
+	//审核购货订单
 	beego.Router("/api/supply/checkpurchaseorder", &SupplyOrderApiController{}, "get:UpdateSupplyWaresing")
+	//获取购货订单详情
 	beego.Router("/api/supply/getpurchaseorderdetail", &SupplyOrderApiController{}, "get:GetPurchaseOrderDetail")
+	//新增购货单
 	beego.Router("/api/supply/addgoodorder", &SupplyOrderApiController{}, "post:AddGoodOrder")
+	//获取购货单列表
+	beego.Router("/api/supply/getallgoodorderlist", &SupplyOrderApiController{}, "Get:GetAllGoodOderList")
+	//修改购货订单详情
+	beego.Router("/api/supply/getgoodorderdetail", &SupplyOrderApiController{}, "Get:GetGoodOrderDetail")
+	//修改购货订单
+	beego.Router("/api/supply/updategoodorder", &SupplyOrderApiController{}, "Post:UpdateGoodOrder")
+	//删除购货订单
+	beego.Router("/api/supply/deletepurchorder", &SupplyOrderApiController{}, "Get:DeletePurchOrder")
+	//生成购货单的判断
+	beego.Router("/api/supply/getallordercountlist", &SupplyOrderApiController{}, "Get:GetAllOrderCountList")
+	// 生成购货单
+	beego.Router("/api/supply/getpurchaseorderinfo", &SupplyOrderApiController{}, "Get:GetPurchOrderInfo")
+	//反审核 获取关联的购货单数据
+	beego.Router("/api/supply/getgoodorderlist", &SupplyOrderApiController{}, "Get:GetGoodOrderList")
+	//反审核购货订单
+	beego.Router("/api/supply/getreturnorder", &SupplyOrderApiController{}, "Get:GetReturnOrder")
 }
 
 func (this *SupplyOrderApiController) GetInitOrder() {
@@ -98,7 +122,7 @@ func (this *SupplyOrderApiController) SavePurchaseOrder() {
 		return
 	}
 
-	//生成订货单
+	//生成购货订单
 	timeStr := time.Now().Format("2006-01-02")
 	timeArr := strings.Split(timeStr, "-")
 	orgId := this.GetAdminUserInfo().CurrentOrgId
@@ -123,6 +147,7 @@ func (this *SupplyOrderApiController) SavePurchaseOrder() {
 		DocumentDate:     startTime,
 		DeliveryDate:     endTime,
 		SupplierId:       supplier_id,
+		IsWarehouse:      2,
 	}
 	err = service.CreateSupplyWarehouse(info)
 	warehouseInfo, _ := service.FindLastSupplyWarehouseInfo(orgId)
@@ -235,6 +260,13 @@ func (this *SupplyOrderApiController) SavePurchaseOrder() {
 
 				supply_unit := items["supply_unit"].(string)
 
+				if items["manufacturer_id"] == nil || reflect.TypeOf(items["manufacturer_id"]).String() != "float64" {
+					utils.ErrorLog("manufacturer_id")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				manufacturer_id := int64(items["manufacturer_id"].(float64))
+
 				order := models.SupplierWarehousingInfoOrder{
 					OrderNumber:             warehousing_order,
 					IsSource:                is_source,
@@ -255,6 +287,7 @@ func (this *SupplyOrderApiController) SavePurchaseOrder() {
 					SupplyManufacturer:      supply_manufacturer,
 					Name:                    name,
 					SupplyUnit:              supply_unit,
+					ManufacturerId:          manufacturer_id,
 				}
 
 				warehousingInfo = append(warehousingInfo, &order)
@@ -355,7 +388,7 @@ func (this *SupplyOrderApiController) UpdatePurchaseOrder() {
 	}
 	var endTime int64
 	if len(end_time) > 0 {
-		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
 		if err != nil {
 			utils.ErrorLog(err.Error())
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -504,6 +537,13 @@ func (this *SupplyOrderApiController) UpdatePurchaseOrder() {
 				}
 
 				supply_unit := items["supply_unit"].(string)
+
+				if items["manufacturer_id"] == nil || reflect.TypeOf(items["manufacturer_id"]).String() != "float64" {
+					utils.ErrorLog("manufacturer_id")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				manufacturer_id := int64(items["manufacturer_id"].(float64))
 				if id > 0 {
 					order := models.SupplierWarehousingInfoOrder{
 						ID:                      id,
@@ -523,6 +563,7 @@ func (this *SupplyOrderApiController) UpdatePurchaseOrder() {
 						SupplyManufacturer:      supply_manufacturer,
 						Name:                    name,
 						SupplyUnit:              supply_unit,
+						ManufacturerId:          manufacturer_id,
 					}
 
 					updateWarehousingInfo = append(updateWarehousingInfo, &order)
@@ -550,6 +591,7 @@ func (this *SupplyOrderApiController) UpdatePurchaseOrder() {
 						SupplyManufacturer:      supply_manufacturer,
 						Name:                    name,
 						SupplyUnit:              supply_unit,
+						ManufacturerId:          manufacturer_id,
 					}
 					warehousingInfo = append(warehousingInfo, &order)
 				}
@@ -640,12 +682,767 @@ func (this *SupplyOrderApiController) AddGoodOrder() {
 		}
 		startTime = theTime.Unix()
 	}
-	good_number := this.GetString("good_number")
-	arrerage, _ := this.GetInt64("arrerage")
-	payment, _ := this.GetInt64("payment")
+	arrerage := this.GetString("arrerage")
+	arrerage_float, _ := strconv.ParseFloat(arrerage, 64)
+	payment := this.GetString("payment")
+	payment_float, _ := strconv.ParseFloat(payment, 64)
 	warehousing_id, _ := this.GetInt64("warehousing_id")
 	number := this.GetString("number")
-	rate_of_concession, _ := this.GetInt64("rate_of_concession")
-	discount_amount, _ := this.GetInt64("discount_amount")
-	fmt.Println(supplier_id, startTime, good_number, arrerage, payment, warehousing_id, number, rate_of_concession, discount_amount)
+	rate_of_concession := this.GetString("rate_of_concession")
+	rate_of_concession_float, _ := strconv.ParseFloat(rate_of_concession, 64)
+	discount_amount := this.GetString("discount_amount")
+	discount_amount_float, _ := strconv.ParseFloat(discount_amount, 64)
+	fmt.Println(supplier_id, startTime, arrerage, payment, warehousing_id, number, rate_of_concession, discount_amount)
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	creater := this.GetAdminUserInfo().AdminUser.Id
+	//生成购货单
+	timeStr := time.Now().Format("2006-01-02")
+	timeArr := strings.Split(timeStr, "-")
+	total, _ := service.FindAllSupplyWarehouseOutOrder(orgId)
+	total = total + 1
+	warehousing_order := "CG" + timeArr[0] + timeArr[1] + timeArr[2] + "00" + strconv.FormatInt(total, 10)
+	recordDateStr := time.Now().Format("2006-01-02")
+	recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+
+	warehouse_out := models.SpSupplierWarehouseOut{
+		Number:           number,
+		UserOrgId:        orgId,
+		Creater:          creater,
+		Ctime:            time.Now().Unix(),
+		Mtime:            0,
+		Status:           1,
+		RecordDate:       recordDate.Unix(),
+		IsCheck:          2,
+		WarehousingId:    warehousing_id,
+		GoodNumber:       warehousing_order,
+		Arrearage:        arrerage_float,
+		Payment:          payment_float,
+		RateOfConcession: rate_of_concession_float,
+		DiscountAmount:   discount_amount_float,
+		DocumentDate:     startTime,
+		SupplierId:       supplier_id,
+		Checker:          0,
+		CheckTime:        0,
+	}
+
+	service.CreateSupplyWarehouseOut(warehouse_out)
+
+	//获取最后一条
+	warehouseOut, _ := service.FindSupplyWarehouseOutById(orgId)
+
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	var warehousingOut []*models.SpSupplierWarehousingOutOrder
+	if dataBody["stockIn"] != nil && reflect.TypeOf(dataBody["stockIn"]).String() == "[]interface {}" {
+		thisStockIn, _ := dataBody["stockIn"].([]interface{})
+		if len(thisStockIn) > 0 {
+			for _, item := range thisStockIn {
+				items := item.(map[string]interface{})
+
+				if items["supply_count"] == nil || reflect.TypeOf(items["supply_count"]).String() != "float64" {
+					utils.ErrorLog("supply_count")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				supply_count := int64(items["supply_count"].(float64))
+
+				if items["id"] == nil || reflect.TypeOf(items["id"]).String() != "float64" {
+					utils.ErrorLog("id")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				id := int64(items["id"].(float64))
+
+				if items["manufacturer_id"] == nil || reflect.TypeOf(items["manufacturer_id"]).String() != "float64" {
+					utils.ErrorLog("manufacturer_id")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				manufacturer_id := int64(items["manufacturer_id"].(float64))
+
+				if items["name"] == nil || reflect.TypeOf(items["name"]).String() != "string" {
+					utils.ErrorLog("name")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				name := items["name"].(string)
+
+				if items["order_number"] == nil || reflect.TypeOf(items["order_number"]).String() != "string" {
+					utils.ErrorLog("order_number")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				order_number := items["order_number"].(string)
+
+				if items["supply_price"] == nil || reflect.TypeOf(items["supply_price"]).String() != "string" {
+					utils.ErrorLog("supply_price")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				supply_price := items["supply_price"].(string)
+
+				price_float, _ := strconv.ParseFloat(supply_price, 64)
+
+				if items["supply_total_price"] == nil || reflect.TypeOf(items["supply_total_price"]).String() != "string" {
+					utils.ErrorLog("supply_total_price")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				supply_total_price := items["supply_total_price"].(string)
+
+				supply_total_price_float, _ := strconv.ParseFloat(supply_total_price, 64)
+
+				if items["project_id"] == nil || reflect.TypeOf(items["project_id"]).String() != "float64" {
+					utils.ErrorLog("project_id")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				project_id := int64(items["project_id"].(float64))
+
+				if items["supply_remake"] == nil || reflect.TypeOf(items["supply_remake"]).String() != "string" {
+					utils.ErrorLog("supply_remake")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				supply_remake := items["supply_remake"].(string)
+
+				if items["supply_batch_number"] == nil || reflect.TypeOf(items["supply_batch_number"]).String() != "string" {
+					utils.ErrorLog("supply_batch_number")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				supply_batch_number := items["supply_batch_number"].(string)
+
+				var supply_expiry_date_time int64
+				if items["supply_expiry_date"] == nil || reflect.TypeOf(items["supply_expiry_date"]).String() != "string" {
+					utils.ErrorLog("supply_expiry_date")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				supply_expiry_date := items["supply_expiry_date"].(string)
+
+				if len(supply_expiry_date) > 0 {
+					theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", supply_expiry_date+" 00:00:00", loc)
+					if err != nil {
+						this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+						return
+					}
+					supply_expiry_date_time = theTime.Unix()
+				}
+
+				if items["supply_license_number"] == nil || reflect.TypeOf(items["supply_license_number"]).String() != "string" {
+					utils.ErrorLog("supply_license_number")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				supply_license_number := items["supply_license_number"].(string)
+
+				var supply_product_date_time int64
+				if items["supply_product_date"] == nil || reflect.TypeOf(items["supply_product_date"]).String() != "string" {
+					utils.ErrorLog("supply_product_date")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				supply_product_date := items["supply_product_date"].(string)
+
+				if len(supply_product_date) > 0 {
+					theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", supply_product_date+" 00:00:00", loc)
+					if err != nil {
+						this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+						return
+					}
+					supply_product_date_time = theTime.Unix()
+				}
+
+				if items["supply_specification_name"] == nil || reflect.TypeOf(items["supply_specification_name"]).String() != "string" {
+					utils.ErrorLog("supply_specification_name")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				supply_specification_name := items["supply_specification_name"].(string)
+
+				if items["supply_total"] == nil || reflect.TypeOf(items["supply_total"]).String() != "string" {
+					utils.ErrorLog("supply_total")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				supply_total := items["supply_total"].(string)
+
+				if items["supply_type"] == nil || reflect.TypeOf(items["supply_type"]).String() != "string" {
+					utils.ErrorLog("supply_type")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				supply_type := items["supply_type"].(string)
+
+				if items["supply_unit"] == nil || reflect.TypeOf(items["supply_unit"]).String() != "string" {
+					utils.ErrorLog("supply_unit")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				supply_unit := items["supply_unit"].(string)
+
+				if items["type"] == nil || reflect.TypeOf(items["type"]).String() != "float64" {
+					utils.ErrorLog("type")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				is_source := int64(items["type"].(float64))
+
+				if items["supply_manufacturer"] == nil || reflect.TypeOf(items["supply_manufacturer"]).String() != "string" {
+					utils.ErrorLog("supply_manufacturer")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				supply_manufacturer := items["supply_manufacturer"].(string)
+				order := models.SpSupplierWarehousingOutOrder{
+					OrderNumber:             order_number,
+					ProjectId:               project_id,
+					IsSource:                is_source,
+					Count:                   supply_count,
+					Amount:                  supply_total_price_float,
+					Price:                   price_float,
+					Remark:                  supply_remake,
+					IsCheck:                 2,
+					UserOrgId:               orgId,
+					Status:                  1,
+					Ctime:                   time.Now().Unix(),
+					Mtime:                   0,
+					WarehouseOutId:          warehouseOut.ID,
+					Type:                    1,
+					SupplyBatchNumber:       supply_batch_number,
+					SupplyProductDate:       supply_product_date_time,
+					SupplyExpiryDate:        supply_expiry_date_time,
+					WarehousingId:           warehousing_id,
+					WarehouseInfoId:         id,
+					SupplyType:              supply_type,
+					SupplyUnit:              supply_unit,
+					SupplyTotal:             supply_total,
+					SupplySpecificationName: supply_specification_name,
+					SupplyLicenseNumber:     supply_license_number,
+					Name:                    name,
+					ManufacturerId:          manufacturer_id,
+					GoodNumber:              warehouseOut.GoodNumber,
+					SupplyManufacturer:      supply_manufacturer,
+				}
+				warehousingOut = append(warehousingOut, &order)
+			}
+		}
+	}
+
+	for _, item := range warehousingOut {
+		//如果是手动新增的，type 等于2
+		if item.WarehouseInfoId == 0 {
+			item.Type = 2
+		}
+		err = service.CreateSupplyWarehousOutOrder(item)
+	}
+
+	list, parseDateErr := service.GetSupplyWarehouseOutById(warehouseOut.ID, orgId)
+
+	if parseDateErr == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list":         list,
+			"warehouseOut": warehouseOut,
+		})
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+
+func (this *SupplyOrderApiController) GetAllGoodOderList() {
+
+	check_id, _ := this.GetInt64("check_id")
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	keyword := this.GetString("keyword")
+	page, _ := this.GetInt64("page")
+	limit, _ := this.GetInt64("limit")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+
+	}
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	list, total, err := service.GetAllGoodOderList(check_id, keyword, page, limit, startTime, endTime, orgId)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list":  list,
+			"total": total,
+		})
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+
+func (this *SupplyOrderApiController) GetGoodOrderDetail() {
+
+	id, _ := this.GetInt64("id")
+	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)
+	}
+}
+
+func (this *SupplyOrderApiController) UpdateGoodOrder() {
+	supplier_id, _ := this.GetInt64("supplier_id")
+	start_time := this.GetString("start")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	arrerage := this.GetString("arrerage")
+	arrerage_float, _ := strconv.ParseFloat(arrerage, 64)
+	payment := this.GetString("payment")
+	payment_float, _ := strconv.ParseFloat(payment, 64)
+	warehose_out_id, _ := this.GetInt64("warehose_out_id")
+	number := this.GetString("number")
+	rate_of_concession := this.GetString("rate_of_concession")
+	rate_of_concession_float, _ := strconv.ParseFloat(rate_of_concession, 64)
+	discount_amount := this.GetString("discount_amount")
+	discount_amount_float, _ := strconv.ParseFloat(discount_amount, 64)
+	good_number := this.GetString("good_number")
+	fmt.Println(supplier_id, startTime, arrerage, payment, warehose_out_id, number, rate_of_concession, discount_amount)
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	var warehousingOut []*models.SpSupplierWarehousingOutOrder
+	var updateWarehout []*models.SpSupplierWarehousingOutOrder
+	if dataBody["stockIn"] != nil && reflect.TypeOf(dataBody["stockIn"]).String() == "[]interface {}" {
+		thisStockIn, _ := dataBody["stockIn"].([]interface{})
+		if len(thisStockIn) > 0 {
+			for _, item := range thisStockIn {
+				items := item.(map[string]interface{})
+
+				if items["id"] == nil || reflect.TypeOf(items["id"]).String() != "float64" {
+					utils.ErrorLog("id")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				id := int64(items["id"].(float64))
+
+				if items["supply_count"] == nil || reflect.TypeOf(items["supply_count"]).String() != "float64" {
+					utils.ErrorLog("supply_count")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				supply_count := int64(items["supply_count"].(float64))
+
+				if items["manufacturer_id"] == nil || reflect.TypeOf(items["manufacturer_id"]).String() != "float64" {
+					utils.ErrorLog("manufacturer_id")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				manufacturer_id := int64(items["manufacturer_id"].(float64))
+
+				if items["name"] == nil || reflect.TypeOf(items["name"]).String() != "string" {
+					utils.ErrorLog("name")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				name := items["name"].(string)
+
+				if items["order_number"] == nil || reflect.TypeOf(items["order_number"]).String() != "string" {
+					utils.ErrorLog("order_number")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				order_number := items["order_number"].(string)
+
+				if items["supply_price"] == nil || reflect.TypeOf(items["supply_price"]).String() != "string" {
+					utils.ErrorLog("supply_price")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				supply_price := items["supply_price"].(string)
+
+				price_float, _ := strconv.ParseFloat(supply_price, 64)
+
+				if items["supply_total_price"] == nil || reflect.TypeOf(items["supply_total_price"]).String() != "string" {
+					utils.ErrorLog("supply_total_price")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				supply_total_price := items["supply_total_price"].(string)
+
+				supply_total_price_float, _ := strconv.ParseFloat(supply_total_price, 64)
+
+				if items["project_id"] == nil || reflect.TypeOf(items["project_id"]).String() != "float64" {
+					utils.ErrorLog("project_id")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				project_id := int64(items["project_id"].(float64))
+
+				if items["supply_remake"] == nil || reflect.TypeOf(items["supply_remake"]).String() != "string" {
+					utils.ErrorLog("supply_remake")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				supply_remake := items["supply_remake"].(string)
+
+				if items["supply_batch_number"] == nil || reflect.TypeOf(items["supply_batch_number"]).String() != "string" {
+					utils.ErrorLog("supply_batch_number")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				supply_batch_number := items["supply_batch_number"].(string)
+
+				var supply_expiry_date_time int64
+				if items["supply_expiry_date"] == nil || reflect.TypeOf(items["supply_expiry_date"]).String() != "string" {
+					utils.ErrorLog("supply_expiry_date")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				supply_expiry_date := items["supply_expiry_date"].(string)
+
+				if len(supply_expiry_date) > 0 {
+					theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", supply_expiry_date+" 00:00:00", loc)
+					if err != nil {
+						this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+						return
+					}
+					supply_expiry_date_time = theTime.Unix()
+				}
+
+				if items["supply_license_number"] == nil || reflect.TypeOf(items["supply_license_number"]).String() != "string" {
+					utils.ErrorLog("supply_license_number")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				supply_license_number := items["supply_license_number"].(string)
+
+				var supply_product_date_time int64
+				if items["supply_product_date"] == nil || reflect.TypeOf(items["supply_product_date"]).String() != "string" {
+					utils.ErrorLog("supply_product_date")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				supply_product_date := items["supply_product_date"].(string)
+
+				if len(supply_product_date) > 0 {
+					theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", supply_product_date+" 00:00:00", loc)
+					if err != nil {
+						this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+						return
+					}
+					supply_product_date_time = theTime.Unix()
+				}
+
+				if items["supply_specification_name"] == nil || reflect.TypeOf(items["supply_specification_name"]).String() != "string" {
+					utils.ErrorLog("supply_specification_name")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				supply_specification_name := items["supply_specification_name"].(string)
+
+				if items["supply_total"] == nil || reflect.TypeOf(items["supply_total"]).String() != "string" {
+					utils.ErrorLog("supply_total")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				supply_total := items["supply_total"].(string)
+
+				if items["supply_type"] == nil || reflect.TypeOf(items["supply_type"]).String() != "string" {
+					utils.ErrorLog("supply_type")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				supply_type := items["supply_type"].(string)
+
+				if items["supply_unit"] == nil || reflect.TypeOf(items["supply_unit"]).String() != "string" {
+					utils.ErrorLog("supply_unit")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				supply_unit := items["supply_unit"].(string)
+
+				if items["type"] == nil || reflect.TypeOf(items["type"]).String() != "float64" {
+					utils.ErrorLog("type")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				is_source := int64(items["type"].(float64))
+
+				if items["supply_manufacturer"] == nil || reflect.TypeOf(items["supply_manufacturer"]).String() != "string" {
+					utils.ErrorLog("supply_manufacturer")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				supply_manufacturer := items["supply_manufacturer"].(string)
+
+				if items["warehouse_info_id"] == nil || reflect.TypeOf(items["warehouse_info_id"]).String() != "float64" {
+					utils.ErrorLog("warehouse_info_id")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				warehouse_info_id := int64(items["warehouse_info_id"].(float64))
+
+				if items["warehousing_id"] == nil || reflect.TypeOf(items["warehousing_id"]).String() != "float64" {
+					utils.ErrorLog("warehouse_info_id")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				warehousing_id := int64(items["warehousing_id"].(float64))
+				if id > 0 {
+					order := models.SpSupplierWarehousingOutOrder{
+						ID:                      id,
+						OrderNumber:             order_number,
+						ProjectId:               project_id,
+						IsSource:                is_source,
+						Count:                   supply_count,
+						Amount:                  supply_total_price_float,
+						Price:                   price_float,
+						Remark:                  supply_remake,
+						IsCheck:                 2,
+						UserOrgId:               orgId,
+						Status:                  1,
+						Ctime:                   time.Now().Unix(),
+						Mtime:                   0,
+						WarehouseOutId:          warehose_out_id,
+						Type:                    1,
+						SupplyBatchNumber:       supply_batch_number,
+						SupplyProductDate:       supply_product_date_time,
+						SupplyExpiryDate:        supply_expiry_date_time,
+						SupplyType:              supply_type,
+						SupplyUnit:              supply_unit,
+						SupplyTotal:             supply_total,
+						SupplySpecificationName: supply_specification_name,
+						SupplyLicenseNumber:     supply_license_number,
+						Name:                    name,
+						ManufacturerId:          manufacturer_id,
+						GoodNumber:              good_number,
+						SupplyManufacturer:      supply_manufacturer,
+						WarehouseInfoId:         warehouse_info_id,
+						WarehousingId:           warehousing_id,
+					}
+					updateWarehout = append(updateWarehout, &order)
+				}
+
+				if id == 0 {
+					order := models.SpSupplierWarehousingOutOrder{
+						OrderNumber:             order_number,
+						ProjectId:               project_id,
+						IsSource:                is_source,
+						Count:                   supply_count,
+						Amount:                  supply_total_price_float,
+						Price:                   price_float,
+						Remark:                  supply_remake,
+						IsCheck:                 2,
+						UserOrgId:               orgId,
+						Status:                  1,
+						Ctime:                   time.Now().Unix(),
+						Mtime:                   0,
+						WarehouseOutId:          warehose_out_id,
+						Type:                    1,
+						SupplyBatchNumber:       supply_batch_number,
+						SupplyProductDate:       supply_product_date_time,
+						SupplyExpiryDate:        supply_expiry_date_time,
+						WarehouseInfoId:         id,
+						SupplyType:              supply_type,
+						SupplyUnit:              supply_unit,
+						SupplyTotal:             supply_total,
+						SupplySpecificationName: supply_specification_name,
+						SupplyLicenseNumber:     supply_license_number,
+						Name:                    name,
+						ManufacturerId:          manufacturer_id,
+						GoodNumber:              good_number,
+						SupplyManufacturer:      supply_manufacturer,
+					}
+					warehousingOut = append(warehousingOut, &order)
+				}
+
+			}
+		}
+	}
+	out := models.SpSupplierWarehouseOut{
+		Arrearage:        arrerage_float,
+		Payment:          payment_float,
+		RateOfConcession: rate_of_concession_float,
+		DiscountAmount:   discount_amount_float,
+		SupplierId:       supplier_id,
+		DocumentDate:     startTime,
+	}
+	//更改购货单据
+	service.UpdateGoodWarehouseOut(warehose_out_id, out)
+
+	for _, item := range warehousingOut {
+		//如果是手动新增的，type 等于2
+		if item.WarehouseInfoId == 0 {
+			item.Type = 2
+		}
+		err = service.CreateSupplyWarehousOutOrder(item)
+	}
+	for _, item := range updateWarehout {
+
+		service.UpdateGoodWarehouseOutOrder(item)
+	}
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"out": out,
+		})
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+
+func (this *SupplyOrderApiController) DeletePurchOrder() {
+
+	id, _ := this.GetInt64("id")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	err := service.DeletePurchOrder(id, orgId)
+	if err == nil {
+		returnData := make(map[string]interface{}, 0)
+		returnData["msg"] = "ok"
+		this.ServeSuccessJSON(returnData)
+		return
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+
+}
+
+func (this *SupplyOrderApiController) GetAllOrderCountList() {
+
+	id, _ := this.GetInt64("id")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	//获取购货订单的数据
+	purcaseOrder, _ := service.GetAllPurcaseOrderById(id, orgId)
+	//获取购货单的数据
+	goodOrder, err := service.GetAllGoodOrderById(id, orgId)
+	drugList, err := service.GetSupplyDrugList(orgId)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"purcaseOrder": purcaseOrder,
+			"goodOrder":    goodOrder,
+			"drugList":     drugList,
+		})
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+
+func (this *SupplyOrderApiController) GetPurchOrderInfo() {
+	id, _ := this.GetInt64("id")
+	ids := this.GetString("ids")
+	if len(ids) == 0 {
+		info, _ := service.GetPurchaseOrderDetail(id)
+		//查询
+		orderInfo, err := service.GetSupplyWarehousingOrderInfo(id)
+		orgId := this.GetAdminUserInfo().CurrentOrgId
+		supplyList, _ := service.GetSupplierList(orgId)
+		//获取药品库数据
+		baseList, _ := service.GetSupplyDrugList(orgId)
+
+		goodList, _ := service.GetSupplyGoodList(orgId)
+		if err == nil {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"info":       info,
+				"orderInfo":  orderInfo,
+				"supplyList": supplyList,
+				"baseList":   baseList,
+				"goodList":   goodList,
+			})
+		} else {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		}
+	}
+	if len(ids) > 0 {
+		idArray := strings.Split(ids, ",")
+		info, _ := service.GetPurchaseOrderDetail(id)
+		//查询
+		orderInfo, err := service.GetSupplyWarehousingOrderInfoTwo(id, idArray)
+		orgId := this.GetAdminUserInfo().CurrentOrgId
+		supplyList, _ := service.GetSupplierList(orgId)
+		//获取药品库数据
+		baseList, _ := service.GetSupplyDrugList(orgId)
+
+		goodList, _ := service.GetSupplyGoodList(orgId)
+		if err == nil {
+			this.ServeSuccessJSON(map[string]interface{}{
+				"info":       info,
+				"orderInfo":  orderInfo,
+				"supplyList": supplyList,
+				"baseList":   baseList,
+				"goodList":   goodList,
+			})
+		} else {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		}
+	}
+}
+
+func (this *SupplyOrderApiController) GetGoodOrderList() {
+
+	id, _ := this.GetInt64("id")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	list, err := service.GetGoodOrderList(id, orgId)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list": list,
+		})
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+
+func (this *SupplyOrderApiController) GetReturnOrder() {
+
+	id, _ := this.GetInt64("id")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	err := service.GetReturnOrder(id, orgId)
+	if err == nil {
+		returnData := make(map[string]interface{}, 0)
+		returnData["msg"] = "ok"
+		this.ServeSuccessJSON(returnData)
+		return
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
 }

models/supply.models.go

@@ -112,6 +112,7 @@ type SupplierWarehousingInfoOrder struct {
 	SupplyManufacturer      string  `gorm:"column:supply_manufacturer" json:"supply_manufacturer" form:"supply_manufacturer"`
 	Name                    string  `gorm:"column:name" json:"name" form:"name"`
 	SupplyUnit              string  `gorm:"column:supply_unit" json:"supply_unit" form:"supply_unit"`
+	ManufacturerId          int64   `gorm:"column:manufacturer_id" json:"manufacturer_id" form:"manufacturer_id"`
 }
 
 func (SupplierWarehousingInfoOrder) TableName() string {
@@ -135,6 +136,7 @@ type SupplierWarehouseInfo struct {
 	SupplierId       int64   `gorm:"column:supplier_id" json:"supplier_id" form:"supplier_id"`
 	Checker          int64   `gorm:"column:checker" json:"checker" form:"checker"`
 	CheckTime        int64   `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	IsWarehouse      int64   `gorm:"column:is_warehouse" json:"is_warehouse" form:"is_warehouse"`
 }
 
 func (SupplierWarehouseInfo) TableName() string {
@@ -158,9 +160,125 @@ type VmSupplierWarehouseInfo struct {
 	SupplierId                   int64                           `gorm:"column:supplier_id" json:"supplier_id" form:"supplier_id"`
 	Checker                      int64                           `gorm:"column:checker" json:"checker" form:"checker"`
 	CheckTime                    int64                           `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	IsWarehouse                  int64                           `gorm:"column:is_warehouse" json:"is_warehouse" form:"is_warehouse"`
 	SupplierWarehousingInfoOrder []*SupplierWarehousingInfoOrder `gorm:"ForeignKey:WarehousingId;AssociationForeignKey:ID" json:"orderInfo"`
+	SpSupplierWarehouseOut       []*SpSupplierWarehouseOut       `gorm:"ForeignKey:WarehousingId;AssociationForeignKey:ID" json:"orderOut"`
 }
 
 func (VmSupplierWarehouseInfo) TableName() string {
 	return "xt_supplier_warehouse_info"
 }
+
+type SpSupplierWarehousingOutOrder struct {
+	ID                      int64   `gorm:"column:id" json:"id" form:"id"`
+	OrderNumber             string  `gorm:"column:order_number" json:"order_number" form:"order_number"`
+	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"`
+	Price                   float64 `gorm:"column:price" json:"price" form:"price"`
+	Amount                  float64 `gorm:"column:amount" json:"amount" form:"amount"`
+	Remark                  string  `gorm:"column:remark" json:"remark" form:"remark"`
+	IsCheck                 int64   `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	UserOrgId               int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status                  int64   `gorm:"column:status" json:"status" form:"status"`
+	Ctime                   int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                   int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	WarehouseOutId          int64   `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	Type                    int64   `gorm:"column:type" json:"type" form:"type"`
+	SupplyBatchNumber       string  `gorm:"column:supply_batch_number" json:"supply_batch_number" form:"supply_batch_number"`
+	SupplyProductDate       int64   `gorm:"column:supply_product_date" json:"supply_product_date" form:"supply_product_date"`
+	SupplyExpiryDate        int64   `gorm:"column:supply_expiry_date" json:"supply_expiry_date" form:"supply_expiry_date"`
+	WarehousingId           int64   `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	WarehouseInfoId         int64   `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	SupplyType              string  `gorm:"column:supply_type" json:"supply_type" form:"supply_type"`
+	SupplySpecificationName string  `gorm:"column:supply_specification_name" json:"supply_specification_name" form:"supply_specification_name"`
+	SupplyTotal             string  `gorm:"column:supply_total" json:"supply_total" form:"supply_total"`
+	SupplyManufacturer      string  `gorm:"column:supply_manufacturer" json:"supply_manufacturer" form:"supply_manufacturer"`
+	Name                    string  `gorm:"column:name" json:"name" form:"name"`
+	SupplyUnit              string  `gorm:"column:supply_unit" json:"supply_unit" form:"supply_unit"`
+	ManufacturerId          int64   `gorm:"column:manufacturer_id" json:"manufacturer_id" form:"manufacturer_id"`
+	SupplyLicenseNumber     string  `gorm:"column:supply_license_number" json:"supply_license_number" form:"supply_license_number"`
+	GoodNumber              string  `gorm:"column:good_number" json:"good_number" form:"good_number"`
+}
+
+func (SpSupplierWarehousingOutOrder) TableName() string {
+	return "xt_supplier_warehousing_out_order"
+}
+
+type SpSupplierWarehouseOut struct {
+	ID               int64   `gorm:"column:id" json:"id" form:"id"`
+	Number           string  `gorm:"column:number" json:"number" form:"number"`
+	UserOrgId        int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Creater          int64   `gorm:"column:creater" json:"creater" form:"creater"`
+	Ctime            int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime            int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status           int64   `gorm:"column:status" json:"status" form:"status"`
+	RecordDate       int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	IsCheck          int64   `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	WarehousingId    int64   `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	GoodNumber       string  `gorm:"column:good_number" json:"good_number" form:"good_number"`
+	Arrearage        float64 `gorm:"column:arrearage" json:"arrearage" form:"arrearage"`
+	Payment          float64 `gorm:"column:payment" json:"payment" form:"payment"`
+	RateOfConcession float64 `gorm:"column:rate_of_concession" json:"rate_of_concession" form:"rate_of_concession"`
+	DiscountAmount   float64 `gorm:"column:discount_amount" json:"discount_amount" form:"discount_amount"`
+	DocumentDate     int64   `gorm:"column:document_date" json:"document_date" form:"document_date"`
+	SupplierId       int64   `gorm:"column:supplier_id" json:"supplier_id" form:"supplier_id"`
+	Checker          int64   `gorm:"column:checker" json:"checker" form:"checker"`
+	CheckTime        int64   `gorm:"column:check_time" json:"check_time" form:"check_time"`
+}
+
+func (SpSupplierWarehouseOut) TableName() string {
+	return "xt_supplier_warehouse_out"
+}
+
+type VmSupplierWarehouseOut struct {
+	ID                            int64                            `gorm:"column:id" json:"id" form:"id"`
+	Number                        string                           `gorm:"column:number" json:"number" form:"number"`
+	UserOrgId                     int64                            `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Creater                       int64                            `gorm:"column:creater" json:"creater" form:"creater"`
+	Ctime                         int64                            `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                         int64                            `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status                        int64                            `gorm:"column:status" json:"status" form:"status"`
+	RecordDate                    int64                            `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	IsCheck                       int64                            `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	WarehousingId                 int64                            `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	GoodNumber                    string                           `gorm:"column:good_number" json:"good_number" form:"good_number"`
+	Arrearage                     float64                          `gorm:"column:arrearage" json:"arrearage" form:"arrearage"`
+	Payment                       float64                          `gorm:"column:payment" json:"payment" form:"payment"`
+	RateOfConcession              float64                          `gorm:"column:rate_of_concession" json:"rate_of_concession" form:"rate_of_concession"`
+	DiscountAmount                float64                          `gorm:"column:discount_amount" json:"discount_amount" form:"discount_amount"`
+	DocumentDate                  int64                            `gorm:"column:document_date" json:"document_date" form:"document_date"`
+	SupplierId                    int64                            `gorm:"column:supplier_id" json:"supplier_id" form:"supplier_id"`
+	Checker                       int64                            `gorm:"column:checker" json:"checker" form:"checker"`
+	CheckTime                     int64                            `gorm:"column:check_time" json:"check_time" form:"check_time"`
+	SpSupplierWarehousingOutOrder []*SpSupplierWarehousingOutOrder `gorm:"ForeignKey:warehouse_out_id;AssociationForeignKey:ID" json:"orderOut"`
+}
+
+func (VmSupplierWarehouseOut) TableName() string {
+	return "xt_supplier_warehouse_out"
+}
+
+type VSpSupplierWarehousingOutOrder struct {
+	ID          int64  `gorm:"column:id" json:"id" form:"id"`
+	OrderNumber string `gorm:"column:order_number" json:"order_number" form:"order_number"`
+	ProjectId   int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	Count       int64  `gorm:"column:count" json:"count" form:"count"`
+	Status      int64  `gorm:"column:status" json:"status" form:"status"`
+	SupplyUnit  string `gorm:"column:supply_unit" json:"supply_unit" form:"supply_unit"`
+	IsSource    int64  `gorm:"column:is_source" json:"is_source" form:"is_source"`
+}
+
+func (VSpSupplierWarehousingOutOrder) TableName() string {
+	return "xt_supplier_warehousing_out_order"
+}
+
+type VSupplierWarehousingInfoOrder struct {
+	Count      int64  `gorm:"column:count" json:"count" form:"count"`
+	ProjectId  int64  `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	SupplyUnit string `gorm:"column:supply_unit" json:"supply_unit" form:"supply_unit"`
+	IsSource   int64  `gorm:"column:is_source" json:"is_source" form:"is_source"`
+}
+
+func (VSupplierWarehousingInfoOrder) TableName() string {
+	return "xt_supplier_warehousing_info_order"
+}

service/patientmanage_service.go

@@ -439,7 +439,7 @@ func FindPatientByDialysisNoOne(orgID int64, dialysisNo string, id int64) (patie
 }
 
 func FindPatientByMobileOne(mobile string, orgID int64, id int64) (patient models.XtPatientsNew, err error) {
-	//err = readDb.Model(&models.Patients{}).Where(" status=1 and user_org_id=? and   phone=? and id<>?", orgID, mobile, id).First(&patient).Error
+	//err = readDb.Model(&models.XtPatientsNew{}).Where(" status=1 and user_org_id=? and   phone=? and id<>?", orgID, mobile, id).First(&patient).Error
 	//return
 	db := readDb.Table("xt_patients_new as x")
 	err = db.Not("phone = ?", mobile).Where("user_org_id = ? and id = ? and status =1", orgID, id).Find(&patient).Error

service/supply_service.go

@@ -61,27 +61,27 @@ func CreateSupplyWarehousingOrder(order *models.SupplierWarehousingInfoOrder) er
 
 func GetAllPurchaseOrderList(check_id int64, startime int64, endtime int64, keyword string, page int64, limit int64, orgid int64) (info []*models.VmSupplierWarehouseInfo, total int64, err error) {
 
-	db := XTReadDB().Model(&info).Where("status = 1")
+	db := XTReadDB().Model(&info).Where("sgj_xt.xt_supplier_warehouse_info.status = 1")
 	likeKey := "%" + keyword + "%"
 	offset := (page - 1) * limit
 	if check_id > 0 {
-		db = db.Where("xt_supplier_warehouse_info.is_check = ?", check_id)
+		db = db.Where("sgj_xt.xt_supplier_warehouse_info.is_check = ?", check_id)
 	}
 	if startime > 0 {
-		db = db.Where("xt_supplier_warehouse_info.record_date >= ?", startime)
+		db = db.Where("sgj_xt.xt_supplier_warehouse_info.record_date >= ?", startime)
 	}
 	if endtime > 0 {
-		db = db.Where("xt_supplier_warehouse_info.record_date<=?", endtime)
+		db = db.Where("sgj_xt.xt_supplier_warehouse_info.record_date<=?", endtime)
 	}
 
 	if len(keyword) > 0 {
-		db.Joins("join xt_supplier_name on xt_supplier_name.id = xt_supplier_warehouse_info.supplier_id")
-		db = db.Where("xt_supplier_warehouse_info.number like ? or xt_supplier_name.supplier_name like ? ", likeKey, likeKey).Group("xt_supplier_warehouse_info.id")
+		db = db.Joins("join sgj_xt.xt_supplier_name on sgj_xt.xt_supplier_name.id = sgj_xt.xt_supplier_warehouse_info.supplier_id")
+		db = db.Where("sgj_xt.xt_supplier_warehouse_info.number like ? or sgj_xt.xt_supplier_name.supplier_name like ? ", likeKey, likeKey).Group("sgj_xt.xt_supplier_warehouse_info.id")
 	}
 	if orgid > 0 {
-		db = db.Where("xt_supplier_warehouse_info.user_org_id = ?", orgid)
+		db = db.Where("sgj_xt.xt_supplier_warehouse_info.user_org_id = ?", orgid)
 	}
-	err = db.Count(&total).Offset(offset).Limit(limit).Preload("SupplierWarehousingInfoOrder", "status= 1 and user_org_id = ?", orgid).Find(&info).Error
+	err = db.Count(&total).Offset(offset).Limit(limit).Preload("SupplierWarehousingInfoOrder", "status= 1 and user_org_id = ?", orgid).Preload("SpSupplierWarehouseOut", "status = 1 and user_org_id =?", orgid).Find(&info).Error
 	return info, total, err
 }
 
@@ -91,6 +91,12 @@ func GetSupplyWarehousingOrderInfo(id int64) (order []*models.SupplierWarehousin
 	return order, err
 }
 
+func GetSupplyWarehousingOrderInfoTwo(id int64, ids []string) (order []*models.SupplierWarehousingInfoOrder, err error) {
+
+	err = XTReadDB().Where("warehousing_id = ? and status = 1 and project_id in(?)", id, ids).Find(&order).Error
+	return order, err
+}
+
 func ModefySupplyWarehouseInfo(id int64, info models.SupplierWarehouseInfo) error {
 
 	err := XTWriteDB().Model(&models.SupplierWarehouseInfo{}).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"rate_of_concession": info.RateOfConcession, "discount_amount": info.DiscountAmount, "document_date": info.DocumentDate, "delivery_date": info.DeliveryDate, "supplier_id": info.SupplierId}).Error
@@ -99,7 +105,7 @@ func ModefySupplyWarehouseInfo(id int64, info models.SupplierWarehouseInfo) erro
 
 func ModifySupplyWarehouseOrder(order *models.SupplierWarehousingInfoOrder) error {
 
-	err := XTWriteDB().Model(&models.SupplierWarehousingInfoOrder{}).Where("id = ? and status = 1", order.ID).Updates(map[string]interface{}{}).Updates(map[string]interface{}{"is_source": order.IsSource, "count": order.Count, "price": order.Price, "amount": order.Amount, "remark": order.Remark, "project_id": order.ProjectId, "supply_license_number": order.SupplyLicenseNumber, "supply_type": order.SupplyType, "supply_specification_name": order.SupplySpecificationName, "supply_total": order.SupplyTotal, "supply_manufacturer": order.SupplyManufacturer, "name": order.Name, "supply_unit": order.SupplyUnit}).Error
+	err := XTWriteDB().Model(&models.SupplierWarehousingInfoOrder{}).Where("id = ? and status = 1", order.ID).Updates(map[string]interface{}{}).Updates(map[string]interface{}{"is_source": order.IsSource, "count": order.Count, "price": order.Price, "amount": order.Amount, "remark": order.Remark, "project_id": order.ProjectId, "supply_license_number": order.SupplyLicenseNumber, "supply_type": order.SupplyType, "supply_specification_name": order.SupplySpecificationName, "supply_total": order.SupplyTotal, "supply_manufacturer": order.SupplyManufacturer, "name": order.Name, "supply_unit": order.SupplyUnit, "manufacturer_id": order.ManufacturerId}).Error
 	return err
 }
 
@@ -115,3 +121,112 @@ func GetPurchaseOrderDetail(id int64) (models.SupplierWarehouseInfo, error) {
 	err := XTReadDB().Model(&info).Where("id =? and status =1", id).Find(&info).Error
 	return info, err
 }
+
+func FindAllSupplyWarehouseOutOrder(orgid int64) (total int64, err error) {
+	err = XTReadDB().Model(&models.SpSupplierWarehouseOut{}).Where("user_org_id = ? and status = 1", orgid).Count(&total).Error
+	return total, err
+}
+
+func FindSupplyWarehouseOutById(orgid int64) (models.SpSupplierWarehouseOut, error) {
+	out := models.SpSupplierWarehouseOut{}
+	err := XTReadDB().Where("user_org_id = ? and status = 1", orgid).Last(&out).Error
+	return out, err
+}
+
+func CreateSupplyWarehouseOut(out models.SpSupplierWarehouseOut) error {
+
+	err := XTWriteDB().Create(&out).Error
+	return err
+}
+
+func CreateSupplyWarehousOutOrder(order *models.SpSupplierWarehousingOutOrder) error {
+
+	err := XTWriteDB().Create(&order).Error
+	return err
+}
+
+func GetSupplyWarehouseOutById(id int64, user_org_id int64) (order []*models.SpSupplierWarehousingOutOrder, err error) {
+
+	err = XTReadDB().Where("warehouse_out_id = ? and status = 1 and user_org_id = ?", id, user_org_id).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("status = 1")
+	likeKey := "%" + keyword + "%"
+	offset := (page - 1) * limit
+	if check_id > 0 {
+		db = db.Where("xt_supplier_warehouse_out.is_check = ?", check_id)
+	}
+	if startime > 0 {
+		db = db.Where("xt_supplier_warehouse_out.record_date >= ?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("xt_supplier_warehouse_out.record_date<=?", endtime)
+	}
+
+	if len(keyword) > 0 {
+		db.Joins("join xt_supplier_name on xt_supplier_name.id = xt_supplier_warehouse_out.supplier_id")
+		db = db.Where("xt_supplier_warehouse_out.number like ? or xt_supplier_name.supplier_name like ? ", likeKey, likeKey).Group("xt_supplier_warehouse_out.id")
+	}
+	if orgid > 0 {
+		db = db.Where("xt_supplier_warehouse_out.user_org_id = ?", orgid)
+	}
+	err = db.Count(&total).Offset(offset).Limit(limit).Preload("SpSupplierWarehousingOutOrder", "status= 1 and user_org_id = ?", orgid).Find(&out).Error
+	return out, total, err
+}
+
+func GetGoodOrderDetail(id int64, orgid int64) (models.SpSupplierWarehouseOut, error) {
+	out := models.SpSupplierWarehouseOut{}
+	err := XTReadDB().Where("id = ? and user_org_id = ? and status = 1", id, orgid).Find(&out).Error
+	return out, err
+}
+
+func UpdateGoodWarehouseOut(id int64, out models.SpSupplierWarehouseOut) error {
+
+	err := XTWriteDB().Model(&out).Where("id=? and status = 1", id).Updates(map[string]interface{}{"arrearage": out.Arrearage, "payment": out.Payment, "rate_of_concession": out.RateOfConcession, "discount_amount": out.DiscountAmount, "document_date": out.DocumentDate}).Error
+	return err
+}
+
+func UpdateGoodWarehouseOutOrder(order *models.SpSupplierWarehousingOutOrder) error {
+
+	err := XTWriteDB().Model(&order).Where("id = ? and status = 1", order.ID).Updates(map[string]interface{}{"project_id": order.ProjectId, "is_source": order.IsSource, "count": order.Count, "price": order.Count, "amount": order.Amount, "remark": order.Amount, "supply_batch_number": order.SupplyBatchNumber, "supply_product_date": order.SupplyProductDate, "supply_expiry_date": order.SupplyExpiryDate, "supply_type": order.SupplyType, "supply_specification_name": order.SupplySpecificationName, "supply_total": order.SupplySpecificationName, "supply_manufacturer": order.SupplyManufacturer, "name": order.Name, "supply_unit": order.SupplyUnit, "manufacturer_id": order.ManufacturerId, "supply_license_number": order.SupplyLicenseNumber}).Error
+	return err
+}
+
+func DeletePurchOrder(id int64, orgid int64) error {
+
+	err := XTWriteDB().Model(&models.SupplierWarehouseInfo{}).Where("id = ? and status =1", id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	err = XTWriteDB().Model(&models.SupplierWarehousingInfoOrder{}).Where("warehousing_id =? and user_org_id = ? and status = 1", id, orgid).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+	return err
+}
+
+func GetAllPurcaseOrderById(id int64, orgid int64) (order []*models.VSupplierWarehousingInfoOrder, err error) {
+
+	err = XTReadDB().Model(&order).Where("warehousing_id = ? and user_org_id = ? and status =1", id, orgid).Find(&order).Error
+	return order, err
+}
+
+func GetAllGoodOrderById(id int64, orgid int64) (order []*models.VSpSupplierWarehousingOutOrder, err error) {
+	db := XTReadDB().Table("xt_supplier_warehousing_out_order as o").Where("o.status = 1")
+	if id > 0 {
+		db = db.Where("o.warehousing_id = ?", id)
+	}
+	if orgid > 0 {
+		db = db.Where("o.user_org_id =?", orgid)
+	}
+	err = db.Select("o.id,o.order_number,o.project_id,o.count as count,o.supply_unit,o.is_source").Find(&order).Error
+	return order, err
+}
+
+func GetGoodOrderList(id int64, orgid int64) (info []*models.SpSupplierWarehouseOut, err error) {
+
+	err = XTReadDB().Where("warehousing_id = ? and status = 1 and user_org_id = ?", id, orgid).Find(&info).Error
+	return info, err
+}
+
+func GetReturnOrder(id int64, orgid int64) error {
+
+	err := XTWriteDB().Model(&models.SupplierWarehouseInfo{}).Where("id = ? and status = 1 and user_org_id = ?", id, orgid).Updates(map[string]interface{}{"is_check": 2, "mtime": time.Now().Unix(), "check_time": 0, "checker": 0}).Error
+	return err
+}