11月8日库存管理

controllers/supply_order_api_contorller.go

@@ -25,6 +25,8 @@ func SupplyOrderApiRegistRouters() {
 	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")
 }
 
 func (this *SupplyOrderApiController) GetInitOrder() {
@@ -130,12 +132,12 @@ func (this *SupplyOrderApiController) SavePurchaseOrder() {
 			for _, item := range thisStockIn {
 				items := item.(map[string]interface{})
 
-				if items["id"] == nil || reflect.TypeOf(items["id"]).String() != "float64" {
-					utils.ErrorLog("id")
+				if items["project_id"] == nil || reflect.TypeOf(items["project_id"]).String() != "float64" {
+					utils.ErrorLog("project_id")
 					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 					return
 				}
-				id := int64(items["id"].(float64))
+				project_id := int64(items["project_id"].(float64))
 
 				if items["supply_count"] == nil || reflect.TypeOf(items["supply_count"]).String() != "float64" {
 					utils.ErrorLog("supply_count")
@@ -236,7 +238,7 @@ func (this *SupplyOrderApiController) SavePurchaseOrder() {
 					Status:                  1,
 					Mtime:                   0,
 					WarehousingId:           warehouseInfo.ID,
-					ProjectId:               id,
+					ProjectId:               project_id,
 					SupplyLicenseNumber:     supply_license_number,
 					SupplyType:              supply_type,
 					SupplySpecificationName: supply_specification_name,
@@ -438,12 +440,12 @@ func (this *SupplyOrderApiController) UpdatePurchaseOrder() {
 				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")
+				if items["type"] == nil || reflect.TypeOf(items["type"]).String() != "float64" {
+					utils.ErrorLog("type")
 					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 					return
 				}
-				is_source := int64(items["is_source"].(float64))
+				is_source := int64(items["type"].(float64))
 
 				if items["supply_type"] == nil || reflect.TypeOf(items["supply_type"]).String() != "string" {
 					utils.ErrorLog("supply_type")
@@ -553,3 +555,47 @@ func (this *SupplyOrderApiController) UpdatePurchaseOrder() {
 
 	}
 }
+
+func (this *SupplyOrderApiController) UpdateSupplyWaresing() {
+
+	id, _ := this.GetInt64("id")
+	recordDateStr := time.Now().Format("2006-01-02")
+	recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+
+	record_date := recordDate.Unix()
+	checker := this.GetAdminUserInfo().AdminUser.Id
+	info := models.SupplierWarehouseInfo{
+		Mtime:     time.Now().Unix(),
+		Status:    1,
+		IsCheck:   1,
+		Checker:   checker,
+		CheckTime: record_date,
+	}
+	parseDateErr := service.UpdateSupplyWaresing(id, info)
+	if parseDateErr == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"info": info,
+		})
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+
+func (this *SupplyOrderApiController) GetPurchaseOrderDetail() {
+
+	id, _ := this.GetInt64("id")
+	info, _ := service.GetPurchaseOrderDetail(id)
+	//查询
+	orderInfo, err := service.GetSupplyWarehousingOrderInfo(id)
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	supplyList, _ := service.GetSupplierList(orgId)
+	if err == nil {
+		this.ServeSuccessJSON(map[string]interface{}{
+			"info":       info,
+			"orderInfo":  orderInfo,
+			"supplyList": supplyList,
+		})
+	} else {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}

service/gobal_config_service.go

@@ -809,7 +809,7 @@ func GetSingleOrderDetail(id int64, orgid int64) (info []*models.VmDrugWarehouse
 		db = db.Where("x.warehouse_out_id = ?", id)
 	}
 
-	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,sum(x.count) as count,x.count_unit,x.price,x.total_price,x.product_date,x.expiry_date,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,x.is_sys,x.sys_record_time,x.retail_price,x.retail_total_price,t.drug_name,t.drug_type,t.max_unit,t.min_unit,t.min_number,x.number,x.batch_number,t.dose,t.dose_unit,t.last_price,t.min_price,t.medical_insurance_number,x.warehouse_info_id").Joins("left join xt_base_drug as t on t.id = x.drug_id").Group("x.drug_id").Scan(&info).Error
+	err = db.Select("x.id,x.warehouse_out_id,x.drug_id,sum(x.count) as count,x.count_unit,x.price,x.product_date,x.expiry_date,x.remark,x.is_cancel,x.warehouse_out_order_number,x.type,x.dealer,t.manufacturer,x.is_sys,x.sys_record_time,x.retail_price as total_price,x.retail_total_price,t.drug_name,t.drug_type,t.max_unit,t.min_unit,t.min_number,x.number,x.batch_number,t.dose,t.dose_unit,t.last_price,t.min_price,t.medical_insurance_number,t.retail_price ,x.warehouse_info_id").Joins("left join xt_base_drug as t on t.id = x.drug_id").Group("x.drug_id").Scan(&info).Error
 	return info, err
 }
 

service/supply_service.go

@@ -1,6 +1,9 @@
 package service
 
-import "XT_New/models"
+import (
+	"XT_New/models"
+	"time"
+)
 
 func GetSupplyDrugList(orgid int64) (drug []*models.SpBaseDrug, err error) {
 
@@ -90,12 +93,25 @@ func GetSupplyWarehousingOrderInfo(id int64) (order []*models.SupplierWarehousin
 
 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
+	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
 	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
+	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}).Error
 	return err
 }
+
+func UpdateSupplyWaresing(id int64, info models.SupplierWarehouseInfo) error {
+
+	err := XTWriteDB().Model(&models.SupplierWarehouseInfo{}).Where("id = ? and status = 1", id).Updates(map[string]interface{}{"is_check": info.IsCheck, "checker": info.Checker, "check_time": info.CheckTime, "mtime": time.Now().Unix()}).Error
+	return err
+}
+
+func GetPurchaseOrderDetail(id int64) (models.SupplierWarehouseInfo, error) {
+
+	info := models.SupplierWarehouseInfo{}
+	err := XTReadDB().Model(&info).Where("id =? and status =1", id).Find(&info).Error
+	return info, err
+}