From 570a2d760cc1f2b78922d91d941ef81f01199e4c Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期二, 10 六月 2025 16:43:05 +0800
Subject: [PATCH] 完善ERP下发信息的处理和出库单生成流程
---
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/b2279396-cedf-4e13-9379-f9b937f2b7c7.vsidx | 0
/dev/null | 0
core/Monitor.cs | 31 ++--
config/config.json | 2
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/3051f4c7-a03d-4ed5-a59d-3d04bff3e616.vsidx | 0
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/c17e55d3-cccd-4fba-9a50-2551ca54ee71.vsidx | 0
models/TN_Task.cs | 4
core/WCSCore.cs | 3
models/TN_Outbound_Plan.cs | 106 +++++++-------
wms/WCSHelper.cs | 7
models/TN_Outbound_Detail.cs | 4
api/AgvController.cs | 1
api/ApiHelper.cs | 241 +++++++++++++++++----------------
models/TN_Record_Table.cs | 4
14 files changed, 214 insertions(+), 189 deletions(-)
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/3051f4c7-a03d-4ed5-a59d-3d04bff3e616.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/3051f4c7-a03d-4ed5-a59d-3d04bff3e616.vsidx
new file mode 100644
index 0000000..584b335
--- /dev/null
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/3051f4c7-a03d-4ed5-a59d-3d04bff3e616.vsidx
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/83dde277-5a65-4de9-9767-687a4e67f7ac.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/83dde277-5a65-4de9-9767-687a4e67f7ac.vsidx
deleted file mode 100644
index bc2eff9..0000000
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/83dde277-5a65-4de9-9767-687a4e67f7ac.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/b2279396-cedf-4e13-9379-f9b937f2b7c7.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/b2279396-cedf-4e13-9379-f9b937f2b7c7.vsidx
new file mode 100644
index 0000000..4539821
--- /dev/null
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/b2279396-cedf-4e13-9379-f9b937f2b7c7.vsidx
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/b390e7fe-a07b-4bb1-b189-3369e1fec281.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/b390e7fe-a07b-4bb1-b189-3369e1fec281.vsidx
deleted file mode 100644
index a3beb52..0000000
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/b390e7fe-a07b-4bb1-b189-3369e1fec281.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/bfedc8a7-5d30-4f46-ba09-dd908b77cc68.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/bfedc8a7-5d30-4f46-ba09-dd908b77cc68.vsidx
deleted file mode 100644
index f918d32..0000000
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/bfedc8a7-5d30-4f46-ba09-dd908b77cc68.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/c17e55d3-cccd-4fba-9a50-2551ca54ee71.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/c17e55d3-cccd-4fba-9a50-2551ca54ee71.vsidx
new file mode 100644
index 0000000..55abc90
--- /dev/null
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/c17e55d3-cccd-4fba-9a50-2551ca54ee71.vsidx
Binary files differ
diff --git a/api/AgvController.cs b/api/AgvController.cs
index 3966bd6..f2b6e1d 100644
--- a/api/AgvController.cs
+++ b/api/AgvController.cs
@@ -21,6 +21,7 @@
/// <returns></returns>
[HttpPost]
[Route("AGVCallbackState")]
+
public ReturnResult AGVCallbackState(AgvTaskState model)
{
LogHelper.Info("NDC HostToAGV 浠诲姟鐘舵�鍥炴姤锛� + JsonConvert.SerializeObject(model), "HosttoagvTask");
diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index 2bb2e4b..c415618 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -1200,9 +1200,9 @@
var taskName = TaskName.C鎴愬搧鑳跺嚭搴�
try {
- var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "ON");
+ var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "CKD");
- var cgDetailList = SelectCgByTotalQty(model);
+ var cgDetailList = SelectCgByTotalQty(model.Qty, model.ItemCode, model.BatchNo, model.CntrType, model.ForcedOut);
if (cgDetailList.Count == 0) {
info = "娌℃湁鍚堥�鐨勭墿鏂欏彲浠ュ嚭搴�;
@@ -1271,9 +1271,9 @@
var taskName = TaskName.C鎴愬搧鑳跺嚭搴�
try {
- var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "ON");
+ var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "CKD");
- var cgDetailList = SelectCgByTotalQty(model);
+ var cgDetailList = SelectCgByTotalQty(model.Qty, model.ItemCode, model.BatchNo, model.CntrType, model.ForcedOut);
if (cgDetailList.Count == 0) {
info = "娌℃湁鍚堥�鐨勭墿鏂欏彲浠ュ嚭搴�;
@@ -1331,14 +1331,14 @@
}
}
- public static List<TN_CG_Detail> SelectCgByTotalQty(FinishedOutboundInfo model) {
+ public static List<TN_CG_Detail> SelectCgByTotalQty(int qty, string itemCode, string batchNo, string cntrType = "", bool forcedOut = true) {
var db = new SqlHelper<object>().GetInstance();
var result = new List<TN_CG_Detail>();
- var targetNum = model.Qty;
+ var targetNum = qty;
var info = "";
try {
var targetCg = db.Queryable<TN_CG_Detail>()
- .Where(a => a.S_ITEM_CODE == model.ItemCode && a.S_BATCH_NO == model.BatchNo)
+ .Where(a => a.S_ITEM_CODE == itemCode && a.S_BATCH_NO == batchNo)
.Where(a => a.N_ITEM_NUM > targetNum)
.OrderBy(a => a.N_ITEM_NUM, OrderByType.Asc).First();
if (targetCg != null) //鍒氬ソ鏈変竴琛屾弧瓒虫潯浠�@@ -1351,10 +1351,18 @@
var sortedMaterials = new List<TN_CG_Detail>();
- if (model.ForcedOut) {
+ var cntrTypeList = new List<string>();
+ if (cntrType == "") {
+ cntrTypeList = new List<string> { "鎵樼洏", "濂借繍绠� }; // 涓嶆寚瀹氭墭鐩樼被鍨嬶紝浜岃�鍧囧彲
+ }
+ else {
+ cntrTypeList.Add(cntrType);
+ }
+
+ if (forcedOut) {
sortedMaterials = db.Queryable<TN_CG_Detail, TN_Loc_Container>((d, c) => d.S_CNTR_CODE == c.S_CNTR_CODE)
- .Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_BATCH_NO == model.BatchNo && d.N_ITEM_NUM > 0)
- .Where((d, c) => c.S_CNTR_TYPE == model.CntrType)
+ .Where(d => d.S_ITEM_CODE == itemCode && d.S_BATCH_NO == batchNo && d.N_ITEM_NUM > 0)
+ .Where((d, c) => cntrTypeList.Contains(c.S_CNTR_TYPE))
.Where(d => d.N_ITEM_STATE == 0 && d.S_ITEM_STATE == "鍚堟牸"
|| d.N_ITEM_STATE == 1 && d.S_ITEM_STATE == "寰呮")
.OrderBy(d => d.N_ITEM_NUM, OrderByType.Desc)
@@ -1362,13 +1370,12 @@
}
else {
sortedMaterials = db.Queryable<TN_CG_Detail, TN_Loc_Container>((d, c) => d.S_CNTR_CODE == c.S_CNTR_CODE)
- .Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_BATCH_NO == model.BatchNo && d.N_ITEM_NUM > 0)
- .Where((d, c) => c.S_CNTR_TYPE == model.CntrType)
+ .Where(d => d.S_ITEM_CODE == itemCode && d.S_BATCH_NO == batchNo && d.N_ITEM_NUM > 0)
+ .Where((d, c) => cntrTypeList.Contains(c.S_CNTR_TYPE))
.Where(d => d.N_ITEM_STATE == 0 && d.S_ITEM_STATE == "鍚堟牸")
.OrderBy(d => d.N_ITEM_NUM, OrderByType.Desc)
.OrderBy(d => d.N_ITEM_STATE, OrderByType.Asc).ToList();
}
-
if (sortedMaterials.Count == 0) //娌℃湁婊¤冻鏉′欢鐨� {
@@ -1481,124 +1488,124 @@
public static ErpResult ErpSendOutboundPlan(ErpSendOutboundPlanInfo model) {
var db = new SqlHelper<object>().GetInstance();
- var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "ON");
+ var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "CKD");
var info = "";
try {
- if (string.IsNullOrEmpty(orderNo)) {
- info = "鍑哄簱鍗曞彿涓嶈兘涓虹┖";
+ // 鍙傛暟鍚堟硶鎬х‘璁ら儴鍒嗭細閿欒缂栫爜锛�00
+ if (model.pzsl <= 0) {
+ info = $"鐗╂枡鏁伴噺(pzsl){model.pzsl}涓嶅悎娉曪細鐗╂枡鏁伴噺搴旇澶т簬 0";
LogHelper.Info(info);
- return NewErpResult(2, info);
+ return NewErpResult(400, info);
}
var outboundPlan = new TN_Outbound_Plan {
- jhdh = model.jhdh,
- ckzt = model.ckzt,
- jhlb = model.jhlb,
- ckdh = model.ckdh,
- cph = model.cph,
- ysfs = model.ysfs,
- cpzt = model.cpzt,
- mddw = model.mddw,
- cpdm = model.cpdm,
- cplb = model.cplb,
- cplbmx = model.cplbmx,
- pp = model.pp,
- dj = model.dj,
- gh = model.gh,
- ph = model.ph,
- bzlx = model.bzlx,
- pzdh = model.pzdh,
- pzd_dw = model.pzd_dw,
- pzd_dybh = model.pzd_dybh,
- pzjs = model.pzjs,
- pzsl = model.pzsl,
- pz_rq = model.pz_rq,
- pz_czrq = model.pz_czrq,
- pz_zfbj = model.pz_zfbj,
- pz_zfrq = model.pz_zfrq,
- pz_bz = model.pz_bz,
- ckdbh = model.ckdbh,
- sfjs = model.sfjs,
- sfsl = model.sfsl,
- sfcs = model.sfcs,
- zcsj = model.zcsj,
- jldw = model.jldw,
- fhrq = model.fhrq,
- ckdm = model.ckdm,
- fhr = model.fhr,
- czydm = model.czydm,
- shr_username = model.shr_username,
- shrq = model.shrq,
- zfbj = model.zfbj,
- zfrq = model.zfrq,
- jsdw = model.jsdw,
- shdw = model.shdw,
- ysdw = model.ysdw,
- lxr = model.lxr,
- ry_zxg = model.ry_zxg,
- ry_ccsj = model.ry_ccsj,
- erphx_jhdh = model.erphx_jhdh,
- erphx_wlbm = model.erphx_wlbm,
- erphx_wlmc = model.erphx_wlmc,
- erphx_cjrq = model.erphx_cjrq,
- hw = model.hw,
- hwzt = model.hwzt
+ JHDH = model.jhdh, // 璁″垝鍗曞彿锛堝敮涓�爣璇嗭級
+ CKZT = model.ckzt, // 鍑哄簱鐘舵�
+ JHLB = model.jhlb, // 璁″垝绫诲埆
+ CKDH = model.ckdh, // 鍙傝�鍗曞彿
+ CPH = model.cph, // 杞︾墝鍙�+ YSFS = model.ysfs, // 杩愯緭鏂瑰紡
+ CPZT = model.cpzt, // 浜у搧鐘舵�
+ MDDW = model.mddw, // 涔版柇鍗曚綅
+ CPDM = model.cpdm, // 浜у搧浠ｇ爜
+ CPLB = model.cplb, // 浜у搧绫诲埆
+ CPLBMX = model.cplbmx, // 浜у搧绫诲埆鏄庣粏
+ PP = model.pp, // 鍝佺墝
+ DJ = model.dj, // 绛夌骇
+ GH = model.gh, // 缃愬彿
+ PH = model.ph, // 鎵瑰彿
+ BZLX = model.bzlx, // 鍖呰绫诲瀷
+ PZDH = model.pzdh, // 娲捐鍗曞彿
+ PZD_DW = model.pzd_dw, // 娲捐鍗曞崟浣�+ PZD_DYBH = model.pzd_dybh, // 娲捐鍗曡皟杩愮紪鍙�+ PZJS = model.pzjs, // 娲捐浠舵暟
+ PZSL = model.pzsl, // 娲捐鏁伴噺
+ PZ_RQ = model.pz_rq, // 娲捐鏃ユ湡(yyyy-mm-dd)
+ PZ_CZRQ = model.pz_czrq, // 娲捐鎿嶄綔鏃ユ湡
+ PZ_ZFBJ = model.pz_zfbj, // 娲捐浣滃簾鏍囪
+ PZ_ZFRQ = model.pz_zfrq, // 娲捐浣滃簾鏃ユ湡
+ PZ_BZ = model.pz_bz, // 娲捐澶囨敞
+ CKDBH = model.ckdbh, // 鍑哄簱鍗曠紪鍙�+ SFJS = model.sfjs, // 瀹炲彂浠舵暟
+ SFSL = model.sfsl, // 瀹炲彂鏁伴噺
+ SFCS = model.sfcs, // 瀹炲彂杞︽暟
+ ZCSJ = model.zcsj, // 瑁呰溅鏃堕棿
+ JLDW = model.jldw, // 璁￠噺鍗曚綅
+ FHRQ = model.fhrq, // 鍙戣揣鏃ユ湡
+ CKDM = model.ckdm, // 浠撳簱浠ｇ爜
+ FHR = model.fhr, // 鍙戣揣浜�+ CZYDM = model.czydm, // 鎿嶄綔鍛�+ SHR_USERNAME = model.shr_username, // 瀹℃牳浜�+ SHRQ = model.shrq, // 瀹℃牳鏃ユ湡
+ ZFBJ = model.zfbj, // 浣滃簾鏍囪
+ ZFRQ = model.zfrq, // 浣滃簾鏃ユ湡
+ JSDW = model.jsdw, // 缁撶畻鍗曚綅
+ SHDW = model.shdw, // 鏀惰揣鍗曚綅
+ YSDW = model.ysdw, // 杩愯緭鍗曚綅
+ LXR = model.lxr, // 鑱旂郴浜�+ RY_ZXG = model.ry_zxg, // 瑁呭嵏宸�+ RY_CCSJ = model.ry_ccsj, // 鍙夎溅鍙告満
+ ERPHX_JHDH = model.erphx_jhdh, // erp浜よ揣鍗曞彿
+ ERPHX_WLBM = model.erphx_wlbm, // erp鐗╂枡缂栫爜
+ ERPHX_WLMC = model.erphx_wlmc, // erp鐗╂枡鍚嶇О
+ ERPHX_CJRQ = model.erphx_cjrq, // erp鍒涘缓鏃ユ湡
+ HW = model.hw, // 璐т綅
+ HWZT = model.hwzt // 璐т綅鐘舵�
};
- //var cgDetailList = SelectCgByTotalQty(new FinishedOutboundInfo {
- // BatchNo = model.BatchNo,
- // CntrType= model.CntrType,
- // ItemCode= model.ItemCode,
- // EndArea= model.EndArea,
- // ForcedOut= model.ForcedOut,
- // Qty= model.Qty,
- // Spe = model.Spe
- //});
+ var cgDetailList = SelectCgByTotalQty(
+ qty: (int)model.pzsl,
+ itemCode: model.cpdm,
+ batchNo: model.ph
+ );
- //if (cgDetailList.Count == 0) {
- // info = "娌℃湁鍚堥�鐨勭墿鏂欏彲浠ュ嚭搴�;
- // LogHelper.Info(info);
- // return NewErpResult(3, info);
- //}
+ if (cgDetailList.Count == 0) {
+ info = "娌℃湁鍚堥�鐨勭墿鏂欏彲浠ュ嚭搴�;
+ LogHelper.Info(info);
+ return NewErpResult(3, info);
+ }
- //var order = new TN_Outbound_Order {
- // S_NO = orderNo,
- // S_ITEM_CODE = model.ItemCode,
- // S_BATCH = model.BatchNo,
- // N_END_NUM = model.Qty,
- // //F_OUT_QTY = cgDetailList.Sum(a => a.N_QTY),
- // S_END_AREA = model.EndArea,
- // S_BS_NO = model.ErpNo,
- // S_BS_TYPE = "ERP",
- //};
+ var order = new TN_Outbound_Order {
+ S_NO = orderNo,
+ S_ITEM_CODE = model.cpdm,
+ S_BATCH = model.ph,
+ N_END_NUM = (int)model.pzsl,
+ //F_OUT_QTY = cgDetailList.Sum(a => a.N_QTY),
+ S_END_AREA = model.ysfs == "姹借溅" ? "QCCKQ" : "HCCKQ", // 鏆傛椂鐢ㄨ繍杈撴柟寮忥紙鐏溅/姹借溅锛夋潵鍖哄垎缁堢偣璐у尯
+ S_BS_NO = model.jhdh,
+ S_BS_TYPE = "ERP",
+ };
- //var detailList = new List<TN_Outbound_Detail>();
- //foreach (var cgDetail in cgDetailList) {
- // var detail = new TN_Outbound_Detail {
- // S_OO_NO = orderNo,
- // S_ITEM_CODE = cgDetail.S_ITEM_CODE,
- // S_BATCH_NO = cgDetail.S_BATCH_NO,
- // S_CNTR_CODE = cgDetail.S_CNTR_CODE,
- // N_COUNT = cgDetail.N_ITEM_NUM,
- // S_END_AREA = model.EndArea
- // };
- // detailList.Add(detail);
- //}
+ var detailList = new List<TN_Outbound_Detail>();
+ foreach (var cgDetail in cgDetailList) {
+ var detail = new TN_Outbound_Detail {
+ S_OO_NO = orderNo,
+ S_ITEM_CODE = cgDetail.S_ITEM_CODE,
+ S_BATCH_NO = cgDetail.S_BATCH_NO,
+ S_CNTR_CODE = cgDetail.S_CNTR_CODE,
+ N_COUNT = cgDetail.N_ITEM_NUM,
+ S_END_AREA = order.S_END_AREA, // order涓篸etail鐨勬瘡涓�釜璐т綅璁剧疆缁堢偣鍊�+ S_BS_NO = order.S_BS_NO,
+ S_BS_TYPE= order.S_BS_TYPE,
+ };
+ detailList.Add(detail);
+ }
using (var tran = db.Ado.UseTran()) {
- //if (db.Insertable<TN_Outbound_Order>(order).ExecuteCommand() <= 0) {
- // tran.RollbackTran();
- // info = "鐢熸垚鍑哄簱鍗曞け璐ワ細" + JsonConvert.SerializeObject(order);
- // LogHelper.Info(info);
- // return NewErpResult(2, info);
- //}
+ if (db.Insertable<TN_Outbound_Order>(order).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ info = "鐢熸垚鍑哄簱鍗曞け璐ワ細" + JsonConvert.SerializeObject(order);
+ LogHelper.Info(info);
+ return NewErpResult(2, info);
+ }
- //if (db.Insertable<TN_Outbound_Detail>(detailList).ExecuteCommand() <= 0) {
- // tran.RollbackTran();
- // info = "鐢熸垚鍑哄簱鍗曟槑缁嗗け璐�;
- // LogHelper.Info(info);
- // return NewErpResult(4, info);
- //}
+ if (db.Insertable<TN_Outbound_Detail>(detailList).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ info = "鐢熸垚鍑哄簱鍗曟槑缁嗗け璐�;
+ LogHelper.Info(info);
+ return NewErpResult(4, info);
+ }
+
if (db.Insertable<TN_Outbound_Plan>(outboundPlan).ExecuteCommand() <= 0) {
tran.RollbackTran();
info = "鐢熸垚鍑哄簱鍗曡鍒掕褰曡〃澶辫触";
diff --git a/config/config.json b/config/config.json
index 1a177bf..81a3d4d 100644
--- a/config/config.json
+++ b/config/config.json
@@ -1,5 +1,5 @@
{
- "WebApiUrl": "http://192.168.1.141:8901",
+ "WebApiUrl": "http://127.0.0.1:8901",
"NdcApiUrl": "http://127.0.0.1:5201/api/order/",
"ErpApiUrl": "http://127.0.0.1:8085/api/",
"SqlServer": "Data Source=192.168.1.87;Initial Catalog=AMS_OIMobox;User ID=sa;Password=123456;",
diff --git a/core/Monitor.cs b/core/Monitor.cs
index 9d959bb..fdcfbb7 100644
--- a/core/Monitor.cs
+++ b/core/Monitor.cs
@@ -300,7 +300,9 @@
detail.N_B_STATE = 2;
var cntId = detail.S_CNTR_CODE;
- var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
+
+ var erp_no = string.IsNullOrEmpty(detail.S_BS_NO) ? "" : detail.S_BS_NO;
+ var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName, detail.S_OO_NO, erp_no);
LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿� LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�@@ -324,6 +326,7 @@
LogHelper.Info(info);
continue;
}
+
if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
it.N_LOCK_STATE,
@@ -412,7 +415,7 @@
.Count(d => d.S_OO_NO == order.S_NO && d.N_B_STATE >= 2); // 鎵ц涓� var allCount = db.Queryable<TN_SpotCheck_Detail>()
.Count(d => d.S_OO_NO == order.S_NO);
- LogHelper.Info($"杞--{taskName}--缁熻{taskName}鍗�{order.S_NO}'浠诲姟宸蹭笅鍙戯細{doingCount}/{allCount}");
+ LogHelper.Info($"杞锛歿taskName}锛氱粺璁taskName}鍗�{order.S_NO}'浠诲姟宸蹭笅鍙戯細{doingCount}/{allCount}");
if (doingCount == allCount) {
order.N_B_STATE = 2; // 鎵�湁浠诲姟閮藉凡鎵ц
@@ -425,7 +428,7 @@
.ToList();
if (checkDetailList.Count == 0) {
- LogHelper.Info($"杞--{taskName}--浠嶆湁浠诲姟鏈墽琛屽畬鎴愶紝浣嗗綋鍓嶆病鏈夊凡涓嬪彂鐨勪换鍔�);
+ LogHelper.Info($"杞锛歿taskName}锛氫粛鏈変换鍔℃湭鎵ц瀹屾垚锛屼絾褰撳墠娌℃湁宸蹭笅鍙戠殑浠诲姟");
continue;
}
@@ -441,7 +444,7 @@
.First();
if (startLoc == null) {
- LogHelper.Info($"杞--{taskName}锛氭病鏈夋壘鍒板悎閫傜殑璧风偣璐т綅锛�);
+ LogHelper.Info($"杞锛歿taskName}锛氭病鏈夋壘鍒板悎閫傜殑璧风偣璐т綅锛�);
continue;
}
@@ -451,14 +454,14 @@
.Where(a => a.N_CURRENT_NUM == 0).First();
if (endLoc == null) {
- LogHelper.Info($"杞--{taskName}锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅锛�);
+ LogHelper.Info($"杞锛歿taskName}锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅锛�);
continue;
}
detail.N_B_STATE = 2;
var cntId = detail.S_CNTR_CODE;
- var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
+ var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName, detail.S_OO_NO);
LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿� LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�@@ -466,7 +469,7 @@
using (var tran = db.Ado.UseTran()) {
if (db.Updateable<TN_SpotCheck_Detail>(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand() <= 0) {
tran.RollbackTran();
- LogHelper.Info($"杞--{taskName}锛氫慨鏀箋taskName}鍗曟槑缁嗚〃鐘舵�涓哄畬鎴�-澶辫触锛�);
+ LogHelper.Info($"杞锛歿taskName}锛氫慨鏀箋taskName}鍗曟槑缁嗚〃鐘舵�涓哄畬鎴�-澶辫触锛�);
continue;
}
@@ -524,7 +527,7 @@
.ToList();
if (orderList.Count == 0) {
- LogHelper.Info($"杞--{taskName}--鏆傛棤寰呮墽琛岀殑{taskName}鍗�);
+ LogHelper.Info($"杞锛歿taskName}锛氭殏鏃犲緟鎵ц鐨剓taskName}鍗�);
return;
}
@@ -534,7 +537,7 @@
.Count(d => d.S_OO_NO == order.S_NO && d.N_B_STATE >= 2); // 鎵ц涓� var allCount = db.Queryable<TN_RelocationList_Detail>()
.Count(d => d.S_OO_NO == order.S_NO);
- LogHelper.Info($"杞--{taskName}--缁熻{taskName}鍗�{order.S_NO}'浠诲姟宸蹭笅鍙戯細{doingCount}/{allCount}");
+ LogHelper.Info($"杞锛歿taskName}锛氱粺璁taskName}鍗�{order.S_NO}'浠诲姟宸蹭笅鍙戯細{doingCount}/{allCount}");
if (doingCount == allCount) {
order.N_B_STATE = 2; // 鎵�湁浠诲姟閮藉凡鎵ц
@@ -547,7 +550,7 @@
.ToList();
if (checkDetailList.Count == 0) {
- LogHelper.Info($"杞--{taskName}--浠嶆湁浠诲姟鏈墽琛屽畬鎴愶紝浣嗗綋鍓嶆病鏈夊凡涓嬪彂鐨勪换鍔�);
+ LogHelper.Info($"杞锛歿taskName}锛氫粛鏈変换鍔℃湭鎵ц瀹屾垚锛屼絾褰撳墠娌℃湁宸蹭笅鍙戠殑浠诲姟");
continue;
}
@@ -565,7 +568,7 @@
.First();
if (startLoc == null) {
- LogHelper.Info($"杞--{taskName}锛氭病鏈夋壘鍒板悎閫傜殑璧风偣璐т綅锛�);
+ LogHelper.Info($"杞锛歿taskName}锛氭病鏈夋壘鍒板悎閫傜殑璧风偣璐т綅锛�);
continue;
}
@@ -575,14 +578,14 @@
.Where(a => a.N_CURRENT_NUM == 0).First();
if (endLoc == null) {
- LogHelper.Info($"杞--{taskName}锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅锛�);
+ LogHelper.Info($"杞锛歿taskName}锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅锛�);
continue;
}
detail.N_B_STATE = 2;
var cntId = detail.S_CNTR_CODE;
- var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
+ var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName, detail.S_OO_NO);
LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿� LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�@@ -590,7 +593,7 @@
using (var tran = db.Ado.UseTran()) {
if (db.Updateable<TN_RelocationList_Detail>(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand() <= 0) {
tran.RollbackTran();
- LogHelper.Info($"杞--{taskName}锛氫慨鏀箋taskName}鍗曟槑缁嗚〃鐘舵�涓哄畬鎴�-澶辫触锛�);
+ LogHelper.Info($"杞锛歿taskName}锛氫慨鏀箋taskName}鍗曟槑缁嗚〃鐘舵�涓哄畬鎴�-澶辫触锛�);
continue;
}
diff --git a/core/WCSCore.cs b/core/WCSCore.cs
index 77251ee..73363fe 100644
--- a/core/WCSCore.cs
+++ b/core/WCSCore.cs
@@ -175,8 +175,9 @@
S_TASK_NO = task.S_CODE,
T_RECORD_TIME = DateTime.Now,
S_TYPE = task.S_TYPE,
- S_BS_CODE = task.S_BS_TYPE,
+ S_BS_CODE = task.S_BS_NO, // ERP鍗曞彿锛岄粯璁や负绌� N_QTY = cgDetail.N_ITEM_NUM,
+ S_NO = task.S_OP_CODE, // 鍑哄簱/鎶芥/绉诲簱鍗� };
// 鏁版嵁搴撴搷浣�diff --git a/models/TN_Outbound_Detail.cs b/models/TN_Outbound_Detail.cs
index a2a1b21..aa1a7e1 100644
--- a/models/TN_Outbound_Detail.cs
+++ b/models/TN_Outbound_Detail.cs
@@ -11,6 +11,10 @@
/// </summary>
public string S_OO_NO { get; set; }
+ public string S_BS_TYPE { get; set; } = string.Empty; // ERP
+
+ public string S_BS_NO { get; set; } = string.Empty; // ERP 鍗曞彿锛堟潵婧愬崟鍙凤級
+
/// <summary>
/// 涓氬姟鐘舵�锛�寰呮墽琛�1宸蹭笅鍙�2鎵ц涓�3宸插畬鎴� /// </summary>
diff --git a/models/TN_Outbound_Plan.cs b/models/TN_Outbound_Plan.cs
index 9a01dcd..f1ba861 100644
--- a/models/TN_Outbound_Plan.cs
+++ b/models/TN_Outbound_Plan.cs
@@ -11,265 +11,265 @@
/// 鍑哄簱璁″垝瀹炰綋绫� /// </summary>
[SugarTable("TN_Outbound_Plan")]
- public class TN_Outbound_Plan {
+ public class TN_Outbound_Plan : BaseModel {
/// <summary>
/// 璁″垝鍗曞彿锛堝敮涓�爣璇嗭級
/// </summary>
- public string jhdh { get; set; }
+ public string JHDH { get; set; }
/// <summary>
/// 鍑哄簱鐘舵�
/// </summary>
- public string ckzt { get; set; }
+ public string CKZT { get; set; }
/// <summary>
/// 璁″垝绫诲埆
/// </summary>
- public string jhlb { get; set; }
+ public string JHLB { get; set; }
/// <summary>
/// 鍙傝�鍗曞彿
/// </summary>
- public string ckdh { get; set; }
+ public string CKDH { get; set; }
/// <summary>
/// 杞︾墝鍙� /// </summary>
- public string cph { get; set; }
+ public string CPH { get; set; }
/// <summary>
/// 杩愯緭鏂瑰紡
/// </summary>
- public string ysfs { get; set; }
+ public string YSFS { get; set; }
/// <summary>
/// 浜у搧鐘舵�
/// </summary>
- public string cpzt { get; set; }
+ public string CPZT { get; set; }
/// <summary>
/// 涔版柇鍗曚綅
/// </summary>
- public string mddw { get; set; }
+ public string MDDW { get; set; }
/// <summary>
/// 浜у搧浠ｇ爜
/// </summary>
- public string cpdm { get; set; }
+ public string CPDM { get; set; }
/// <summary>
/// 浜у搧绫诲埆
/// </summary>
- public string cplb { get; set; }
+ public string CPLB { get; set; }
/// <summary>
/// 浜у搧绫诲埆鏄庣粏
/// </summary>
- public string cplbmx { get; set; }
+ public string CPLBMX { get; set; }
/// <summary>
/// 鍝佺墝
/// </summary>
- public string pp { get; set; }
+ public string PP { get; set; }
/// <summary>
/// 绛夌骇
/// </summary>
- public string dj { get; set; }
+ public string DJ { get; set; }
/// <summary>
/// 缃愬彿
/// </summary>
- public string gh { get; set; }
+ public string GH { get; set; }
/// <summary>
/// 鎵瑰彿
/// </summary>
- public string ph { get; set; }
+ public string PH { get; set; }
/// <summary>
/// 鍖呰绫诲瀷
/// </summary>
- public string bzlx { get; set; }
+ public string BZLX { get; set; }
/// <summary>
/// 娲捐鍗曞彿
/// </summary>
- public string pzdh { get; set; }
+ public string PZDH { get; set; }
/// <summary>
/// 娲捐鍗曞崟浣� /// </summary>
- public string pzd_dw { get; set; }
+ public string PZD_DW { get; set; }
/// <summary>
/// 娲捐鍗曡皟杩愮紪鍙� /// </summary>
- public string pzd_dybh { get; set; }
+ public string PZD_DYBH { get; set; }
/// <summary>
/// 娲捐浠舵暟
/// </summary>
- public double pzjs { get; set; }
+ public double PZJS { get; set; }
/// <summary>
/// 娲捐鏁伴噺
/// </summary>
- public decimal pzsl { get; set; }
+ public decimal PZSL { get; set; }
/// <summary>
/// 娲捐鏃ユ湡(yyyy-mm-dd)
/// </summary>
- public string pz_rq { get; set; }
+ public string PZ_RQ { get; set; }
/// <summary>
/// 娲捐鎿嶄綔鏃ユ湡
/// </summary>
- public long pz_czrq { get; set; }
+ public long PZ_CZRQ { get; set; }
/// <summary>
/// 娲捐浣滃簾鏍囪
/// </summary>
- public int pz_zfbj { get; set; }
+ public int PZ_ZFBJ { get; set; }
/// <summary>
/// 娲捐浣滃簾鏃ユ湡
/// </summary>
- public long pz_zfrq { get; set; }
+ public long PZ_ZFRQ { get; set; }
/// <summary>
/// 娲捐澶囨敞
/// </summary>
- public string pz_bz { get; set; }
+ public string PZ_BZ { get; set; }
/// <summary>
/// 鍑哄簱鍗曠紪鍙� /// </summary>
- public string ckdbh { get; set; }
+ public string CKDBH { get; set; }
/// <summary>
/// 瀹炲彂浠舵暟
/// </summary>
- public double sfjs { get; set; }
+ public double SFJS { get; set; }
/// <summary>
/// 瀹炲彂鏁伴噺
/// </summary>
- public decimal sfsl { get; set; }
+ public decimal SFSL { get; set; }
/// <summary>
/// 瀹炲彂杞︽暟
/// </summary>
- public int sfcs { get; set; }
+ public int SFCS { get; set; }
/// <summary>
/// 瑁呰溅鏃堕棿
/// </summary>
- public string zcsj { get; set; }
+ public string ZCSJ { get; set; }
/// <summary>
/// 璁￠噺鍗曚綅
/// </summary>
- public string jldw { get; set; }
+ public string JLDW { get; set; }
/// <summary>
/// 鍙戣揣鏃ユ湡
/// </summary>
- public long fhrq { get; set; }
+ public long FHRQ { get; set; }
/// <summary>
/// 浠撳簱浠ｇ爜
/// </summary>
- public string ckdm { get; set; }
+ public string CKDM { get; set; }
/// <summary>
/// 鍙戣揣浜� /// </summary>
- public string fhr { get; set; }
+ public string FHR { get; set; }
/// <summary>
/// 鎿嶄綔鍛� /// </summary>
- public string czydm { get; set; }
+ public string CZYDM { get; set; }
/// <summary>
/// 瀹℃牳浜� /// </summary>
- public string shr_username { get; set; }
+ public string SHR_USERNAME { get; set; }
/// <summary>
/// 瀹℃牳鏃ユ湡
/// </summary>
- public long shrq { get; set; }
+ public long SHRQ { get; set; }
/// <summary>
/// 浣滃簾鏍囪
/// </summary>
- public long zfbj { get; set; }
+ public long ZFBJ { get; set; }
/// <summary>
/// 浣滃簾鏃ユ湡
/// </summary>
- public long zfrq { get; set; }
+ public long ZFRQ { get; set; }
/// <summary>
/// 缁撶畻鍗曚綅
/// </summary>
- public string jsdw { get; set; }
+ public string JSDW { get; set; }
/// <summary>
/// 鏀惰揣鍗曚綅
/// </summary>
- public string shdw { get; set; }
+ public string SHDW { get; set; }
/// <summary>
/// 杩愯緭鍗曚綅
/// </summary>
- public string ysdw { get; set; }
+ public string YSDW { get; set; }
/// <summary>
/// 鑱旂郴浜� /// </summary>
- public string lxr { get; set; }
+ public string LXR { get; set; }
/// <summary>
/// 瑁呭嵏宸� /// </summary>
- public string ry_zxg { get; set; }
+ public string RY_ZXG { get; set; }
/// <summary>
/// 鍙夎溅鍙告満
/// </summary>
- public string ry_ccsj { get; set; }
+ public string RY_CCSJ { get; set; }
/// <summary>
/// erp浜よ揣鍗曞彿
/// </summary>
- public string erphx_jhdh { get; set; }
+ public string ERPHX_JHDH { get; set; }
/// <summary>
/// erp鐗╂枡缂栫爜
/// </summary>
- public string erphx_wlbm { get; set; }
+ public string ERPHX_WLBM { get; set; }
/// <summary>
/// erp鐗╂枡鍚嶇О
/// </summary>
- public string erphx_wlmc { get; set; }
+ public string ERPHX_WLMC { get; set; }
/// <summary>
/// erp鍒涘缓鏃ユ湡
/// </summary>
- public string erphx_cjrq { get; set; }
+ public string ERPHX_CJRQ { get; set; }
/// <summary>
/// 璐т綅
/// </summary>
- public string hw { get; set; }
+ public string HW { get; set; }
/// <summary>
/// 璐т綅鐘舵�
/// </summary>
- public string hwzt { get; set; }
+ public string HWZT { get; set; }
}
}
diff --git a/models/TN_Record_Table.cs b/models/TN_Record_Table.cs
index 0154c71..2262000 100644
--- a/models/TN_Record_Table.cs
+++ b/models/TN_Record_Table.cs
@@ -13,6 +13,10 @@
[SugarTable("TN_Record_Table")]
public class TN_Record_Table : BaseModel {
/// <summary>
+ /// 涓氬姟鍗曞彿
+ /// </summary>
+ public string S_NO { get; set; }
+ /// <summary>
/// 浠诲姟鍙� /// </summary>
public string S_TASK_NO { get; set; }
diff --git a/models/TN_Task.cs b/models/TN_Task.cs
index 5e7656d..bb533c2 100644
--- a/models/TN_Task.cs
+++ b/models/TN_Task.cs
@@ -78,6 +78,10 @@
public string S_EQ_TASK_CODE { get; set; }
public string S_CNTR_CODE { get; set; }
+ /// <summary>
+ /// 浣滀笟缂栫爜
+ /// </summary>
+ public string S_OP_CODE { get; set; }
public string S_OP_NAME { get; set; }
public int N_START_LAYER { get; internal set; }
diff --git a/wms/WCSHelper.cs b/wms/WCSHelper.cs
index 10eafbf..ee619d8 100644
--- a/wms/WCSHelper.cs
+++ b/wms/WCSHelper.cs
@@ -63,7 +63,7 @@
return TN_Task;
}
- public static TN_Task BuildErpTask(TN_Location startLoc, TN_Location endLoc, string cntId, string type, string erpNo) {
+ public static TN_Task BuildTask(TN_Location startLoc, TN_Location endLoc, string cntId, string type, string op_no, string erp_no = "") {
TN_Task TN_Task = new TN_Task() {
S_CODE = GenerateTaskNo(),
S_START_AREA = startLoc.S_AREA_CODE,
@@ -75,8 +75,9 @@
N_SCHEDULE_TYPE = 1, // NDC
N_B_STATE = 0,
S_CNTR_CODE = cntId,
- S_BS_NO = erpNo,
- S_BS_TYPE = "ERP",
+ S_OP_CODE = op_no,
+ S_BS_NO = erp_no,
+ S_BS_TYPE = erp_no == "" ? "" : "ERP",
};
return TN_Task;
--
Gitblit v1.9.1