fix：确认出库产品列表添加日期

conf/app_prod.conf

@@ -11,7 +11,7 @@ NatsServer_Url = "127.0.0.1:4223"
 NatsSubj_Prefix = ""
 
 # Mysql 线上
-MysqlServer_UrlPort = "127.0.0.1:3316"
+MysqlServer_UrlPort = "36.137.156.216:3306"
 MysqlServer_Database = "erp_storage"
 MysqlServer_Username = "erp_storage"
 MysqlServer_Password = "cHFeFmxFhZJdijDn"
@@ -20,7 +20,7 @@ MysqlServer_MaxOpenConnections = 200
 
 
 # Mysql Mqtt
-MysqlMqtt_UrlPort = "127.0.0.1:40306"
+MysqlMqtt_UrlPort = "192.168.0.88:3306"
 MysqlMqtt_Database = "mqtt"
 MysqlMqtt_Username = "mqtt"
 MysqlMqtt_Password = "UQ7sPD8YZwCF2Zg!"

conf/app_test.conf

@@ -20,10 +20,10 @@ MysqlServer_MaxOpenConnections = 200
 
 
 # Mysql Mqtt
-MysqlMqtt_UrlPort = "203.34.49.130:3306"
+MysqlMqtt_UrlPort = "192.168.0.88:3306"
 MysqlMqtt_Database = "mqtt"
-MysqlMqtt_Username = "root"
-MysqlMqtt_Password = "yjwyEckZS7rE5H"
+MysqlMqtt_Username = "cold"
+MysqlMqtt_Password = "yjwyEckZS7rE5H!"
 MysqlMqtt_MaxIdleConnections = 100
 MysqlMqtt_MaxOpenConnections = 200
 
@@ -33,13 +33,15 @@ Redis_password = ""
 Redis_dbNum = "2"
 
 FilterExcludeURL = "/Percentage/SyncVerify"
-FilterOnlyLoginCheckURL =
+FilterOnlyLoginCheckURL = "/validationTool/transfer"
 
 # 消息通知前端页面跳转url
 ContractApprovalUrl = "/contract"
 VerifyContractUrl = "/contract"
 PercentageApprovalUrl = "/percentage"
 ContractReviewAuditUrl = "/contractReviewList"
+PurchaseAuditUrl = "/purchase"
+MyPurchaseNewsUrl = "/myPurchase"
 # 财务uuid
 FinanceUuid = "NeGSMvREXA8xDZWo6q1YjLHTm0dJg7zc"
 

controllers/Percentage.go

