11月8日库存管理

conf/app.conf

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

controllers/his_api_controller.go

@@ -2637,7 +2637,7 @@ func (c *HisApiController) CreateHisPatientCaseHistory() {
 
 	blood_sugar := c.GetString("blood_sugar")
 	bloodsugarfloat, _ := strconv.ParseFloat(blood_sugar, 64)
-	fmt.Println(bloodsugarfloat)
+
 	chief_conplaint := c.GetString("chief_conplaint")
 
 	dbp := c.GetString("dbp")
@@ -2650,11 +2650,11 @@ func (c *HisApiController) CreateHisPatientCaseHistory() {
 	height := c.GetString("height")
 	history_of_present_illness := c.GetString("history_of_present_illness")
 	is_infect, _ := c.GetInt64("is_infect")
-	fmt.Println("is", is_infect)
+
 	past_history := c.GetString("past_history")
 	patient_id, _ := c.GetInt64("patient_id")
 	his_patient_id, _ := c.GetInt64("his_patient_id")
-	fmt.Println("patient_id", patient_id)
+
 	personal_history := c.GetString("personal_history")
 	pulse := c.GetString("pulse")
 	pulsefloat, _ := strconv.ParseFloat(pulse, 64)
@@ -2662,12 +2662,12 @@ func (c *HisApiController) CreateHisPatientCaseHistory() {
 	sbpfloat, _ := strconv.ParseFloat(sbp, 64)
 	heightfloat, _ := strconv.ParseFloat(height, 64)
 	sicktype := c.GetString("sick_type")
-	fmt.Println("sicketype", sicktype)
+
 	sick_type, _ := strconv.ParseInt(sicktype, 10, 64)
 	symptom := c.GetString("symptom")
 	sick_date := c.GetString("sick_date")
 	temperatures := c.GetString("temperature")
-	fmt.Println("temperatures", temperatures)
+
 	temperature, _ := strconv.ParseFloat(temperatures, 64)
 	record_date := c.GetString("record_date")
 	breathing := c.GetString("breathing")
@@ -2688,7 +2688,7 @@ func (c *HisApiController) CreateHisPatientCaseHistory() {
 		return
 	}
 	recordDateTime := theTime.Unix()
-	fmt.Println("recordDataTime", recordDateTime)
+
 	sickTime, err := time.ParseInLocation(timeLayout+" 15:04:05", sick_date+" 00:00:00", loc)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -3411,8 +3411,7 @@ func (c *HisApiController) setProjectWithJSON(project *models.HisPrescriptionPro
 	if json["project_id"] != nil || reflect.TypeOf(json["project_id"]).String() == "float64" {
 		project_id := int64(json["project_id"].(float64))
 		project.ProjectId = project_id
-		fmt.Println(project_id)
-		fmt.Println(project.ProjectId)
+
 	}
 
 	if json["team_id"] != nil && reflect.TypeOf(json["team_id"]).String() == "float64" {
@@ -3572,8 +3571,6 @@ func (c *HisApiController) setAddtionWithJSON(additionalCharge *models.HisAdditi
 
 func (c *HisApiController) setAdviceTemplateWithJSON(advice *models.HisPrescriptionAdviceTemplate, json map[string]interface{}) int {
 
-	fmt.Println("~~~~~~")
-
 	if json["drug_name"] == nil || reflect.TypeOf(json["drug_name"]).String() != "string" {
 		utils.ErrorLog("drug_name")
 		return enums.ErrorCodeParamWrong
@@ -4353,12 +4350,12 @@ func (c *HisApiController) GetUploadInfo() {
 		strconv.FormatInt(his.PatientId, 10)
 
 		var ids []int64
-		fmt.Println(prescriptions)
+
 		for _, item := range prescriptions {
 			ids = append(ids, item.ID)
 		}
 		var total float64
-		fmt.Println(prescriptions)
+
 		for _, item := range prescriptions {
 			fmt.Println(item)
 			if item.Type == 1 { //药品
@@ -6732,7 +6729,6 @@ func DeleteDrugWarehosueInfo(advice models.HisDoctorAdviceInfo) (err error) {
 
 				prescribingNumber, _ := strconv.ParseInt(floatPrescrip, 10, 64)
 
-				fmt.Println("PrescribingNumber", prescribingNumber)
 				if advice.PrescribingNumberUnit == drug.MaxUnit {
 					warehouseInfo := models.DrugWarehouseInfo{
 						StockMinNumber: prescribingNumber,

controllers/supply_order_api_contorller.go

@@ -1,8 +1,17 @@
 package controllers
 
 import (
+	"XT_New/enums"
+	"XT_New/models"
 	"XT_New/service"
+	"XT_New/utils"
+	"encoding/json"
+	"fmt"
 	"github.com/astaxie/beego"
+	"reflect"
+	"strconv"
+	"strings"
+	"time"
 )
 
 type SupplyOrderApiController struct {
@@ -12,6 +21,10 @@ 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")
 }
 
 func (this *SupplyOrderApiController) GetInitOrder() {
@@ -41,3 +54,502 @@ func (this *SupplyOrderApiController) GetInitOrder() {
 	})
 	return
 }
+
+func (this *SupplyOrderApiController) SavePurchaseOrder() {
+
+	supplier_id, _ := this.GetInt64("supplier_name")
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	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+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+
+	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_id23323232323232", supplier_id, startTime, endTime, rate_of_concession, rate_of_concession_float, discount_amount, discount_amount_float)
+	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
+	}
+
+	//生成订货单
+	timeStr := time.Now().Format("2006-01-02")
+	timeArr := strings.Split(timeStr, "-")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	total, _ := service.FindAllSupplyOrder(orgId)
+	total = total + 1
+	warehousing_order := "CGDD" + timeArr[0] + timeArr[1] + timeArr[2] + "00" + strconv.FormatInt(total, 10)
+	recordDateStr := time.Now().Format("2006-01-02")
+	recordDate, parseDateErr := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+	fmt.Scan("parseDateErr", parseDateErr)
+	record_date := recordDate.Unix()
+	info := models.SupplierWarehouseInfo{
+		Number:           warehousing_order,
+		UserOrgId:        orgId,
+		Creater:          this.GetAdminUserInfo().AdminUser.Id,
+		Ctime:            time.Now().Unix(),
+		Mtime:            0,
+		Status:           1,
+		RecordDate:       record_date,
+		IsCheck:          2,
+		RateOfConcession: rate_of_concession_float,
+		DiscountAmount:   discount_amount_float,
+		DocumentDate:     startTime,
+		DeliveryDate:     endTime,
+		SupplierId:       supplier_id,
+	}
+	err = service.CreateSupplyWarehouse(info)
+	warehouseInfo, _ := service.FindLastSupplyWarehouseInfo(orgId)
+	var warehousingInfo []*models.SupplierWarehousingInfoOrder
+	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["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)
+
+				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)
+
+				supply_price_float, _ := strconv.ParseFloat(supply_price, 64)
+
+				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_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["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_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_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_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["name"] == nil || reflect.TypeOf(items["name"]).String() != "string" {
+					utils.ErrorLog("name")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+
+				name := items["name"].(string)
+
+				order := models.SupplierWarehousingInfoOrder{
+					OrderNumber:             warehousing_order,
+					IsSource:                is_source,
+					Count:                   supply_count,
+					Price:                   supply_price_float,
+					Amount:                  supply_total_price_float,
+					Remark:                  supply_remake,
+					UserOrgId:               orgId,
+					Ctime:                   time.Now().Unix(),
+					Status:                  1,
+					Mtime:                   0,
+					WarehousingId:           warehouseInfo.ID,
+					ProjectId:               id,
+					SupplyLicenseNumber:     supply_license_number,
+					SupplyType:              supply_type,
+					SupplySpecificationName: supply_specification_name,
+					SupplyTotal:             supply_total,
+					SupplyManufacturer:      supply_manufacturer,
+					Name:                    name,
+				}
+
+				warehousingInfo = append(warehousingInfo, &order)
+			}
+		}
+	}
+
+	for _, item := range warehousingInfo {
+		err = service.CreateSupplyWarehousingOrder(item)
+	}
+
+	//查询
+	orderInfo, err := service.GetSupplyWarehousingOrderInfo(warehouseInfo.ID)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"order":         warehousingInfo,
+			"warehouseInfo": warehouseInfo,
+			"orderInfo":     orderInfo,
+		})
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+
+func (this *SupplyOrderApiController) GetAllSupply() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	appId := this.GetAdminUserInfo().CurrentAppId
+	supplyList, err := service.GetSupplierList(orgId)
+	doctorList, err := service.GetAllDoctor(orgId, appId)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"supplyList": supplyList,
+			"doctorList": doctorList,
+		})
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+
+func (this *SupplyOrderApiController) GetAllPurchaseOrderList() {
+
+	check_id, _ := this.GetInt64("check_id")
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	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+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+	keyword := this.GetString("keyword")
+
+	page, _ := this.GetInt64("page")
+
+	limit, _ := this.GetInt64("limit")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	list, total, err := service.GetAllPurchaseOrderList(check_id, startTime, endTime, keyword, page, limit, orgId)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"list":  list,
+			"total": total,
+		})
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+
+func (this *SupplyOrderApiController) UpdatePurchaseOrder() {
+	supplier_id, _ := this.GetInt64("supplier_name")
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	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+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+
+	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)
+	warehousing_id, _ := this.GetInt64("id")
+	number := this.GetString("number")
+	fmt.Println("supplier_id23323232323232", supplier_id, startTime, endTime, rate_of_concession, rate_of_concession_float, discount_amount, discount_amount_float)
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	info := models.SupplierWarehouseInfo{
+		RateOfConcession: rate_of_concession_float,
+		DiscountAmount:   discount_amount_float,
+		DocumentDate:     startTime,
+		DeliveryDate:     endTime,
+		SupplierId:       supplier_id,
+		Mtime:            time.Now().Unix(),
+	}
+	service.ModefySupplyWarehouseInfo(warehousing_id, info)
+	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 warehousingInfo []*models.SupplierWarehousingInfoOrder
+	var updateWarehousingInfo []*models.SupplierWarehousingInfoOrder
+	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["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_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["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)
+
+				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)
+
+				supply_price_float, _ := strconv.ParseFloat(supply_price, 64)
+
+				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_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["is_source"] == nil || reflect.TypeOf(items["is_source"]).String() != "float64" {
+					utils.ErrorLog("is_source")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				is_source := int64(items["is_source"].(float64))
+
+				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_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_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["name"] == nil || reflect.TypeOf(items["name"]).String() != "string" {
+					utils.ErrorLog("name")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+
+				name := items["name"].(string)
+
+				if id > 0 {
+					order := models.SupplierWarehousingInfoOrder{
+						ID:                      id,
+						IsSource:                is_source,
+						Count:                   supply_count,
+						Price:                   supply_price_float,
+						Amount:                  supply_total_price_float,
+						Remark:                  supply_remake,
+						Ctime:                   time.Now().Unix(),
+						Status:                  1,
+						Mtime:                   0,
+						ProjectId:               project_id,
+						SupplyLicenseNumber:     supply_license_number,
+						SupplyType:              supply_type,
+						SupplySpecificationName: supply_specification_name,
+						SupplyTotal:             supply_total,
+						SupplyManufacturer:      supply_manufacturer,
+						Name:                    name,
+					}
+
+					updateWarehousingInfo = append(updateWarehousingInfo, &order)
+				}
+
+				if id == 0 {
+
+					order := models.SupplierWarehousingInfoOrder{
+						OrderNumber:             number,
+						IsSource:                is_source,
+						Count:                   supply_count,
+						Price:                   supply_price_float,
+						Amount:                  supply_total_price_float,
+						Remark:                  supply_remake,
+						UserOrgId:               orgId,
+						Ctime:                   time.Now().Unix(),
+						Status:                  1,
+						Mtime:                   0,
+						WarehousingId:           warehousing_id,
+						ProjectId:               id,
+						SupplyLicenseNumber:     supply_license_number,
+						SupplyType:              supply_type,
+						SupplySpecificationName: supply_specification_name,
+						SupplyTotal:             supply_total,
+						SupplyManufacturer:      supply_manufacturer,
+						Name:                    name,
+					}
+					warehousingInfo = append(warehousingInfo, &order)
+				}
+
+			}
+		}
+		if len(warehousingInfo) > 0 {
+			for _, item := range warehousingInfo {
+				service.CreateSupplyWarehousingOrder(item)
+			}
+
+		}
+		if len(updateWarehousingInfo) > 0 {
+			for _, item := range updateWarehousingInfo {
+				service.ModifySupplyWarehouseOrder(item)
+			}
+
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"warehousingInfo": warehousingInfo,
+		})
+
+	}
+}

models/stock_models.go

@@ -177,6 +177,7 @@ type VmWarehousingInfo struct {
 	MinNumber         int64       `gorm:"column:min_number" json:"min_number" form:"min_number"`
 	PackingUnit       string      `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
 	Count             int64       `gorm:json:"count"`
+	PackingPrice      float64     `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
 }
 
 type WarehouseOut struct {

models/supply.models.go

@@ -87,3 +87,76 @@ type SpSupplierName struct {
 func (SpSupplierName) TableName() string {
 	return "xt_supplier_name"
 }
+
+type SupplierWarehousingInfoOrder struct {
+	ID                      int64   `gorm:"column:id" json:"id" form:"id"`
+	OrderNumber             string  `gorm:"column:order_number" json:"order_number" form:"order_number"`
+	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"`
+	UserOrgId               int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime                   int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Status                  int64   `gorm:"column:status" json:"status" form:"status"`
+	Mtime                   int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	WarehousingId           int64   `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	ProjectId               int64   `gorm:"column:project_id" json:"project_id" form:"project_id"`
+	SupplyLicenseNumber     string  `gorm:"column:supply_license_number" json:"supply_license_number" form:"supply_license_number"`
+	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"`
+}
+
+func (SupplierWarehousingInfoOrder) TableName() string {
+	return "xt_supplier_warehousing_info_order"
+}
+
+type SupplierWarehouseInfo 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"`
+	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"`
+	DeliveryDate     int64   `gorm:"column:delivery_date" json:"delivery_date" form:"delivery_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 (SupplierWarehouseInfo) TableName() string {
+	return "xt_supplier_warehouse_info"
+}
+
+type VmSupplierWarehouseInfo 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"`
+	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"`
+	DeliveryDate                 int64                           `gorm:"column:delivery_date" json:"delivery_date" form:"delivery_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"`
+	SupplierWarehousingInfoOrder []*SupplierWarehousingInfoOrder `gorm:"ForeignKey:WarehousingId;AssociationForeignKey:ID" json:"orderInfo"`
+}
+
+func (VmSupplierWarehouseInfo) TableName() string {
+	return "xt_supplier_warehouse_info"
+}

service/stock_service.go

@@ -3732,7 +3732,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,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
+	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.packing_price,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
 
 }

service/supply_service.go

@@ -31,3 +31,71 @@ func GetSupplierList(orgid int64) (suppler []*models.SpSupplierName, err error)
 	err = XTReadDB().Where("user_org_id = ? and status = 1", orgid).Find(&suppler).Error
 	return suppler, err
 }
+
+func FindAllSupplyOrder(orgid int64) (total int64, err error) {
+
+	err = XTReadDB().Model(&models.SupplierWarehouseInfo{}).Where("user_org_id = ? and status = 1", orgid).Count(&total).Error
+	return total, err
+}
+
+func CreateSupplyWarehouse(info models.SupplierWarehouseInfo) error {
+
+	err := XTWriteDB().Create(&info).Error
+	return err
+}
+
+func FindLastSupplyWarehouseInfo(orgid int64) (models.SupplierWarehouseInfo, error) {
+	info := models.SupplierWarehouseInfo{}
+	err := XTReadDB().Where("user_org_id = ? and status = 1", orgid).Last(&info).Error
+	return info, err
+}
+
+func CreateSupplyWarehousingOrder(order *models.SupplierWarehousingInfoOrder) error {
+
+	err := XTWriteDB().Create(&order).Error
+	return err
+}
+
+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")
+	likeKey := "%" + keyword + "%"
+	offset := (page - 1) * limit
+	if check_id > 0 {
+		db = db.Where("xt_supplier_warehouse_info.is_check = ?", check_id)
+	}
+	if startime > 0 {
+		db = db.Where("xt_supplier_warehouse_info.record_date >= ?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("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")
+	}
+	if orgid > 0 {
+		db = db.Where("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
+	return info, total, err
+}
+
+func GetSupplyWarehousingOrderInfo(id int64) (order []*models.SupplierWarehousingInfoOrder, err error) {
+
+	err = XTReadDB().Where("warehousing_id = ? and status = 1", id).Find(&order).Error
+	return order, err
+}
+
+func ModefySupplyWarehouseInfo(id int64, info models.SupplierWarehouseInfo) error {
+
+	err := XTWriteDB().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
+	return err
+}
+
+func ModifySupplyWarehouseOrder(order *models.SupplierWarehousingInfoOrder) error {
+
+	err := XTWriteDB().Model(&order).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}).Error
+	return err
+}