历史排班

controllers/drug_stock_api_contorller.go

@@ -1171,7 +1171,7 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 		StorehouseId:            storehouse_id,
 		IsCheck:                 2,
 	}
-	fmt.Println("warehouse_out_id232323322323232323233223", warehouse_out_id)
+
 	if warehouse_out_id == 0 {
 		service.AddSigleDrugWarehouseOut(&warehouseOut)
 	}
@@ -1282,7 +1282,8 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 					Price:                   price,
 					TotalPrice:              total,
 					Status:                  1,
-					Ctime:                   ctime,
+					Ctime:                   warehousingOutDate.Unix(),
+					Mtime:                   ctime,
 					Remark:                  remark,
 					OrgId:                   adminUserInfo.CurrentOrgId,
 					Type:                    types,
@@ -1683,14 +1684,15 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 						Price:                   price,
 						TotalPrice:              total,
 						Status:                  1,
-						Ctime:                   ctime,
+						Ctime:                   warehouseOut.WarehouseOutTime,
+						Mtime:                   ctime,
 						Remark:                  remark,
 						OrgId:                   adminUserInfo.CurrentOrgId,
 						Type:                    types,
 						Manufacturer:            manufacturer,
 						Dealer:                  dealer,
 						IsSys:                   0,
-						SysRecordTime:           0,
+						SysRecordTime:           warehouseOut.WarehouseOutTime,
 						RetailPrice:             retail_price,
 						RetailTotalPrice:        retail_price_total,
 						BatchNumber:             batch_number,
@@ -1715,7 +1717,8 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 						Count:                   count,
 						Price:                   price,
 						Status:                  1,
-						Ctime:                   ctime,
+						Ctime:                   warehouseOut.WarehouseOutTime,
+						Mtime:                   ctime,
 						UserOrgId:               adminUserInfo.CurrentOrgId,
 						Manufacturer:            manufacturer,
 						Dealer:                  dealer,
@@ -1758,7 +1761,7 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 						Price:                   price,
 						TotalPrice:              total,
 						Status:                  1,
-						Ctime:                   ctime,
+						Ctime:                   warehouseOut.WarehouseOutTime,
 						Remark:                  remark,
 						OrgId:                   adminUserInfo.CurrentOrgId,
 						Mtime:                   time.Now().Unix(),