@@ -1061,10 +1061,11 @@ func Cron_SyncColdVerifyCompany() {
 	signature, timestamp := lib.GenColdVerifySignature()
 	client := resty.New()
 	resp, err := client.R().SetFormData(map[string]string{
-		"CreateDate":      "",
-		"X-API-KEY":       lib.ColdVerify_OpenApi_Key,
-		"X-API-SIGNATURE": signature,
-		"X-API-TIMESTAMP": timestamp,
+		"T_reporting_pass_start_time": "",
+		"T_reporting_pass_end_time":   "",
+		"X-API-KEY":                   lib.ColdVerify_OpenApi_Key,
+		"X-API-SIGNATURE":             signature,
+		"X-API-TIMESTAMP":             timestamp,
 	}).Post(conf.ColdVerify_OpenApi_Host + url)
 
 	if err != nil {
@@ -1109,17 +1110,20 @@ func SyncVerifyPercentage(isCron bool) {
 	url := "/openapi/task/list"
 	signature, timestamp := lib.GenColdVerifySignature()
 	client := resty.New()
-	var createDate string
+	var start_time, end_time string
 	if isCron {
-		createDate = time.Now().Add(-time.Hour * 24).Format("2006-01-02")
+		t := time.Now().Add(-time.Hour * 24).Format("2006-01-02")
+		start_time = t + " 00:00:00"
+		end_time = t + " 23:59:59"
 	}
 	client.SetTimeout(30 * time.Second)
 	client.SetRetryCount(3).SetRetryWaitTime(1 * time.Second)
 	resp, err := client.R().SetFormData(map[string]string{
-		"CreateDate":      createDate,
-		"X-API-KEY":       lib.ColdVerify_OpenApi_Key,
-		"X-API-SIGNATURE": signature,
-		"X-API-TIMESTAMP": timestamp,
+		"T_reporting_pass_start_time": start_time,
+		"T_reporting_pass_end_time":   end_time,
+		"X-API-KEY":                   lib.ColdVerify_OpenApi_Key,
+		"X-API-SIGNATURE":             signature,
+		"X-API-TIMESTAMP":             timestamp,
 	}).Post(conf.ColdVerify_OpenApi_Host + url)
 
 	if err != nil {
@@ -1190,7 +1194,7 @@ func SyncVerifyPercentage(isCron bool) {
 				T_device_quantity:     task.T_device_quantity,
 				T_company_uuid:        task.T_uuid,
 				T_task_name:           task.T_name,
-				T_uuid:                coldVerifyUUIDMap[task.T_delivery],
+				T_uuid:                coldVerifyUUIDMap[task.T_collection],
 				T_money:               verifyItem.T_price,
 				T_type:                Percentage.SchemeType,
 				T_State:               1,

controllers/Stock.go

@@ -3401,7 +3401,7 @@ func (c *StockController) StockOut_Apply() {
 			c.ServeJSON()
 			return
 		}
-		// 3、更新产品库存列表
+		// 3、增加占用库存
 		_, err = StockDao.AddOrUpdate_Occupy_Stock(T_depot_id, product.Id, product.T_class, product.T_name, product.T_model, num, 2)
 		if err != nil {
 			o.Rollback()
@@ -3447,6 +3447,12 @@ func (c *StockController) StockOut_Apply_Edit() {
 		c.ServeJSON()
 		return
 	}
+	if StockOut.T_state == Stock.StockOutAlreadyOut {
+		o.Rollback()
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "当前出库单已出库，不能修改!"}
+		c.ServeJSON()
+		return
+	}
 	// 查询入库产品信息
 	productOldList := StockOutProductDao.Read_StockOutProduct_List(StockOut.T_number)
 
@@ -3941,7 +3947,7 @@ func (c *StockController) StockOut_Warehouse() {
 			T_product_id:  product_id,
 			T_depot_id:    StockOut.T_depot_id,
 			T_num:         num,    // 出库数量
-			T_date:        T_date, // 出库数量
+			T_date:        T_date, // 出库日期
 			T_relation_sn: T_relation_sn,
 			T_state:       1,
 		}

main.go

@@ -70,7 +70,8 @@ func main() {
 	//go controllers.Cron_Device_Add()      // 重写设备表 只执行一次
 	go controllers.CheckPowerUniformity() // 检查角色是否与用户系统一致，不存在则添加
 	//go controllers.Cron_StockMonth_Add()  // 统计库存明细，测试使用
-	go controllers.Cron_Percentage() // 同步冷链验证公司，每日执行一次
+	go controllers.Cron_Percentage() // 同步冷链验证公司及提成，每日执行一次
+
 	beego.Run()
 
 }

models/Stock/Stock.go

@@ -4,13 +4,15 @@ import (
 	"ERP_storage/models/Basic"
 	"errors"
 	"fmt"
-	orm2 "github.com/beego/beego/v2/client/orm"
-	"gogs.baozhida.cn/zoie/ERP_libs/lib"
 	"strconv"
 	"sync"
 	"time"
 
+	orm2 "github.com/beego/beego/v2/client/orm"
+	"gogs.baozhida.cn/zoie/ERP_libs/lib"
+
 	"ERP_storage/logs"
+
 	_ "github.com/astaxie/beego/cache/redis"
 	"github.com/beego/beego/v2/adapter/orm"
 	_ "github.com/go-sql-driver/mysql"
@@ -169,16 +171,16 @@ func (dao *StockDaoImpl) AddOrUpdate_Occupy_Stock(T_depot_id, T_product_id, T_pr
 		logs.Error(lib.FuncName(), err)
 		return
 	}
-	// T_type 1-审核不通过 2-其他状态
-	if T_type == 1 {
-		stock.T_occupy -= T_num
-	}
+
 	if stock.T_reality-stock.T_occupy-T_num < 0 {
 		err = errors.New(fmt.Sprintf("%s%s库存不足", T_product_name, T_product_model))
 		logs.Error(lib.FuncName(), err.Error())
 		return
 	}
-
+	// T_type 1-审核不通过/出库 2-其他状态
+	if T_type == 1 {
+		stock.T_occupy -= T_num
+	}
 	if T_type == 2 {
 		stock.T_occupy += T_num
 	}

models/Stock/StockOutProduct.go

@@ -180,8 +180,9 @@ func (dao *StockOutProductDaoImpl) Update_StockOutProduct(r StockOutProduct) err
 	product.T_num = r.T_num
 	product.T_relation_sn = r.T_relation_sn
 	product.T_state = r.T_state
+	product.T_date = r.T_date
 
-	_, err = dao.orm.Update(&product, "T_depot_id", "T_num", "T_relation_sn", "T_state")
+	_, err = dao.orm.Update(&product, "T_depot_id", "T_num", "T_relation_sn", "T_state", "T_date")
 	if err != nil {
 		logs.Error(lib.FuncName(), err)
 		return err