From 2acc93755ddc56beb46e08b655ec9d94968d829f Mon Sep 17 00:00:00 2001
From: 杨张扬 <634643841@qq.com>
Date: 星期二, 03 六月 2025 17:21:43 +0800
Subject: [PATCH] 满托下线PDA呼叫，容器ID需转换成ASCII字符串
---
api/ApiHelper.cs | 56 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 37 insertions(+), 19 deletions(-)
diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index 9b86ead..e8a32c6 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -235,7 +235,8 @@
CARCODE = cG_Detail.S_CAR_CODE,
WEIGHT = cG_Detail.F_QTY,
REMELTTIME = DateTime.Now,
- TASKNO = taskNo
+ TASKNO = taskNo,
+ SHIFT = model.shift,
};
SpecHelper.InsertRemeltDetail(target);
}
@@ -254,7 +255,7 @@
ITEMSTATE = cG_Detail.S_ITEM_STATE,
ITEMCODE = cG_Detail.S_ITEM_CODE,
LOGINNAME = model.staff,
- SHIFT = "None",
+ SHIFT = model.shift,
};
SpecHelper.InsertInventoryM(target);
}
@@ -275,7 +276,7 @@
catch (Exception ex)
{
result.resultCode = -1;
- result.resultMsg = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
+ result.resultMsg = $"PDA婊℃墭澶嶆鍒ゆ柇锛屽彂鐢熶簡寮傚父锛歿ex.Message}";
LogHelper.Info(result.resultMsg);
return result;
}
@@ -413,7 +414,8 @@
SPEC = cgInfo.S_SPE,
CARCODE = cgInfo.S_CAR_CODE,
WEIGHT = cgInfo.F_QTY,
- REMELTTIME = DateTime.Now
+ REMELTTIME = DateTime.Now,
+ SHIFT = model.shift,
};
SpecHelper.InsertRemeltDetail(target);
});
@@ -464,7 +466,7 @@
var allCount = allCg.Count;
var waittime = SpecHelper.GetExportTime(model.Spe);
- var okCount = allCg.Count(o => o.N_ITEM_STATE == 0 && o.S_ITEM_STATE == "鍚堟牸" && o.T_MODIFY.AddMinutes(waittime) <= System.DateTime.Now);
+ var okCount = allCg.Count(o => o.N_ITEM_STATE == 0 && o.S_ITEM_STATE == "鍚堟牸" && o.T_MODIFY.AddHours(waittime) <= System.DateTime.Now);
return $"婊¤冻{model.Spe}瑙勬牸鐨勬�鎵樼洏鏁伴噺锛歿allCount}锛屽叾涓悎鏍间笖闈欑疆鏃堕棿宸茶繃鐨勬墭鐩樻暟閲忥細{okCount}";
}
catch (Exception ex)
@@ -636,6 +638,16 @@
LogHelper.Info("瑙﹀彂API锛歅DA婊℃墭涓嬬嚎鍏ュ簱" + JsonConvert.SerializeObject(model), "API");
try
{
+ if( model.RfId.Length < 16)
+ {
+ result.resultCode = 1;
+ result.resultMsg = $"杈撳叆鐨凴FID锛岄暱搴︿笉澶燂紝瑕佸ぇ浜�6浣�;
+ LogHelper.Info(result.resultMsg);
+ return result;
+ }
+
+ model.RfId = WMSHelper.ConvertHexToAscii(model.RfId);
+
//璇ヤ骇绾跨殑婊℃墭涓嬬嚎浣嶇疆锛岃捣鐐� var startPoint = Settings.ProductionLines.FirstOrDefault(a => a.PointOut == model.StartLoc);
if (startPoint != null)//璧风偣瀛樺湪
@@ -775,7 +787,7 @@
WEIGHT = modelWeight,
ITEMSTATE = "寰呮",
LOGINNAME = model.staff,
- SHIFT = "None",
+ SHIFT = model.shift,
STARTLOC = startLoc.S_CODE,
};
SpecHelper.InsertEquipProDetail(target);
@@ -791,7 +803,7 @@
WEIGHT = modelWeight,
ITEMSTATE = "寰呮",
LOGINNAME = model.staff,
- SHIFT = "None",
+ SHIFT = model.shift,
};
SpecHelper.InsertInventoryM(target);
});
@@ -820,7 +832,7 @@
}
else
{
- result.resultCode = 9;
+ result.resultCode = 12;
result.resultMsg = $"姝や綅缃細{startPoint.PointOut}宸查攣浣�;
LogHelper.Info(result.resultMsg);
return result;
@@ -1026,6 +1038,7 @@
WEIGHT = cgInfo.F_QTY,
SPEC = model.Spe,
TASKNO = taskNo,
+ SHIFT = model.shift,
};
SpecHelper.InsertComponentDetail(target);
});
@@ -1277,7 +1290,8 @@
CARCODE = cG_Detail.S_CAR_CODE,
WEIGHT = cG_Detail.F_QTY,
REMELTTIME = DateTime.Now,
- TASKNO = taksNo
+ TASKNO = taksNo,
+ SHIFT = model.shift,
};
SpecHelper.InsertSurplusDetail(target);
});
@@ -1293,7 +1307,7 @@
ITEMSTATE = cG_Detail.S_ITEM_STATE,
ITEMCODE = cG_Detail.S_ITEM_CODE,
LOGINNAME = model.staff,
- SHIFT = "None",
+ SHIFT = model.shift,
};
SpecHelper.InsertInventoryM(target);
});
@@ -1677,7 +1691,8 @@
SPEC = cG_old_Detail.S_SPE,
CARCODE = cG_old_Detail.S_CAR_CODE,
WEIGHT = cG_old_Detail.F_QTY,
- REMELTTIME = DateTime.Now
+ REMELTTIME = DateTime.Now,
+ SHIFT = model.shift,
};
SpecHelper.InsertRemeltDetail(target);
}
@@ -1693,7 +1708,8 @@
SPEC = cG_new_Detail_Ins.S_SPE,
CARCODE = cG_new_Detail_Ins.S_CAR_CODE,
WEIGHT = cG_new_Detail_Ins.F_QTY,
- REMELTTIME = DateTime.Now
+ REMELTTIME = DateTime.Now,
+ SHIFT = model.shift,
};
SpecHelper.InsertRemeltDetail(target);
}
@@ -1712,7 +1728,7 @@
ITEMSTATE = cG_old_Detail.S_ITEM_STATE,
ITEMCODE = cG_old_Detail.S_ITEM_CODE,
LOGINNAME = model.staff,
- SHIFT = "None",
+ SHIFT = model.shift,
};
SpecHelper.InsertInventoryM(target);
}
@@ -1727,7 +1743,7 @@
ITEMSTATE = cG_new_Detail_Ins.S_ITEM_STATE,
ITEMCODE = cG_new_Detail_Ins.S_ITEM_CODE,
LOGINNAME = model.staff,
- SHIFT = "None",
+ SHIFT = model.shift,
};
SpecHelper.InsertInventoryM(target);
}
@@ -1801,10 +1817,12 @@
if (startLocCnt == null)
{
- result.resultCode = 3;
- result.resultMsg = $"璧峰浣嶇疆{model.startLoc}鏈粦瀹氬鍣�;
- LogHelper.Info(result.resultMsg);
- return result;
+ startLocCnt = new TN_Loc_Container()
+ {
+ S_LOC_CODE = model.startLoc,
+ S_CNTR_CODE = Guid.NewGuid().ToString("D"),
+ };
+ db.Insertable<TN_Loc_Container>(startLocCnt).ExecuteCommand();
}
//鍒涘缓鐐瑰鐐逛换鍔�@@ -1833,7 +1851,7 @@
ITEMSTATE = cginfo.S_ITEM_STATE,
ITEMCODE = cginfo.S_ITEM_CODE,
LOGINNAME = model.staff,
- SHIFT = "None",
+ SHIFT = model.shift,
};
SpecHelper.InsertInventoryM(target);
}
--
Gitblit v1.9.1