@@ -1791,7 +1794,8 @@ func (c *StockDrugApiController) EditDrugWarehouseOut() {
 						Count:                   count,
 						Price:                   price,
 						Status:                  1,
-						Ctime:                   ctime,
+						Ctime:                   warehouseOut.WarehouseOutTime,
+						Mtime:                   time.Now().Unix(),
 						UserOrgId:               adminUserInfo.CurrentOrgId,
 						Manufacturer:            manufacturer,
 						Dealer:                  dealer,

controllers/sign_api_controller.go

@@ -35,8 +35,8 @@ func SignApiRegistRouters() {
 	//添加合同签署人
 	beego.Router("/api/sign/addcontractsignatory", &SignApiController{}, "Get:AddContractSignatory")
 
-	//beego.Router("/api/sign/contractsignatory", &SignApiController{}, "Get:CreateSignTest")
-	beego.Router("/api/sign/contractsignatory", &SignApiController{}, "Get:CreateContractsignatory")
+	//后台签署（返回签署文件）
+	beego.Router("/api/sign/createbackstagesign", &SignApiController{}, "Get:CreateBackStageSign")
 }
 
 // 短信服务接口
@@ -191,6 +191,7 @@ func (this *SignApiController) CreateEnterPriseRealName() {
 	return
 }
 
+// 添加合同签署人
 func (this *SignApiController) AddContractSignatory() {
 
 	contractId := this.GetString("contractId")
@@ -199,91 +200,75 @@ func (this *SignApiController) AddContractSignatory() {
 
 	var newContract models.NewContract
 
-	newContract.ContractId = "153497878806048027"
+	newContract.ContractId = "156001444267295949"
 
-	service.AddContractSignatory(contractId, signers, newContract)
+	sign := service.AddContractSignatory(contractId, signers, newContract)
 
-	maprequest := make(map[string]interface{})
-
-	maprequest["contractId"] = "153497878806048027"
-
-	//maprequestOne := make(map[string]interface{})
-
-	maprequestTwo := make(map[string]interface{})
+	this.ServeSuccessJSON(map[string]interface{}{
+		"sign": sign,
+	})
+	return
 
-	var signFiles models.SignFiles
-	var sig []*models.Signers
-	signFiles.DocId = 343465645
+}
 
-	inputDataArrOne := make([]map[string]interface{}, 0)
-	inputDataArrTwo := make([]map[string]interface{}, 0)
+func (this *SignApiController) CreateBackStageSign() {
 
-	inputDataArrThree := make([]map[string]interface{}, 0)
-	for _, item := range signFiles.XySignControls {
-		fmt.Println(item)
-		inputDataThree := make(map[string]interface{})
-		inputDataThree["key"] = 11
-		inputDataThree["type"] = 222
-		inputDataThree["pageNum"] = 333
-		inputDataThree["positionX"] = 444
-		inputDataThree["positionY"] = 555
-
-		fmt.Println("2O2332O23O23O23", inputDataArrThree)
-		inputDataArrOne = append(inputDataArrOne, inputDataThree)
-	}
+	contractId := this.GetString("contractId")
 
-	fmt.Println("inputDataArrOne", inputDataArrOne)
+	signers := this.GetString("signers")
+	sign := service.CreateBackStageSign(contractId, signers)
 
-	for _, item := range signFiles.KeywordSignControls {
+	sealTimestampFiles := make(map[string]interface{})
+	fontsFiles := make(map[string]interface{})
+	inputDataArr := make([]map[string]interface{}, 0)
+	signFiles := make(map[string]interface{})
+	for _, item := range sealTimestampFiles {
 		fmt.Println(item)
-		inputDataFour := make(map[string]interface{})
-		inputDataFour["key"] = 666
-		inputDataFour["type"] = 888
-		inputDataFour["pageNum"] = 9999
-		inputDataFour["keyword"] = 6666
-		inputDataFour["positionX"] = 77777
-		inputDataFour["positionY"] = 8888
-
-		inputDataArrTwo = append(inputDataArrTwo, inputDataFour)
+		keywordSignControls := make(map[string]interface{})
+		keywordSignControls["controlsKey"] = "2"
+		keywordSignControls["pattern"] = "1"
+		keywordSignControls["color"] = "#FF0000"
+		inputDataArr = append(inputDataArr, keywordSignControls)
 	}
 
-	for _, item := range sig {
-		fmt.Println(item)
-		inputDataFive := make(map[string]interface{})
-		inputDataFive["userId"] = 233232
-		inputDataFive["signerType"] = 454545
-		inputDataFive["enterpriseId"] = 45455
-		inputDataFive["sequence"] = 44545
-		inputDataFive["sendMsg"] = 4545
-		inputDataFive["signFiles"] = 45455
+	sealTimestampFiles["allAddTimestamp"] = false
+	sealTimestampFiles["someTimestampStyle"] = inputDataArr
 
+	inputDataArrOne := make([]map[string]interface{}, 0)
+	for _, item := range fontsFiles {
+		fmt.Println("item", item)
+		keySignControls := make(map[string]interface{})
+		keySignControls["controlsKey"] = "1"
+		keySignControls["fontType"] = 1
+		keySignControls["fontSize"] = 8.5
+		keySignControls["fontColor"] = "#56600F"
+		keySignControls["alignment"] = 1
+		inputDataArrOne = append(inputDataArrOne, keySignControls)
 	}
+	signFiles["fonts"] = fontsFiles
+	signFiles["showTimestamp"] = false
+	signFiles["sealTimestamp"] = sealTimestampFiles
+	signControl := make(map[string]interface{})
+	signControl["1"] = "234535"
+	signFiles["signControl"] = signControl
 
-	maprequestTwo["xySignControls"] = inputDataArrOne
-	maprequestTwo["keywordSignControls"] = inputDataArrTwo
-	maprequestTwo["docId"] = 1234555
-
-	maprequest["contractId"] = newContract.ContractId
-
-	maprequest["signers"] = inputDataArrThree
-
-	this.ServeSuccessJSON(map[string]interface{}{
-		"inputDataArrOne": inputDataArrOne,
-		"maprequestOne":   maprequest,
-		"maprequestTwo":   maprequestTwo,
-	})
-	return
-}
-
-func (this *SignApiController) CreateContractsignatory() {
+	inputDataArrThree := make([]map[string]interface{}, 0)
+	inputDataArrThree = append(inputDataArrThree, signFiles)
 
-	list, _ := service.GetHisDoctorAdviceInfoList(10215)
+	signer := make(map[string]interface{})
 
-	for _, item := range list {
-		service.UpdatePatietPrice(item.ID, item.RetailPrice)
-	}
+	signer["signerId"] = ""
+	signer["isUserWishes"] = true
+	signer["userWishesWay"] = 1
+	signer["codeNumber"] = "1004"
+	signer["verifyCode"] = "13006"
+	signer["signFiles"] = inputDataArrThree
+	maprequest := make(map[string]interface{})
+	maprequest["contractId"] = "156002172264252635"
+	maprequest["signer"] = signer
 	this.ServeSuccessJSON(map[string]interface{}{
-		"sign": "msg",
+		"sign":       sign,
+		"maprequest": maprequest,
 	})
 	return
 }

controllers/stock_in_api_controller.go

@@ -1356,6 +1356,7 @@ func (c *StockManagerApiController) CreateWarehouseOut() {
 					StockCount:              stock_count,
 					IsCheck:                 2,
 					RegisterNumber:          register_number,
+					SysRecordTime:           warehouseOut.WarehouseOutTime,
 				}
 				warehousingOutInfo = append(warehousingOutInfo, warehouseOutInfo)
 
@@ -1605,7 +1606,6 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 		return
 	}
 
-	ctime := time.Now().Unix()
 	mtime := time.Now().Unix()
 	adminUserInfo := c.GetAdminUserInfo()
 
@@ -1742,12 +1742,13 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 						Price:                   price,
 						TotalPrice:              total,
 						Status:                  1,
-						Ctime:                   ctime,
+						Ctime:                   warehouseOut.WarehouseOutTime,
+						Mtime:                   time.Now().Unix(),
 						Remark:                  remark,
 						OrgId:                   adminUserInfo.CurrentOrgId,
 						Type:                    types,
 						IsSys:                   0,
-						SysRecordTime:           0,
+						SysRecordTime:           warehouseOut.WarehouseOutTime,
 						Number:                  number,
 						ExpiryDate:              expiryDate,
 						ProductDate:             productDate,
@@ -1788,7 +1789,7 @@ func (c *StockManagerApiController) EditWarehouseOut() {
 						Price:                   price,
 						TotalPrice:              total,
 						Status:                  1,
-						Ctime:                   ctime,
+						Ctime:                   warehouseOut.WarehouseOutTime,
 						Remark:                  remark,
 						OrgId:                   adminUserInfo.CurrentOrgId,
 						Mtime:                   time.Now().Unix(),

service/new_warehouse_service.go

@@ -1493,7 +1493,8 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
 			WarehouseOutId:          warehouseout.ID,
 			Status:                  1,
-			Ctime:                   time.Now().Unix(),
+			Ctime:                   advice.RecordDate,
+			Mtime:                   time.Now().Unix(),
 			Remark:                  warehouse.Remark,
 			OrgId:                   orgID,
 			Type:                    1,
@@ -1601,7 +1602,8 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 					Count:                   deliver_number - (out_count - cancel_count), //按最小单位计算,
 					Price:                   warehouse.RetailPrice,
 					Status:                  1,
-					Ctime:                   time.Now().Unix(),
+					Ctime:                   advice.AdviceDate,
+					Mtime:                   time.Now().Unix(),
 					UserOrgId:               orgID,
 					Manufacturer:            warehouse.Manufacturer,
 					Dealer:                  warehouse.Dealer,
@@ -1721,7 +1723,8 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 				DrugId:           advice.DrugId,
 				Count:            (out_count - cancel_count) - deliver_number,
 				Status:           1,
-				Ctime:            ctime,
+				Ctime:            advice.AdviceDate,
+				Mtime:            time.Now().Unix(),
 				OrgId:            advice.UserOrgId,
 				Type:             1,
 				Manufacturer:     manufactureName.ManufacturerName,
@@ -1779,8 +1782,8 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 				Creator:                 advice.ExecutionStaff,
 				UpdateCreator:           0,
 				Status:                  1,
-				Ctime:                   time.Now().Unix(),
-				Mtime:                   0,
+				Ctime:                   advice.AdviceDate,
+				Mtime:                   time.Now().Unix(),
 				Price:                   warehouse.RetailPrice,
 				WarehousingDetailId:     warehouse.ID,
 				WarehouseOutDetailId:    0,
@@ -1852,7 +1855,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			WarehouseOutId:          warehouseout.ID,
 			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
 			PatientId:               advice.PatientId,
-			Ctime:                   time.Now().Unix(),
+			Ctime:                   advice.RecordDate,
 			Mtime:                   time.Now().Unix(),
 			Status:                  1,
 			RecordTime:              advice.RecordDate,
@@ -1952,7 +1955,8 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
 			WarehouseOutId:          warehouseout.ID,
 			Status:                  1,
-			Ctime:                   time.Now().Unix(),
+			Ctime:                   advice.RecordDate,
+			Mtime:                   time.Now().Unix(),
 			Remark:                  warehouse.Remark,
 			OrgId:                   orgID,
 			Type:                    1,
@@ -2035,7 +2039,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			WarehouseOutId:          warehouseout.ID,
 			WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
 			PatientId:               advice.PatientId,
-			Ctime:                   time.Now().Unix(),
+			Ctime:                   advice.AdviceDate,
 			Mtime:                   time.Now().Unix(),
 			Status:                  1,
 			RecordTime:              advice.RecordDate,
@@ -2117,7 +2121,8 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 				Count:                   stock_number,
 				Price:                   warehouse.RetailPrice,
 				Status:                  1,
-				Ctime:                   time.Now().Unix(),
+				Ctime:                   advice.AdviceDate,
+				Mtime:                   time.Now().Unix(),
 				UserOrgId:               orgID,
 				Manufacturer:            warehouse.Manufacturer,
 				Dealer:                  warehouse.Dealer,
@@ -2198,7 +2203,8 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 				DrugId:           advice.DrugId,
 				Count:            (out_count - cancel_count) - deliver_number,
 				Status:           1,
-				Ctime:            ctime,
+				Ctime:            advice.AdviceDate,
+				Mtime:            time.Now().Unix(),
 				OrgId:            advice.UserOrgId,
 				Type:             1,
 				Manufacturer:     manufactureName.ManufacturerName,
@@ -2256,8 +2262,8 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 				Creator:                 advice.ExecutionStaff,
 				UpdateCreator:           0,
 				Status:                  1,
-				Ctime:                   time.Now().Unix(),
-				Mtime:                   0,
+				Ctime:                   advice.AdviceDate,
+				Mtime:                   time.Now().Unix(),
 				Price:                   warehouse.RetailPrice,
 				WarehousingDetailId:     warehouse.ID,
 				WarehouseOutDetailId:    0,

service/sign_service.go

@@ -477,59 +477,151 @@ func AddContractSignatory(contractId string, signers string, contract models.New
 
 	serviceCode := beego.AppConfig.String("serviceCode")
 
+	signFiles := make(map[string]interface{})
+
+	signFiles["docId"] = "156002172264252636"
+
+	inputDataArr := make([]map[string]interface{}, 0)
+
+	for _, item := range signFiles {
+		fmt.Println("item", item)
+		xySignControls := make(map[string]interface{})
+		xySignControls["key"] = "1"
+		xySignControls["type"] = "autograph"
+		xySignControls["pageNum"] = 1
+		xySignControls["positionX"] = 100
+		xySignControls["positionY"] = 100
+		inputDataArr = append(inputDataArr, xySignControls)
+	}
+	inputDataArrTwo := make([]map[string]interface{}, 0)
+	for _, item := range signFiles {
+		fmt.Println(item)
+		keywordSignControls := make(map[string]interface{})
+		keywordSignControls["key"] = "2"
+		keywordSignControls["type"] = "autograph"
+		keywordSignControls["pageNum"] = 1
+		keywordSignControls["keyword"] = "盖章"
+		keywordSignControls["offsetX"] = 100
+		keywordSignControls["offsetY"] = 100
+		inputDataArrTwo = append(inputDataArrTwo, keywordSignControls)
+	}
+	signFiles["xySignControls"] = inputDataArr
+	signFiles["keywordSignControls"] = inputDataArrTwo
+	inputDataArrThree := make([]map[string]interface{}, 0)
+	inputDataArrThree = append(inputDataArrThree, signFiles)
+
+	signersFiles := make(map[string]interface{})
+
+	signersFiles["userId"] = "DCBCD8QR2TU6B83XFF3FOHJL"
+	signersFiles["signerType"] = "1"
+	signersFiles["enterpriseId"] = "BRWAABXW3RUD4PGCYEQWRRK8"
+	signersFiles["sequence"] = "8"
+	signersFiles["sendMsg"] = false
+	signersFiles["signFiles"] = inputDataArrThree
+
+	inputDataArrFour := make([]map[string]interface{}, 0)
+
+	inputDataArrFour = append(inputDataArrFour, signersFiles)
+
 	maprequest := make(map[string]interface{})
+	maprequest["contractId"] = "156002172264252635"
+	maprequest["signers"] = inputDataArrFour
 
-	maprequest["contractId"] = "153497878806048027"
+	byterequest, _ := json.Marshal(maprequest)
+	reader := bytes.NewReader(byterequest)
 
-	maprequestOne := make(map[string]interface{})
+	signatureStr, _ := generateHMACSHA1SignatureOne(maprequest, serviceKye, serviceCode)
 
-	maprequestTwo := make(map[string]interface{})
+	request, err := http.NewRequest("POST", url, reader)
+	if err != nil {
+		fmt.Println(err.Error())
+	}
 
-	var signFiles models.SignFiles
-	signFiles.DocId = 343465645
+	request.Header.Set("appId", appId)
+	request.Header.Set("serviceCode", serviceCode)
+	request.Header.Set("Content-Type", "application/json;charset=UTF-8")
+	request.Header.Set("Content-Signature", signatureStr)
+	client := http.Client{}
 
-	inputDataArrOne := make([]map[string]interface{}, 0)
-	inputDataArrTwo := make([]map[string]interface{}, 0)
-	for _, item := range signFiles.XySignControls {
+	resp, err := client.Do(request)
+	if err != nil {
+		fmt.Println(err.Error())
 
-		inputDataThree := make(map[string]interface{})
-		inputDataThree["key"] = item.Key
-		inputDataThree["type"] = item.Type
-		inputDataThree["pageNum"] = item.PageNum
-		inputDataThree["positionX"] = item.PositionX
-		inputDataThree["positionY"] = item.PositionY
+	}
+	respBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		fmt.Println(err.Error())
+
+	}
+	str := string(respBytes)
+
+	return str
+}
+
+func CreateBackStageSign(contractId string, signers string) string {
+
+	var url string
+
+	url = "http://demo.itruscloud.com/apigate/contractpaasapi/contract/signByFile"
+	appId := beego.AppConfig.String("sign_appid")
+
+	serviceKye := beego.AppConfig.String("serviceKye")
 
-		inputDataArrOne = append(inputDataArrOne, inputDataThree)
+	serviceCode := beego.AppConfig.String("serviceCode")
+
+	sealTimestampFiles := make(map[string]interface{})
+	fontsFiles := make(map[string]interface{})
+	inputDataArr := make([]map[string]interface{}, 0)
+	signFiles := make(map[string]interface{})
+	signFiles["docId"] = "156002172264252636"
+
+	for _, item := range sealTimestampFiles {
+		fmt.Println(item)
+		keywordSignControls := make(map[string]interface{})
+		keywordSignControls["controlsKey"] = "2"
+		keywordSignControls["pattern"] = "1"
+		keywordSignControls["color"] = "#FF0000"
+		inputDataArr = append(inputDataArr, keywordSignControls)
 	}
 
-	for _, item := range signFiles.KeywordSignControls {
-		inputDataFour := make(map[string]interface{})
-		inputDataFour["key"] = item.Key
-		inputDataFour["type"] = item.Type
-		inputDataFour["pageNum"] = item.PageNum
-		inputDataFour["keyword"] = item.KeyWord
-		inputDataFour["positionX"] = item.PositionX
-		inputDataFour["positionY"] = item.PositionY
+	sealTimestampFiles["allAddTimestamp"] = false
+	sealTimestampFiles["someTimestampStyle"] = inputDataArr
 
-		inputDataArrTwo = append(inputDataArrTwo, inputDataFour)
+	inputDataArrOne := make([]map[string]interface{}, 0)
+	for _, item := range fontsFiles {
+		fmt.Println("item", item)
+		keySignControls := make(map[string]interface{})
+		keySignControls["controlsKey"] = "1"
+		keySignControls["fontType"] = 1
+		keySignControls["fontSize"] = 8.5
+		keySignControls["fontColor"] = "#56600F"
+		keySignControls["alignment"] = 1
+		inputDataArrOne = append(inputDataArrOne, keySignControls)
 	}
 
-	maprequestTwo["xySignControls"] = inputDataArrOne
-	maprequestTwo["keywordSignControls"] = inputDataArrTwo
-	maprequestTwo["docId"] = 1234555
+	fontsFiles["fonts"] = inputDataArrOne
 
-	maprequestOne["userId"] = ""
-	maprequestOne["signerType"] = ""
-	maprequestOne["enterpriseId"] = ""
-	maprequestOne["sequence"] = ""
-	maprequestOne["sendMsg"] = false
-	maprequestOne["signFiles"] = maprequestTwo
+	signFiles["fonts"] = fontsFiles
+	signFiles["showTimestamp"] = false
+	signFiles["sealTimestamp"] = sealTimestampFiles
+	signControl := make(map[string]interface{})
+	signControl["1"] = "234535"
+	signFiles["signControl"] = signControl
 
-	maprequestOne["signers"] = maprequestOne
+	inputDataArrThree := make([]map[string]interface{}, 0)
+	inputDataArrThree = append(inputDataArrThree, signFiles)
 
-	maprequest["contractId"] = contract.ContractId
+	signer := make(map[string]interface{})
 
-	maprequest["signers"] = maprequestOne
+	signer["signerId"] = ""
+	signer["isUserWishes"] = true
+	signer["userWishesWay"] = 1
+	signer["codeNumber"] = "1004"
+	signer["verifyCode"] = "13006"
+	signer["signFiles"] = inputDataArrThree
+	maprequest := make(map[string]interface{})
+	maprequest["contractId"] = "156002172264252635"
+	maprequest["signer"] = signer
 
 	byterequest, _ := json.Marshal(maprequest)
 	reader := bytes.NewReader(byterequest)
@@ -561,17 +653,3 @@ func AddContractSignatory(contractId string, signers string, contract models.New
 
 	return str
 }
-
-func GetHisDoctorAdviceInfoList(user_org_id int64) (advice []*models.XtDrugWarehouseInfo, err error) {
-
-	err = XTReadDB().Where("status= 1 and is_check= 1").Find(&advice).Error
-
-	return advice, err
-}
-
-func UpdatePatietPrice(id int64, retail_price float64) (models.DrugFlow, error) {
-
-	flow := models.DrugFlow{}
-	err := XTWriteDB().Model(&flow).Where("warehousing_detail_id = ? and status=1", id).Updates(map[string]interface{}{"price": retail_price}).Error
-	return flow, err
-}

service/warhouse_service.go

@@ -1488,7 +1488,8 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 			WarehouseOutId:          warehouseOut.ID,
 			WarehouseInfotId:        warehouse.ID,
 			Status:                  1,
-			Ctime:                   time.Now().Unix(),
+			Ctime:                   record_time,
+			Mtime:                   time.Now().Unix(),
 			Remark:                  warehouse.Remark,
 			OrgId:                   orgID,
 			Type:                    1,
@@ -1525,7 +1526,7 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 			WarehouseOutId:          warehouseOutInfo.ID,
 			WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
 			PatientId:               patient_id,
-			Ctime:                   time.Now().Unix(),
+			Ctime:                   record_time,
 			Mtime:                   time.Now().Unix(),
 			Status:                  1,
 			RecordTime:              record_time,
@@ -1554,7 +1555,8 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				Count:                   deliver_number,
 				Price:                   warehouse.PackingPrice,
 				Status:                  1,
-				Ctime:                   time.Now().Unix(),
+				Ctime:                   record_time,
+				Mtime:                   time.Now().Unix(),
 				UserOrgId:               orgID,
 				Manufacturer:            warehouse.Manufacturer,
 				Dealer:                  warehouse.Dealer,
@@ -1595,7 +1597,8 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 					Count:                   exsit.Count + goods.Count,
 					Price:                   warehouse.PackingPrice,
 					Status:                  1,
-					Ctime:                   time.Now().Unix(),
+					Ctime:                   record_time,
+					Mtime:                   time.Now().Unix(),
 					UserOrgId:               orgID,
 					Manufacturer:            warehouse.Manufacturer,
 					Dealer:                  warehouse.Dealer,
@@ -1631,7 +1634,8 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				Count:                   deliver_number,
 				Price:                   warehouse.PackingPrice,
 				Status:                  1,
-				Ctime:                   time.Now().Unix(),
+				Ctime:                   record_time,
+				Mtime:                   time.Now().Unix(),
 				UserOrgId:               orgID,
 				Manufacturer:            warehouse.Manufacturer,
 				Dealer:                  warehouse.Dealer,
@@ -1669,7 +1673,8 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 					Count:                   exsit.Count + goods.Count,
 					Price:                   warehouse.PackingPrice,
 					Status:                  1,
-					Ctime:                   time.Now().Unix(),
+					Ctime:                   record_time,
+					Mtime:                   time.Now().Unix(),
 					UserOrgId:               orgID,
 					Manufacturer:            warehouse.Manufacturer,
 					Dealer:                  warehouse.Dealer,
@@ -1715,7 +1720,8 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 			WarehouseOutId:          warehouseOut.ID,
 			WarehouseInfotId:        warehouse.ID,
 			Status:                  1,
-			Ctime:                   time.Now().Unix(),
+			Ctime:                   record_time,
+			Mtime:                   time.Now().Unix(),
 			Remark:                  warehouse.Remark,
 			OrgId:                   orgID,
 			Type:                    1,
@@ -1757,7 +1763,8 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				Count:                   stock_number,
 				Price:                   warehouse.PackingPrice,
 				Status:                  1,
-				Ctime:                   time.Now().Unix(),
+				Ctime:                   record_time,
+				Mtime:                   time.Now().Unix(),
 				UserOrgId:               orgID,
 				Manufacturer:            warehouse.Manufacturer,
 				Dealer:                  warehouse.Dealer,
@@ -1793,7 +1800,8 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 					Count:                   exsit.Count + goods.Count,
 					Price:                   warehouse.PackingPrice,
 					Status:                  1,
-					Ctime:                   time.Now().Unix(),
+					Ctime:                   record_time,
+					Mtime:                   time.Now().Unix(),
 					UserOrgId:               orgID,
 					Manufacturer:            warehouse.Manufacturer,
 					Dealer:                  warehouse.Dealer,
@@ -1835,7 +1843,8 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 				Count:                   stock_number,
 				Price:                   warehouse.PackingPrice,
 				Status:                  1,
-				Ctime:                   time.Now().Unix(),
+				Ctime:                   record_time,
+				Mtime:                   time.Now().Unix(),
 				UserOrgId:               orgID,
 				Manufacturer:            warehouse.Manufacturer,
 				Dealer:                  warehouse.Dealer,
@@ -1871,7 +1880,8 @@ func ConsumablesDelivery(orgID int64, patient_id int64, record_time int64, goods
 					Count:                   exsit.Count + goods.Count,
 					Price:                   warehouse.PackingPrice,
 					Status:                  1,
-					Ctime:                   time.Now().Unix(),
+					Ctime:                   record_time,
+					Mtime:                   time.Now().Unix(),
 					UserOrgId:               orgID,
 					Manufacturer:            warehouse.Manufacturer,
 					Dealer:                  warehouse.Dealer,
@@ -1941,7 +1951,8 @@ func ConsumablesDeliveryDelete(orgID int64, patient_id int64, record_time int64,
 			WarehouseOutId:          warehouseOut.ID,
 			//WarehouseInfoId:		 warehouse.ID,
 			Status:        1,
-			Ctime:         time.Now().Unix(),
+			Ctime:         record_time,
+			Mtime:         time.Now().Unix(),
 			Remark:        "",
 			OrgId:         orgID,
 			Type:          1,
@@ -1966,7 +1977,7 @@ func ConsumablesDeliveryDelete(orgID int64, patient_id int64, record_time int64,
 				WarehouseOutId:          warehouseOutInfo.ID,
 				WarehouseOutOrderNumber: warehouseOutInfo.WarehouseOutOrderNumber,
 				PatientId:               patient_id,
-				Ctime:                   time.Now().Unix(),
+				Ctime:                   record_time,
 				Mtime:                   time.Now().Unix(),
 				Status:                  1,
 				RecordTime:              record_time,
@@ -2035,7 +2046,8 @@ func ConsumablesDeliveryDelete(orgID int64, patient_id int64, record_time int64,
 			Total:           0,
 			ProductDate:     ware.ProductDate,
 			ExpiryDate:      ware.ExpiryDate,
-			Ctime:           time.Now().Unix(),
+			Ctime:           record_time,
+			Mtime:           time.Now().Unix(),
 			Status:          1,
 			OrgId:           good_yc.UserOrgId,
 			OrderNumber:     cancel.OrderNumber,
@@ -2081,8 +2093,8 @@ func ConsumablesDeliveryDelete(orgID int64, patient_id int64, record_time int64,
 			Creator:                 warehouseOut.Creater,
 			UpdateCreator:           0,
 			Status:                  1,
-			Ctime:                   time.Now().Unix(),
-			Mtime:                   0,
+			Ctime:                   record_time,
+			Mtime:                   time.Now().Unix(),
 			Price:                   ware.Price,
 			WarehousingDetailId:     ware.WarehouseInfotId,
 			WarehouseOutDetailId:    ware.ID,
@@ -5522,8 +5534,8 @@ func ConsumablesDeliveryThirty(orgID int64, record_time int64, goods *models.War
 			Creator:                 creator,
 			UpdateCreator:           0,
 			Status:                  1,
-			Ctime:                   time.Now().Unix(),
-			Mtime:                   0,
+			Ctime:                   record_time,
+			Mtime:                   time.Now().Unix(),
 			Price:                   warehouse.PackingPrice, //零售价
 			WarehousingDetailId:     warehouse.ID,
 			WarehouseOutDetailId:    goods.ID,
@@ -5670,8 +5682,8 @@ func ConsumablesDeliveryThirty(orgID int64, record_time int64, goods *models.War
 			Creator:                 creator,
 			UpdateCreator:           0,
 			Status:                  1,
-			Ctime:                   time.Now().Unix(),
-			Mtime:                   0,
+			Ctime:                   record_time,
+			Mtime:                   time.Now().Unix(),
 			Price:                   warehouse.PackingPrice, //零售价
 			WarehousingDetailId:     warehouse.ID,
 			WarehouseOutDetailId:    goods.ID,
@@ -5755,8 +5767,6 @@ func ConsumablesDeliveryThirty(orgID int64, record_time int64, goods *models.War
 // 药品手动出库 递归方式
 func AutoDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, warehouseout *models.DrugWarehouseOut, drup *models.BaseDrugLib, advice *models.DrugWarehouseOutInfo) (err error) {
 
-	fmt.Println("出库数量", prescribingNumber)
-
 	// 判断处方里药品单位是拆零单位还是包装单位,	如果是包装单位，则根据规格，将包装数量转为拆零数量
 	var deliver_number int64 = 0
 	var stock_number int64 = 0
@@ -5917,7 +5927,8 @@ func AutoDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, warehous
 			Count:                   deliver_number,
 			Price:                   warehouse.RetailPrice,
 			Status:                  1,
-			Ctime:                   time.Now().Unix(),
+			Ctime:                   advice.SysRecordTime,
+			Mtime:                   time.Now().Unix(),
 			UserOrgId:               advice.OrgId,
 			Manufacturer:            advice.Manufacturer,
 			Dealer:                  advice.Dealer,
@@ -5985,7 +5996,8 @@ func AutoDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, warehous
 			Count:                   stock_number,
 			Price:                   warehouse.RetailPrice,
 			Status:                  1,
-			Ctime:                   time.Now().Unix(),
+			Ctime:                   advice.SysRecordTime,
+			Mtime:                   time.Now().Unix(),
 			UserOrgId:               advice.OrgId,
 			Manufacturer:            advice.Manufacturer,
 			Dealer:                  advice.Dealer,