From 7a3f33acdb9057a61699fa2043ed47b7cb0e35cb Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期二, 29 七月 2025 17:31:10 +0800
Subject: [PATCH] 111
---
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ApiHelper.cs | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ApiHelper.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ApiHelper.cs
index aa44d84..fc28598 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ApiHelper.cs
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ApiHelper.cs
@@ -455,7 +455,7 @@
{
if (req.isSuccess)
{
- var timeCuo = MongoDBSingleton.Instance.FindOne<TimeCuoInfoCom>(Query.EQ("packingMachineNumber", models.machineNo), "TimeCuoInfoCom");
+ var timeCuo = MongoDBSingleton.Instance.FindOne<TimeCuoInfoCom>(Query.EQ("timeStampMES", req.data.mesCode), "TimeCuoInfoCom");
if (timeCuo == null)
{
MongoDBSingleton.Instance.Insert<TimeCuoInfoCom>(new TimeCuoInfoCom
@@ -487,11 +487,12 @@
//鍙樻洿娉ㄩ噴
totalNeedWeight = (int)req.data.FMustQty,
FEntryID_1 = 0,
+ orderCode = ""
});
}
else
{
- var query = Query.EQ("packingMachineNumber", models.machineNo);
+ var query = Query.EQ("timeStampMES", req.data.mesCode);
//鍙樻洿娉ㄩ噴
UpdateBuilder update = Update.Set("isFold", 1).Set("packingMachineNumber", models.machineNo).Set("needWeight", (int)req.data.FMustQty)
.Set("realWeight", (int)req.data.FMustQty).Set("totalWeight", (int)req.data.FMustQty).Set("batchNumber", req.data.Flot)
@@ -553,18 +554,17 @@
//涓婃姤鏉＄爜琛� CMMLog.Info($"INSERT INTO T_JY_BARCODESync (FBarCode, FBarCodeRule,FMaterialNumber,FCreateOrgNumber,FLot,FUnit,FQty,FStockNumber,FDept,FBillDate,F_JY_CZZ,FOpStatus) VALUES ('{req.data.barCode}','01','{req.data.materialName}','02','{req.data.Flot}','{req.data.FUnit}','{req.data.FMustQty}','CK020','BM000161','{req.data.ywDate}','{req.data.jycjj}','0')");
new SqlHelper<object>().ExecuteSql($" INSERT INTO T_JY_BARCODESync (FBarCode, FBarCodeRule,FMaterialNumber,FCreateOrgNumber,FLot,FUnit,FQty,FStockNumber,FDept,FBillDate,F_JY_CZZ,FOpStatus) VALUES ('{req.data.barCode}','01','{req.data.materialName}','02','{req.data.Flot}','{req.data.FUnit}','{req.data.FMustQty}','CK020','BM000161','{req.data.ywDate}','{req.data.jycjj}','0')", false);
- //var plc = Settings.GetPlcInfo().Where(b => b.location == models.machineNo && b.enable == 1).First();
- //if(plc != null)
- //{
- // var wirteall01 = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
- // {
- // addr = plc.writeAddr,
- // host = plc.ip,
- // port = plc.port,
- // data = 4
- // });
- //}
-
+ var plc = Settings.GetPlcInfo().Where(b => b.location == models.machineNo && b.enable == 1).First();
+ if(plc != null)
+ {
+ var wirteall01 = OITcpHelper.RegisterWriteOutPut(new OITcpHelper.RegisterWriteOutPutModel
+ {
+ addr = plc.writeAddr,
+ host = plc.ip,
+ port = plc.port,
+ data = 4
+ });
+ }
}
}
else CMMLog.Debug("鎵撳寘涓嬬嚎鍙ｆ帴椹充綅鐐逛綅鏈厤缃�);
@@ -580,7 +580,6 @@
{
result.errMsg = req.msg;
}
-
}
else
{
--
Gitblit v1.9.1