Merge branch 'master' of http://git.shengws.com/csx/gdyb

models/models_3501.go

@@ -205,3 +205,52 @@ type Struct3507 struct {
 	AccessKey      string
 	Cainfo         string
 }
+
+type XtDrugInventory struct {
+	ID                 int64             `gorm:"column:id" json:"id" form:"id"`
+	DrugName           string            `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	SpecificationName  string            `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	WarehousingUnit    string            `gorm:"column:warehousing_unit" json:"warehousing_unit" form:"warehousing_unit"`
+	Count              int64             `gorm:"column:count" json:"count" form:"count"`
+	LastPrice          float64           `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	RetailPrice        float64           `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	NewPrice           float64           `gorm:"column:new_price" json:"new_price" form:"new_price"`
+	Manufacturer       string            `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer             string            `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Remark             string            `gorm:"column:remark" json:"remark" form:"remark"`
+	DrugId             int64             `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	UserOrgId          int64             `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	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"`
+	WarehousingOrder   string            `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	LicenseNumber      string            `gorm:"column:license_number" json:"license_number" form:"license_number"`
+	StartTime          int64             `gorm:"column:start_time" json:"start_time" form:"start_time"`
+	Creater            int64             `gorm:"column:creater" json:"creater" form:"creater"`
+	Checker            int64             `gorm:"column:checker" json:"checker" form:"checker"`
+	CheckerStatus      int64             `gorm:"column:checker_status" json:"checker_status" form:"checker_status"`
+	CheckerTime        int64             `gorm:"column:checker_time" json:"checker_time" form:"checker_time"`
+	ExpiryDate         int64             `gorm:"column:expiry_date" json:"expiry_date" form:"expiry_date"`
+	ProductDate        int64             `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	Number             string            `gorm:"column:number" json:"number" form:"number"`
+	BatchNumber        string            `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	Total              string            `gorm:"column:total" json:"total" form:"total"`
+	DrugOriginPlace    string            `gorm:"column:drug_origin_place" json:"drug_origin_place" form:"drug_origin_place"`
+	WarehouseInfoId    int64             `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	ProofCount         int64             `gorm:"column:proof_count" json:"proof_count" form:"proof_count"`
+	StockMaxNumber     int64             `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
+	StockMinNumber     int64             `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
+	MinCount           int64             `gorm:"column:min_count" json:"min_count" form:"min_count"`
+	MinUnit            string            `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	LastStockMaxNumber int64             `gorm:"column:last_stock_max_number" json:"last_stock_max_number" form:"last_stock_max_number"`
+	LastStockMinNumber int64             `gorm:"column:last_stock_min_number" json:"last_stock_min_number" form:"last_stock_min_number"`
+	InventoryType      int64             `gorm:"column:inventory_type" json:"inventory_type" form:"inventory_type"`
+	Type               int64             `gorm:"column:type" json:"type" form:"type"`
+	StorehouseId       int64             `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	BaseDrugLib        BaseDrugLib       `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId"json:"drug" `
+	DrugWarehouseInfo  DrugWarehouseInfo `gorm:"ForeignKey:ID;AssociationForeignKey:WarehouseInfoId"json:"drug_warehouse_info" `
+}
+
+func (XtDrugInventory) TableName() string {
+	return "xt_drug_inventory"
+}

service/auto_create_week_schedules_service.go

