11月8日库存管理

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
-httpport = 9531
-runmode = prod
+httpport = 9529
+runmode = dev
 
 #
 copyrequestbody = true

controllers/patient_api_controller.go

@@ -1419,11 +1419,13 @@ func (c *PatientApiController) CreateGroupAdvice() {
 
 	list, err := service.CreateMGroupAdvice(adminUserInfo.CurrentOrgId, advices, groupNo)
 	key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(patient, 10) + ":" + strconv.FormatInt(AdviceDate, 10) + ":doctor_advices"
+	//fmt.Println("key23323323232323223233223232323",key)
 	redis := service.RedisClient()
 	defer redis.Close()
 	redis.Set(key, "", time.Second)
 	keyOne := strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(AdviceDate, 10) + ":advice_list_all"
 	redis.Set(keyOne, "", time.Second)
+	//fmt.Println("keyOne23322322323232323233232332",keyOne)
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateDoctorAdviceFail)
 		return

controllers/supply_order_api_contorller.go

@@ -1312,6 +1312,15 @@ func (this *SupplyOrderApiController) AddGoodOrder() {
 
 				price_float, _ := strconv.ParseFloat(supply_price, 64)
 
+				if items["min_price"] == nil || reflect.TypeOf(items["min_price"]).String() != "string" {
+					utils.ErrorLog("min_price")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				min_price := items["min_price"].(string)
+
+				min_price_float, _ := strconv.ParseFloat(min_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)
@@ -1453,6 +1462,7 @@ func (this *SupplyOrderApiController) AddGoodOrder() {
 					ManufacturerId:          manufacturer_id,
 					GoodNumber:              warehouseOut.GoodNumber,
 					SupplyManufacturer:      supply_manufacturer,
+					MinPrice:                min_price_float,
 				}
 				warehousingOut = append(warehousingOut, &order)
 			}
@@ -1464,7 +1474,21 @@ func (this *SupplyOrderApiController) AddGoodOrder() {
 		if item.WarehouseInfoId == 0 {
 			item.Type = 2
 		}
-		err = service.CreateSupplyWarehousOutOrder(item)
+		//查询该商品是否来源于采购订单,如果存在则关联， 如果不存在则取消关联
+		_, errcode := service.GetGoodIsSource(warehousing_id, item.ProjectId, orgId)
+		if errcode == gorm.ErrRecordNotFound {
+			item.WarehousingId = 0
+			item.WarehouseInfoId = 0
+			item.OrderNumber = ""
+			item.Type = 2
+			err = service.CreateSupplyWarehousOutOrder(item)
+			//更新采购单
+			service.ModfySupplyWarehouseOut(warehousing_id, orgId)
+		}
+		if errcode == nil {
+			err = service.CreateSupplyWarehousOutOrder(item)
+		}
+
 	}
 
 	list, parseDateErr := service.GetSupplyWarehouseOutById(warehouseOut.ID, orgId)
@@ -1659,6 +1683,15 @@ func (this *SupplyOrderApiController) UpdateGoodOrder() {
 
 				supply_total_price_float, _ := strconv.ParseFloat(supply_total_price, 64)
 
+				if items["min_price"] == nil || reflect.TypeOf(items["min_price"]).String() != "string" {
+					utils.ErrorLog("min_price")
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+					return
+				}
+				min_price := items["min_price"].(string)
+
+				min_price_float, _ := strconv.ParseFloat(min_price, 64)
+
 				if items["project_id"] == nil || reflect.TypeOf(items["project_id"]).String() != "float64" {
 					utils.ErrorLog("project_id")
 					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -1807,6 +1840,7 @@ func (this *SupplyOrderApiController) UpdateGoodOrder() {
 						SupplyManufacturer:      supply_manufacturer,
 						WarehouseInfoId:         warehouse_info_id,
 						WarehousingId:           warehousing_id,
+						MinPrice:                min_price_float,
 					}
 					updateWarehout = append(updateWarehout, &order)
 				}
@@ -1840,6 +1874,7 @@ func (this *SupplyOrderApiController) UpdateGoodOrder() {
 						ManufacturerId:          manufacturer_id,
 						GoodNumber:              good_number,
 						SupplyManufacturer:      supply_manufacturer,
+						MinPrice:                min_price_float,
 					}
 					warehousingOut = append(warehousingOut, &order)
 				}
@@ -1856,6 +1891,7 @@ func (this *SupplyOrderApiController) UpdateGoodOrder() {
 		DocumentDate:     startTime,
 		ReturnRemake:     return_remake,
 	}
+
 	//更改购货单据
 	service.UpdateGoodWarehouseOut(warehose_out_id, out)
 
@@ -1867,8 +1903,17 @@ func (this *SupplyOrderApiController) UpdateGoodOrder() {
 		err = service.CreateSupplyWarehousOutOrder(item)
 	}
 	for _, item := range updateWarehout {
-
-		service.UpdateGoodWarehouseOutOrder(item)
+		//查询该商品是否来源于采购订单,如果存在则关联， 如果不存在则取消关联
+		_, errcode := service.GetGoodIsSource(item.WarehousingId, item.ProjectId, orgId)
+		if errcode == gorm.ErrRecordNotFound {
+			item.WarehousingId = 0
+			item.WarehouseInfoId = 0
+			item.Type = 2
+			item.OrderNumber = ""
+			service.UpdateGoodWarehouseOutOrder(item)
+			//更新采购单
+			service.ModfySupplyWarehouseOut(item.WarehousingId, orgId)
+		}
 	}
 	if err == nil {
 		this.ServeSuccessJSON(map[string]interface{}{
@@ -2076,7 +2121,7 @@ func (this *SupplyOrderApiController) GetGoodOrderCountList() {
 						BatchNumber:               item.SupplyBatchNumber,
 						MaxUnit:                   item.SupplyUnit,
 						MinUnit:                   item.SupplyUnit,
-						RetailPrice:               medical.MinPrice,
+						RetailPrice:               item.MinPrice,
 						SupplyWarehouseId:         id,
 						SupplyWarehouseDetailInfo: item.ID,
 					}
@@ -2176,7 +2221,7 @@ func (this *SupplyOrderApiController) GetGoodOrderCountList() {
 						StockCount:                item.Count,
 						Dealer:                    good.Dealer,
 						LicenseNumber:             item.SupplyLicenseNumber,
-						PackingPrice:              good.PackingPrice,
+						PackingPrice:              item.MinPrice,
 						SupplyWarehouseId:         id,
 						SupplyWarehouseDetailInfo: item.ID,
 					}

models/supply.models.go

@@ -37,6 +37,7 @@ type SpBaseDrug struct {
 	LastPrice         float64                `gorm:"column:last_price" json:"last_price" form:"last_price"`
 	DrugWarehouseInfo []*SpDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_warehouse_info"`
 	DrugStatus        string                 `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
+	MinPrice          float64                `gorm:"column:min_price" json:"min_price" form:"min_price"`
 }
 
 func (SpBaseDrug) TableName() string {
@@ -56,6 +57,7 @@ type SpGoodInformation struct {
 	GoodStatus        string             `gorm:"column:good_status" json:"good_status" form:"good_status"`
 	GoodWarehouseInfo []*SpWarehouseInfo `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"good_warehouse_info"`
 	Number            string             `gorm:"column:number" json:"number" form:"number"`
+	RetailPrice       float64            `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
 }
 
 func (SpGoodInformation) TableName() string {
@@ -221,6 +223,7 @@ type SpSupplierWarehousingOutOrder struct {
 	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"`
+	MinPrice                float64 `gorm:"column:min_price" json:"min_price" form:"min_price"`
 }
 
 func (SpSupplierWarehousingOutOrder) TableName() string {

service/stock_service.go

@@ -871,21 +871,22 @@ func GetWarehoureOrderOutByGoodId(good_id []int64, startime int64, endtime int64
 }
 
 type VMDrugWarehouse struct {
-	ID               int64                `gorm:"column:id" json:"id" form:"id"`
-	WarehousingOrder string               `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
-	OperationTime    int64                `gorm:"column:operation_time" json:"operation_time" form:"operation_time"`
-	OrgId            int64                `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	Creater          int64                `gorm:"column:creater" json:"creater" form:"creater"`
-	Ctime            int64                `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Modifier         int64                `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	Mtime            int64                `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Status           int64                `gorm:"column:status" json:"status" form:"status"`
-	WarehousingTime  int64                `gorm:"column:warehousing_time" json:"warehousing_time" form:"warehousing_time"`
-	Dealer           int64                `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Manufacturer     int64                `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	Type             int64                `gorm:"column:type" json:"type" form:"type"`
-	Manufacturers    *models.Manufacturer `gorm:"ForeignKey:Manufacturer;AssociationForeignKey:ID" json:"manufacturers"`
-	Dealers          *models.Dealer       `gorm:"ForeignKey:Dealer;AssociationForeignKey:ID" json:"dealers"`
+	ID                int64                `gorm:"column:id" json:"id" form:"id"`
+	WarehousingOrder  string               `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	OperationTime     int64                `gorm:"column:operation_time" json:"operation_time" form:"operation_time"`
+	OrgId             int64                `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Creater           int64                `gorm:"column:creater" json:"creater" form:"creater"`
+	Ctime             int64                `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Modifier          int64                `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Mtime             int64                `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status            int64                `gorm:"column:status" json:"status" form:"status"`
+	WarehousingTime   int64                `gorm:"column:warehousing_time" json:"warehousing_time" form:"warehousing_time"`
+	Dealer            int64                `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer      int64                `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Type              int64                `gorm:"column:type" json:"type" form:"type"`
+	Manufacturers     *models.Manufacturer `gorm:"ForeignKey:Manufacturer;AssociationForeignKey:ID" json:"manufacturers"`
+	Dealers           *models.Dealer       `gorm:"ForeignKey:Dealer;AssociationForeignKey:ID" json:"dealers"`
+	SupplyWarehouseId int64                `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
 }
 
 func (VMDrugWarehouse) TableName() string {
@@ -893,31 +894,33 @@ func (VMDrugWarehouse) TableName() string {
 }
 
 type VMDrugWarehouseInfo struct {
-	ID               int64   `gorm:"column:id" json:"id" form:"id"`
-	WarehousingId    int64   `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
-	DrugId           int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
-	Number           string  `gorm:"column:number" json:"number" form:"number"`
-	ProductDate      int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
-	ExpiryDate       int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
-	WarehousingCount int64   `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
-	Price            float64 `gorm:"column:price" json:"price" form:"price"`
-	TotalPrice       float64 `gorm:"column:total_price" json:"total_price" form:"total_price"`
-	Dealer           int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Manufacturer     int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	Remark           string  `gorm:"column:remark" json:"remark" form:"remark"`
-	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"`
-	OrgId            int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	IsReturn         int64   `gorm:"column:is_return" json:"is_return" form:"is_return"`
-	WarehousingOrder string  `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
-	Type             int64   `gorm:"column:type" json:"type" form:"type"`
-	RetailPrice      float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	RetailTotalPrice float64 `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
-	BatchNumber      string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
-	MaxUnit          string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
-	MinUnit          string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
-	Drug             *Drug   `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug"`
+	ID                        int64   `gorm:"column:id" json:"id" form:"id"`
+	WarehousingId             int64   `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	DrugId                    int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Number                    string  `gorm:"column:number" json:"number" form:"number"`
+	ProductDate               int64   `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	ExpiryDate                int64   `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	WarehousingCount          int64   `gorm:"column:warehousing_count" json:"warehousing_count" form:"warehousing_count"`
+	Price                     float64 `gorm:"column:price" json:"price" form:"price"`
+	TotalPrice                float64 `gorm:"column:total_price" json:"total_price" form:"total_price"`
+	Dealer                    int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Manufacturer              int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Remark                    string  `gorm:"column:remark" json:"remark" form:"remark"`
+	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"`
+	OrgId                     int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	IsReturn                  int64   `gorm:"column:is_return" json:"is_return" form:"is_return"`
+	WarehousingOrder          string  `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	Type                      int64   `gorm:"column:type" json:"type" form:"type"`
+	RetailPrice               float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	RetailTotalPrice          float64 `gorm:"column:retail_total_price" json:"retail_total_price" form:"retail_total_price"`
+	BatchNumber               string  `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	MaxUnit                   string  `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit                   string  `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	Drug                      *Drug   `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug"`
+	SupplyWarehouseId         int64   `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	SupplyWarehouseDetailInfo int64   `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
 }
 
 func (VMDrugWarehouseInfo) TableName() string {

service/supply_service.go

@@ -491,13 +491,13 @@ func GetGoodOrderDetail(id int64, orgid int64) (models.SpSupplierWarehouseOut, e
 
 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, "return_remake": out.ReturnRemake}).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, "return_remake": out.ReturnRemake, "supplier_id": out.SupplierId}).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, "remark": order.Remark, "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, "warehousing_id": order.WarehousingId, "warehouse_info_id": order.WarehouseInfoId}).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, "remark": order.Remark, "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.SupplyTotal, "supply_manufacturer": order.SupplyManufacturer, "name": order.Name, "supply_unit": order.SupplyUnit, "manufacturer_id": order.ManufacturerId, "supply_license_number": order.SupplyLicenseNumber, "warehousing_id": order.WarehousingId, "warehouse_info_id": order.WarehouseInfoId, "min_price": order.MinPrice}).Error
 	return err
 }
 
@@ -734,7 +734,7 @@ func UpdateGoodSupplyWarehousingInfo(id int64, orgid int64) error {
 
 func UpdateGoodSupplyFlow(id int64, orgid int64) error {
 
-	err := XTWriteDB().Model(&models.WarehousingInfo{}).Where("supply_warehouse_id = ? and user_org_id = ? and status = 1", id, orgid).Updates(map[string]interface{}{"status": 0}).Error
+	err := XTWriteDB().Model(&models.WarehousingInfo{}).Where("supply_warehouse_id = ? and org_id = ? and status = 1", id, orgid).Updates(map[string]interface{}{"status": 0}).Error
 	return err
 }
 
@@ -960,3 +960,23 @@ func DeleteDrugWarehouseOutNight(goodid int64, supply_warehouse_id int64) error
 
 	return err
 }
+
+func GetGoodIsSource(warehousing_id int64, project_id int64, orgid int64) (*models.SupplierWarehousingInfoOrder, error) {
+	info := models.SupplierWarehousingInfoOrder{}
+	var err error
+	err = XTReadDB().Model(&info).Where("warehousing_id = ? and project_id = ? and user_org_id = ? and status = 1", warehousing_id, project_id, orgid).Find(&info).Error
+	if err == gorm.ErrRecordNotFound {
+		return nil, err
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &info, nil
+}
+
+func ModfySupplyWarehouseOut(warehousing_id int64, orgid int64) error {
+
+	out := models.SpSupplierWarehouseOut{}
+	err := XTWriteDB().Model(&out).Where("warehousing_id = ? and user_org_id =? and status = 1", warehousing_id, orgid).Updates(map[string]interface{}{"warehousing_id": 0, "number": ""}).Error
+	return err
+}