@@ -69,6 +69,10 @@ func AutoCreateStock() {
 	var NewDrugWarehouseOut []*models.NewDrugWarehouseOutInfo
 	var NewDrugCancelStock []*models.NewDrugCancelStockInfo
 
+	var XtDrugInventorys []*models.XtDrugInventory
+
+	readDb.Model(&models.XtDrugInventory{}).Where("user_org_id = ? and status = 1 and is_upload <> 1", org_id).Preload("BaseDrugLib", "status = 1").Find(&XtDrugInventorys)
+
 	//readDb.Model(&models.NewWarehousingInfo{}).Where("org_id = ? and status = 1 and is_upload <> 1", org_id).Preload("GoodInfo", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).First(&NewWarehousing)
 	//readDb.Model(&models.NewWarehouseOutInfo{}).Where("user_org_id = ? and status = 1 and is_upload <> 1", org_id).Preload("GoodInfo", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewWarehouseOut)
 	//readDb.Model(&models.NewCancelStockInfo{}).Where("user_org_id = ? and status = 1 and is_upload <> 1", org_id).Preload("GoodInfo", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewCancelStock)
@@ -81,6 +85,19 @@ func AutoCreateStock() {
 	//readDb.Model(&models.NewDrugWarehouseOutInfo{}).Where("org_id = ? and status = 1 and is_upload <> 1 AND id >= 366003", org_id).Preload("NewDrugWarehouseInfo","status = 1").Preload("BaseDrugLib", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewDrugWarehouseOut)
 	//readDb.Model(&models.NewDrugCancelStockInfo{}).Where("org_id = ? and status = 1 and is_upload <> 1 ", org_id).Preload("BaseDrugLib", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", org_id).Preload("Dealers", "status = 1 AND org_id = ?", org_id).Find(&NewDrugCancelStock)
 
+	for _, item := range XtDrugInventorys {
+		res := Post3501ForDrug(org_id, item)
+		if res.Infcode == 0 {
+			writeDb.Model(&models.XtDrugInventory{}).Where("id = ?", item.ID).Updates(map[string]interface{}{
+				"is_upload": 1,
+			})
+		} else {
+
+			continue
+		}
+
+	}
+
 	for _, item := range NewWarehousing {
 		res := Post3503ForGoodInfo(org_id, item)
 		if res.Infcode == 0 {
@@ -152,6 +169,143 @@ func AutoCreateStock() {
 
 }
 
+func Post3501ForGoodInfo(org_id int64, infos *models.XtDrugInventory) ResultSix {
+	var res ResultSix
+	miConfig, _ := FindMedicalInsuranceInfo(org_id)
+	data := make(map[string]interface{})
+	var struct3501s []models.Struct3501
+	var struct3501 models.Struct3501
+	struct3501.MedListCodg = infos.BaseDrugLib.MedicalInsuranceNumber
+	struct3501.FixmedinsHilistId = miConfig.Code
+	struct3501.FixmedinsHilistName = miConfig.OrgName
+	struct3501.FixmedinsBchno = infos.BatchNumber
+	struct3501.RxFlag = "0"
+	struct3501.Invdate = time.Unix(infos.Ctime, 0).Format("2006-01-02 15:04:05")
+	struct3501.OrgName = miConfig.OrgName
+	struct3501.AccessKey = miConfig.AccessKey
+	struct3501.RequestUrl = miConfig.Url
+	struct3501.SecretKey = miConfig.SecretKey
+	struct3501.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
+	struct3501.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
+	struct3501.InvCnt = strconv.FormatInt(infos.Count, 10)
+	struct3501.ManuDate = time.Unix(infos.DrugWarehouseInfo.ProductDate, 0).Format("2006-01-02 15:04:05")
+	struct3501.ExpyEnd = time.Unix(infos.DrugWarehouseInfo.ExpiryDate, 0).Format("2006-01-02 15:04:05")
+
+	struct3501s = append(struct3501s, struct3501)
+	data["struct_3501s"] = struct3501s[0]
+	client := &http.Client{}
+	bytesData, _ := json.Marshal(data)
+	var req *http.Request
+
+	if miConfig.MdtrtareaAdmvs == "320921" {
+		req, _ = http.NewRequest("POST", "http://192.168.2.110:9532/"+"jsyb/3501", bytes.NewReader(bytesData))
+	} else {
+		req, _ = http.NewRequest("POST", "http://192.168.5.251:9532/"+"jsyb/3501", bytes.NewReader(bytesData))
+	}
+
+	resp, _ := client.Do(req)
+	defer resp.Body.Close()
+	body, ioErr := ioutil.ReadAll(resp.Body)
+	if ioErr != nil {
+		utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+		res.Infcode = -1
+		return res
+	}
+	var respJSON map[string]interface{}
+	if err := json.Unmarshal([]byte(body), &respJSON); err != nil {
+		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+		res.Infcode = -1
+		return res
+	}
+
+	var resSix10265 ResultSix10265 //1101结果
+
+	respJSON = respJSON["data"].(map[string]interface{})["request_log"].(map[string]interface{})
+	result, _ := json.Marshal(respJSON)
+	if err := json.Unmarshal([]byte(result), &resSix10265); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		res.Infcode = -1
+		return res
+	}
+	res.InfRefmsgid = resSix10265.InfRefmsgid
+	res.Output = resSix10265.Output
+	res.ErrMsg = resSix10265.ErrMsg
+	res.Cainfo = resSix10265.Cainfo
+	res.WarnMsg = resSix10265.WarnMsg
+	infocode, _ := strconv.ParseInt(resSix10265.Infcode, 10, 64)
+	res.Infcode = infocode
+
+	return res
+}
+func Post3501ForDrug(org_id int64, infos *models.XtDrugInventory) ResultSix {
+	var res ResultSix
+	miConfig, _ := FindMedicalInsuranceInfo(org_id)
+	data := make(map[string]interface{})
+	var struct3501s []models.Struct3501
+	var struct3501 models.Struct3501
+	struct3501.MedListCodg = infos.BaseDrugLib.MedicalInsuranceNumber
+	struct3501.FixmedinsHilistId = miConfig.Code
+	struct3501.FixmedinsHilistName = miConfig.OrgName
+	struct3501.FixmedinsBchno = infos.BatchNumber
+	struct3501.RxFlag = "0"
+	struct3501.Invdate = time.Unix(infos.Ctime, 0).Format("2006-01-02 15:04:05")
+	struct3501.OrgName = miConfig.OrgName
+	struct3501.AccessKey = miConfig.AccessKey
+	struct3501.RequestUrl = miConfig.Url
+	struct3501.SecretKey = miConfig.SecretKey
+	struct3501.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
+	struct3501.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
+	struct3501.InvCnt = strconv.FormatInt(infos.Count, 10)
+	struct3501.ManuDate = time.Unix(infos.DrugWarehouseInfo.ProductDate, 0).Format("2006-01-02 15:04:05")
+	struct3501.ExpyEnd = time.Unix(infos.ExpiryDate, 0).Format("2006-01-02 15:04:05")
+
+	struct3501s = append(struct3501s, struct3501)
+	data["struct_3501s"] = struct3501s[0]
+	client := &http.Client{}
+	bytesData, _ := json.Marshal(data)
+	var req *http.Request
+
+	if miConfig.MdtrtareaAdmvs == "320921" {
+		req, _ = http.NewRequest("POST", "http://192.168.2.110:9532/"+"jsyb/3501", bytes.NewReader(bytesData))
+	} else {
+		req, _ = http.NewRequest("POST", "http://192.168.5.251:9532/"+"jsyb/3501", bytes.NewReader(bytesData))
+	}
+
+	resp, _ := client.Do(req)
+	defer resp.Body.Close()
+	body, ioErr := ioutil.ReadAll(resp.Body)
+	if ioErr != nil {
+		utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+		res.Infcode = -1
+		return res
+	}
+	var respJSON map[string]interface{}
+	if err := json.Unmarshal([]byte(body), &respJSON); err != nil {
+		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+		res.Infcode = -1
+		return res
+	}
+
+	var resSix10265 ResultSix10265 //1101结果
+
+	respJSON = respJSON["data"].(map[string]interface{})["request_log"].(map[string]interface{})
+	result, _ := json.Marshal(respJSON)
+	if err := json.Unmarshal([]byte(result), &resSix10265); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		res.Infcode = -1
+		return res
+	}
+	res.InfRefmsgid = resSix10265.InfRefmsgid
+	res.Output = resSix10265.Output
+	res.ErrMsg = resSix10265.ErrMsg
+	res.Cainfo = resSix10265.Cainfo
+	res.WarnMsg = resSix10265.WarnMsg
+	infocode, _ := strconv.ParseInt(resSix10265.Infcode, 10, 64)
+	res.Infcode = infocode
+
+	return res
+}
+
 //采购
 func Post3503ForGoodInfo(org_id int64, infos *models.NewWarehousingInfo) ResultSix {
 	fmt.Println(&infos)

service/jsyb_service.go

@@ -1706,7 +1706,7 @@ func Jsyb4101(struct4101 Struct4101, params models.PublicParams) (string, string
 func Jsyb3501(struct3501 models.Struct3501) (string, string) {
 	timestamp := time.Now().Unix()
 	// 生成输入报文
-	inputMessage := SetJSInputMessage(timestamp, struct3501.OrgName, struct3501.Opter, struct3501.FixmedinsCode, struct3501.InsuplcAdmdvs, struct3501.MdtrtareaAdmvs, struct3501.Cainfo)
+	inputMessage := SetJSInputMessage(timestamp, struct3501.OrgName, struct3501.Opter, struct3501.FixmedinsHilistId, struct3501.InsuplcAdmdvs, struct3501.MdtrtareaAdmvs, struct3501.Cainfo)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "3501"                                  // 交易编码