From 8b05ae0960f7f6de3fbc99e4af9ba03ff75ec6e1 Mon Sep 17 00:00:00 2001
From: hudong <Administrator@PC-20250329JZUF>
Date: 星期一, 26 五月 2025 08:49:29 +0800
Subject: [PATCH] 与现场实施测试出入库流程 入库任务下发参数修改测试 称重高度会议讨论重新计算货位 变更终点下发联调
---
api/WmsSpaHelper.cs | 355 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 312 insertions(+), 43 deletions(-)
diff --git a/api/WmsSpaHelper.cs b/api/WmsSpaHelper.cs
index 375c0b3..b054b44 100644
--- a/api/WmsSpaHelper.cs
+++ b/api/WmsSpaHelper.cs
@@ -35,6 +35,7 @@
using SqlSugar;
using static HH.WCS.Mobox3.pinggao.models.SapRoot.GYSDto;
using System.Web.Services.Protocols;
+using System.Web.Http.ValueProviders;
namespace HH.WCS.Mobox3.pinggao.api
{
@@ -1736,6 +1737,7 @@
using (var db = new SqlHelper<object>().GetInstance())
{
var locinfo = db.Queryable<Location>().Where(a => a.S_CODE == model.start).First();
+
if (locinfo?.N_LOCK_STATE != 0)
{
result.resultCode = 3;
@@ -1823,7 +1825,209 @@
}
}
+ /// <summary>
+ /// 鍒嗘嫞
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ internal static async Task<SimpleResult> KtSorting(KtSorting model)
+ {
+ var result = new SimpleResult();
+
+ // var db = new SqlHelper<object>().GetInstance();
+
+ using (var db = new SqlHelper<object>().GetInstance())
+ {
+ try
+ {
+
+
+ result.resultMsg = "鎴愬姛";
+ result.resultCode = 0;
+ var locinfo = db.Queryable<Location>().Where(a => a.S_CODE == model.start).First();
+
+ if (locinfo?.N_LOCK_STATE != 0)
+ {
+ result.resultCode = 3;
+ result.resultMsg = $"璧峰搴撲綅宸查攣/涓嶅瓨鍦�;
+ return result;
+ }
+ //鍒ゆ柇鎵樼洏鏄惁宸茬粡鐢熸垚浠诲姟锛屽鏋滄病鏈夊垯鐢熸垚
+ var wmsTaskcs = WMSHelper.GetWmsTaskByCntr(model.cntr_code);
+ if (wmsTaskcs != null)
+ {
+ result.resultCode = 3;
+ result.resultMsg = $"璧风偣{model.start} 鎵樼洏{model.cntr_code}宸茬粡鍒涘缓浠诲姟锛岃鍕块噸澶嶇敵璇�;
+ return result;
+ }
+ //鍑哄簱
+ if (model.Type==2)
+ {
+ Location start = new Location();
+ if (!string.IsNullOrEmpty(model.cntr_code))
+ {
+ var loc= db.Queryable<LocCntrRel>().Where(it => it.S_CNTR_CODE == model.cntr_code).First();
+
+
+ if (loc==null)
+ {
+ LogHelper.Info($"瀹瑰櫒{model.cntr_code}鎵句笉鍒板搴旇揣浣�);
+ result.resultMsg = $"瀹瑰櫒{model.cntr_code}鎵句笉鍒板搴旇揣浣�;
+ result.resultCode = 1;
+ return result;
+ }
+ else
+ {
+ start= db.Queryable<Location>().Where(it => it.S_CODE == loc.S_LOC_CODE).First();
+ }
+ }
+ else
+ {
+ #region MyRegion
+ //var list = db.Queryable<CntrItemRel>().Select(s => s.S_CNTR_CODE).ToArray();
+ //var S_LOC_CODElist = db.Queryable<LocCntrRel>().Where(s=>!list.Contains(s.S_CNTR_CODE)).Select(s=>s.S_LOC_CODE).ToArray();
+ //start = db.Queryable<Location>().Where(it => S_LOC_CODElist.Contains(it.S_CODE)).First();
+
+ //// 鑾峰彇鎵�湁琚崰鐢ㄧ殑瀹瑰櫒缂栫爜
+ //var usedContainerCodes = db.Queryable<CntrItemRel>().Select(s => s.S_CNTR_CODE).ToList();
+
+ //// 鑾峰彇鏈鍗犵敤鐨勫鍣ㄥ搴旂殑璐т綅缂栫爜
+ //var availableLocationCodes = db.Queryable<LocCntrRel>()
+ // .Where(s => !usedContainerCodes.Contains(s.S_CNTR_CODE))
+ // .Select(s => s.S_LOC_CODE)
+ // .ToList();
+
+ //// 鑾峰彇绗竴涓彲鐢ㄨ揣浣嶏紙濡傛灉娌℃湁鍒欒繑鍥瀗ull锛�+ //var startLocation = db.Queryable<Location>()
+ // .Where(it => availableLocationCodes.Contains(it.S_CODE))
+ // .ToList().FirstOrDefault();
+
+
+ #endregion
+ start = db.Queryable<LocCntrRel>()
+ .LeftJoin<CntrItemRel>((lcr, cir) => lcr.S_CNTR_CODE == cir.S_CNTR_CODE)
+ .Where((lcr, cir) => cir.S_CNTR_CODE == null) // 鎵惧嚭鏈鍗犵敤鐨勫鍣�+ .LeftJoin<Location>((lcr, cir, loc) => lcr.S_LOC_CODE == loc.S_CODE&&loc.S_AREA_CODE== "HJQ")
+ .Select((lcr, cir, loc) => loc).ToList() // 杩斿洖 Location 瀵硅薄
+ .FirstOrDefault(); // 鎴栬� Take(1).ToList()[0]
+ }
+ if (start==null)
+ {
+ LogHelper.Info($"{model.cntr_code}鏈壘鍒板彲鐢ㄨ揣浣�);
+ result.resultMsg = $"{model.cntr_code}鏈壘鍒板彲鐢ㄨ揣浣�;
+ result.resultCode = 1;
+ return result;
+ }
+ //搴撲綅淇℃伅
+
+ var endinfo = db.Queryable<Location>().Where(it => it.S_CODE == model.start).First();
+ var wmsTask = new WMSTask
+ {
+ S_CNTR_CODE = model.cntr_code,
+ S_CODE = WMSHelper.GenerateTaskNo(),
+ S_START_LOC = start.S_CODE,
+ S_START_AREA = start.S_AREA_CODE,
+ S_START_WH = start.S_WH_CODE,
+ S_END_LOC = endinfo.S_CODE,
+ S_END_AREA = endinfo.S_AREA_CODE,
+ S_END_WH = endinfo.S_WH_CODE,
+
+ N_TYPE = 2,
+ // S_TYPE = WMSTask.GetTypeStr(1),
+ S_TYPE = "鍑哄簱绌烘墭鐩�,
+ S_OP_DEF_CODE = "",
+ S_OP_DEF_NAME = "pda鍑哄簱"
+ };
+ if (WMSHelper.CreateWmsTask(wmsTask))
+ {
+ LocationHelper.LockLoc(start.S_CODE, 2);
+ result.resultMsg = $"鍒涘缓浣滀笟鎴愬姛锛屼綔涓氬彿{wmsTask.S_CODE}";
+ }
+
+
+ }
+ else //鍏ュ簱
+ {
+ Location end = new Location();
+ if (!string.IsNullOrEmpty(model.cntr_code))
+ {
+ #region MyRegion
+ //var list = db.Queryable<CntrItemRel>().Select(s => s.S_CNTR_CODE).ToArray();
+ //var S_LOC_CODElist = db.Queryable<LocCntrRel>().Where(s=>!list.Contains(s.S_CNTR_CODE)).Select(s=>s.S_LOC_CODE).ToArray();
+ //start = db.Queryable<Location>().Where(it => S_LOC_CODElist.Contains(it.S_CODE)).First();
+
+ //// 鑾峰彇鎵�湁琚崰鐢ㄧ殑瀹瑰櫒缂栫爜
+ //var usedContainerCodes = db.Queryable<CntrItemRel>().Select(s => s.S_CNTR_CODE).ToList();
+
+ // 鑾峰彇鏈鍗犵敤鐨勫鍣ㄥ搴旂殑璐т綅缂栫爜
+ var availableLocationCodes = db.Queryable<LocCntrRel>()
+ .Select(s => s.S_LOC_CODE)
+ .ToList();
+
+ // 鑾峰彇绗竴涓彲鐢ㄨ揣浣嶏紙濡傛灉娌℃湁鍒欒繑鍥瀗ull锛�+ end = db.Queryable<Location>()
+ .Where(it => !availableLocationCodes.Contains(it.S_CODE)&&it.S_AREA_CODE== "HJQ")
+ .ToList().FirstOrDefault();
+
+
+ #endregion
+ }
+ else
+ {
+ LogHelper.Info($"鍏ュ簱 瀹瑰櫒{model.cntr_code}涓嶈兘涓虹┖");
+ result.resultMsg = $"鍏ュ簱 瀹瑰櫒{model.cntr_code}涓嶈兘涓虹┖";
+ result.resultCode = 1;
+ return result;
+
+ }
+ if (end==null)
+ {
+ LogHelper.Info($"{model.cntr_code}鏈壘鍒板彲鐢ㄨ揣浣�);
+ result.resultMsg = $"{model.cntr_code}鏈壘鍒板彲鐢ㄨ揣浣�;
+ result.resultCode = 1;
+ return result;
+ }
+ var sart = db.Queryable<Location>().Where(it => it.S_CODE == model.start).First();
+ var wmsTask = new WMSTask
+ {
+ S_CNTR_CODE = model.cntr_code,
+ S_CODE = WMSHelper.GenerateTaskNo(),
+ S_START_LOC = sart.S_CODE,
+ S_START_AREA = sart.S_AREA_CODE,
+ S_START_WH = sart.S_WH_CODE,
+ S_END_LOC = end.S_CODE,
+ S_END_AREA = end.S_AREA_CODE,
+ S_END_WH = end.S_WH_CODE,
+
+ N_TYPE = 1,
+ // S_TYPE = WMSTask.GetTypeStr(1),
+ S_TYPE = "鍏ュ簱绌烘墭鐩�,
+ S_OP_DEF_CODE = "",
+ S_OP_DEF_NAME = "pda鍏ュ簱"
+ };
+ if (WMSHelper.CreateWmsTask(wmsTask))
+ {
+ LocationHelper.LockLoc(end.S_CODE, 1);
+ result.resultMsg = $"鍒涘缓浣滀笟鎴愬姛锛屼綔涓氬彿{wmsTask.S_CODE}";
+ }
+
+ }
+ //閫氱敤鎺ュ彛 瀵瑰鍣ㄨ揣鍝佺殑鍒犲噺 鍜岀敓鎴愬洖搴撳崟 閮借鐢ㄧ殑鎺ュ彛
+
+ return result;
+
+ }
+ catch (Exception e)
+ {
+ result.resultMsg = e.Message;
+ db.RollbackTran();
+ return result;
+ throw;
+ }
+ }
+
+ }
/// <summary>
/// 鍒嗘嫞
/// </summary>
@@ -1861,7 +2065,7 @@
return result;
}
-
+ LogHelper.Info($"S_OUT_TYPE{po.S_OUT_TYPE}");
//鏍规嵁涓嶅悓鍑哄簱绫诲瀷 鍥炶皟sap
if (po.S_OUT_TYPE == "鍐查攢鍑哄簱")
{
@@ -1870,7 +2074,7 @@
else
if (po.S_OUT_TYPE == "鍑哄簱")//鏅�鍑哄簱
{
-
+ LogHelper.Info($"S_OUT_TYPE{po.S_OUT_TYPE}");
result = await AddOutboundOrder(db, model.MaterList, model.arrival_no, model.cntr_code, model.start);
}
else if (po.S_OUT_TYPE == "璁″垝澶栧彂鏂欏嚭搴�)
@@ -1901,32 +2105,40 @@
if (string.IsNullOrEmpty(po.S_WH_CODE))
{
S_WH_CODE = util.Settings.WHCode;
- }
+ }
+ else
+ {
+ S_WH_CODE = po.S_WH_CODE;
+ }
if (string.IsNullOrEmpty(po.S_AREA_CODE))
{
S_AREA_CODE = util.Settings.AREACode;
}
- model.MaterList.ForEach(a =>
+ else
{
- LogHelper.Info($"濉厖鏁版嵁{util.Settings.WHCode}");
- LogHelper.Info($"鍑忎粨搴撻噺{util.Settings.AREACode}琛ㄦ暟鎹�浠撳簱{po.S_WH_CODE} 鐗╂枡缂栫爜{a.item_code} 鐗╂枡鍚嶇О 鏁伴噺{a.qty}");
- req.item_info.Add(new AddChangeModel.itemModel
+ S_AREA_CODE = po.S_AREA_CODE;
+ }
+ model.MaterList.ForEach(a =>
{
- wh_code = S_WH_CODE,
- item_code = a.item_code,
- item_name = "",
- qty = a.qty
+ LogHelper.Info($"濉厖鏁版嵁{util.Settings.WHCode}");
+ LogHelper.Info($"鍑忎粨搴撻噺{util.Settings.AREACode}琛ㄦ暟鎹�浠撳簱{po.S_WH_CODE} 鐗╂枡缂栫爜{a.item_code} 鐗╂枡鍚嶇О 鏁伴噺{a.qty}");
+ req.item_info.Add(new AddChangeModel.itemModel
+ {
+ wh_code = S_WH_CODE,
+ item_code = a.item_code,
+ item_name = "",
+ qty = a.qty
+ });
+ LogHelper.Info($"鍑忓簱鍖洪噺琛ㄦ暟鎹�搴撳尯{po.S_AREA_CODE} 鐗╂枡缂栫爜{a.item_code} 鐗╂枡鍚嶇О 鏁伴噺{a.qty}");
+ req2.item_info.Add(new AddChangeModel.itemModel
+ {
+ wh_code = S_WH_CODE,
+ area_code = S_AREA_CODE,
+ item_code = a.item_code,
+ item_name = "",
+ qty = a.qty
+ });
});
- LogHelper.Info($"鍑忓簱鍖洪噺琛ㄦ暟鎹�搴撳尯{po.S_AREA_CODE} 鐗╂枡缂栫爜{a.item_code} 鐗╂枡鍚嶇О 鏁伴噺{a.qty}");
- req2.item_info.Add(new AddChangeModel.itemModel
- {
- wh_code = S_WH_CODE,
- area_code = S_AREA_CODE,
- item_code = a.item_code,
- item_name = "",
- qty = a.qty
- });
- });
var reqData = JsonConvert.SerializeObject(req);
var AppKey = Settings.AppKey;
var AppSecret = Settings.AppSecret;
@@ -2677,15 +2889,15 @@
var po = db.Queryable<TN_Outbound_Order>().Includes(s => s.Details).Where(a => a.S_NO == arrival_no).First();
string GZRQ = "";
string PZZDRQ = "";
- if (po.BUDAT != null)
- {
- GZRQ = DateTime.Parse(po.BUDAT.ToString()).ToString("yyyyMMdd");
- }
- if (po.BLDAT != null)
- {
- PZZDRQ = DateTime.Parse(po.BLDAT.ToString()).ToString("yyyyMMdd");
+ //if (po.Details[0].S_CJRQ != null)
+ //{
+ // GZRQ = DateTime.Parse(po.Details[0].S_CJRQ.ToString()).ToString("yyyyMMdd");
+ //}
+ //if (po.Details[0].S_XQRQ != null)
+ //{
+ // PZZDRQ = DateTime.Parse(po.Details[0].S_XQRQ.ToString()).ToString("yyyyMMdd");
- }
+ //}
CkBcakDto.Root myRoot = new CkBcakDto.Root
{
ROOT = new CkBcakDto.ROOT
@@ -2693,10 +2905,10 @@
WLPZ = new CkBcakDto.WLPZ
{
KEY = po.S_NO,
- ZYWLX = "涓氬姟绫诲瀷鍊�,
- PZRQ = PZZDRQ,
- GZRQ = GZRQ, // 鍋囪鏃ユ湡鏍煎紡涓�骞�鏈�鏃�
- GZRY = po.UNAME,
+ ZYWLX = "2",
+ PZRQ = DateTime.Now.ToString("yyyyMMdd"),
+ GZRQ =DateTime.Now.ToString("yyyyMMdd"), // 鍋囪鏃ユ湡鏍煎紡涓�骞�鏈�鏃�
+ GZRY = po.S_CREATOR_NAME,
ITEM = new List<CkBcakDto.ITEM>
{
}
@@ -2730,7 +2942,7 @@
//var serialNos = string.Join(",", CntrItemRels
// .Where(s => s.S_ITEM_CODE == item.item_code)
// .Select(s => s.S_SERIAL_NO));
- listitem1.XLH = podetail?.S_SERIAL_NO.Split(',').ToList();
+ listitem1.XLH = podetail?.S_SERIAL_NO==null?null: podetail?.S_SERIAL_NO.Split(',').ToList();
//foreach (var xlhValue in xlhValues)
//{
// CkBcakDto.ITEM1 newItem = new CkBcakDto.ITEM1 { XLH = xlhValue };
@@ -2740,6 +2952,10 @@
iTEMs.Add(ckbitem);
}
myRoot.ROOT.WLPZ.ITEM = iTEMs;
+ if (myRoot.ROOT.WLPZ.ITEM.Where(s=>!string.IsNullOrEmpty(s.SCDD) && !string.IsNullOrEmpty(s.YLBH) && !string.IsNullOrEmpty(s.YLXMH)).Count()==0)
+ {
+ myRoot.ROOT.WLPZ.ZYWLX = "2";
+ }
//db.Insertable<OutboundRecord>(records).ExecuteCommand();
#region wms-sap鍥炶皟
//绫昏浆json
@@ -2988,7 +3204,7 @@
lLDReturnRoots.MSGDESP = $"鐗╂枡{a.WLBM}鐗╂枡涓绘暟鎹笉瀛樺湪璇ョ墿鏂�;
iTEMs.Add(lLDReturnRoots);
- continue;
+ break ;
}
po.Details.Add(new TN_Ll_detail
{
@@ -2998,14 +3214,27 @@
S_ITEM_CODE = a.WLBM,
S_ITEM_NAME = item.S_ITEM_NAME,
F_QTY = a.XQSL,
+ S_ZJBM = a.ZJBM,
+ S_YLBH = a.YLBH,
+ S_YLXMH = a.YLHXM,
S_BATCH_NO = "",
S_ERP_WH_CODE = a.KCDD,
+ S_ZJWLTH = a.ZJWLTH,
+ S_ZJWLMS = a.ZJWLMS,
+ S_ZHFHBS = a.ZHFHBS,
+ S_CJRQ = a.CJRQ,
+ S_LLDSCBS = a.LLDSCBS,
+ S_SCGLY = a.SCGLY,
+ S_GXH = a.GXH,
+ S_XQRQ = a.XQRQ,
N_ITEM_STATE = 1
});
}
-
- var result1 = db.Insertable<TN_Ll_Order>(po).ExecuteCommand() > 0;
- db.Insertable<TN_Ll_detail>(po.Details).ExecuteCommand();
+ if (po.Details.Count()>0)
+ {
+ var result1 = db.Insertable<TN_Ll_Order>(po).ExecuteCommand() > 0;
+ db.Insertable<TN_Ll_detail>(po.Details).ExecuteCommand();
+ }
}
}
@@ -3027,7 +3256,7 @@
lLDReturnRoots.MSGCODE = 1;
lLDReturnRoots.MSGDESP = $"鎵ц涓鏂欏崟锛岀墿鏂檣a.WLBM}鐗╂枡涓嶅厑璁稿垹闄�;
iTEMs.Add(lLDReturnRoots);
- continue;
+ break;
}
var po1 = po.Details.Where(s => a.WLBM == s.S_ITEM_CODE).ToList();
if (po1.Count() == 0) //鏃犲垯鏂板鐗╂枡鏄庣粏
@@ -3043,7 +3272,7 @@
lLDReturnRoots.MSGCODE = 1;
lLDReturnRoots.MSGDESP = $"鐗╂枡{a.WLBM}鐗╂枡涓绘暟鎹笉瀛樺湪璇ョ墿鏂�;
iTEMs.Add(lLDReturnRoots);
- continue;
+ break;
}
TN_Ll_detail tN_Outbound_Detail = new TN_Ll_detail
{
@@ -3053,6 +3282,17 @@
S_ITEM_CODE = a.WLBM,
S_ITEM_NAME = item.S_ITEM_NAME,
F_QTY = a.XQSL,
+ S_ZJBM = a.ZJBM,
+ S_YLBH = a.YLBH,
+ S_YLXMH = a.YLHXM,
+ S_ZJWLTH = a.ZJWLTH,
+ S_ZJWLMS = a.ZJWLMS,
+ S_ZHFHBS = a.ZHFHBS,
+ S_CJRQ = a.CJRQ,
+ S_LLDSCBS = a.LLDSCBS,
+ S_GXH = a.GXH,
+ S_XQRQ = a.XQRQ,
+ S_SCGLY = a.SCGLY,
S_BATCH_NO = "鏃�,
S_ERP_WH_CODE = a.KCDD,
N_ITEM_STATE = 1
@@ -3076,7 +3316,7 @@
lLDReturnRoots.MSGCODE = 1;
lLDReturnRoots.MSGDESP = $"鏇存柊澶辫触锛屾洿鏂版暟閲忓繀椤诲ぇ浜庡綋鍓嶇墿鏂欐暟閲弡a.WLBM}";
iTEMs.Add(lLDReturnRoots);
- continue;
+ break;
}
}
}
@@ -3103,7 +3343,7 @@
lLDReturnRoots.MSGCODE = 1;
lLDReturnRoots.MSGDESP = $"鐗╂枡{a.WLBM}鐗╂枡鏁版嵁涓嶅瓨鍦�鏃犳硶鍒犻櫎";
iTEMs.Add(lLDReturnRoots);
- continue;
+ break;
}
}
else
@@ -3122,7 +3362,7 @@
lLDReturnRoots.MSGCODE = 1;
lLDReturnRoots.MSGDESP = $"鐗╂枡{a.WLBM}鐗╂枡涓绘暟鎹笉瀛樺湪璇ョ墿鏂�;
iTEMs.Add(lLDReturnRoots);
- continue;
+ break;
}
TN_Ll_detail tN_Outbound_Detail = new TN_Ll_detail
{
@@ -3132,6 +3372,17 @@
S_ITEM_CODE = a.WLBM,
S_ITEM_NAME = item.S_ITEM_NAME,
F_QTY = a.XQSL,
+ S_ZJBM = a.ZJBM,
+ S_YLBH = a.YLBH,
+ S_YLXMH = a.YLHXM,
+ S_ZJWLTH = a.ZJWLTH,
+ S_ZJWLMS = a.ZJWLMS,
+ S_ZHFHBS = a.ZHFHBS,
+ S_CJRQ = a.CJRQ,
+ S_LLDSCBS = a.LLDSCBS,
+ S_SCGLY = a.SCGLY,
+ S_GXH = a.GXH,
+ S_XQRQ = a.XQRQ,
S_BATCH_NO = "鏃�,
S_ERP_WH_CODE = a.KCDD,
N_ITEM_STATE = 1
@@ -3153,6 +3404,13 @@
db.Insertable<TN_Ll_detail>(listtn).ExecuteCommand();
}
}
+
+
+ lLDReturnRoots.GC = itemscddll.GC;
+ lLDReturnRoots.LLDH = itemscddll.LLDH;
+ lLDReturnRoots.MSGCODE = 0;
+ lLDReturnRoots.MSGDESP = $"鎴愬姛";
+ iTEMs.Add(lLDReturnRoots);
db.CommitTran();
}
@@ -3240,6 +3498,17 @@
S_BATCH_NO = a.S_BATCH_NO,
S_SERIAL_NO = a.S_SERIAL_NO,
S_CGPZH = a.S_CGPZH,
+ S_ZJBM = a.S_ZJBM,
+ S_YLBH = a.S_YLBH,
+ S_ZJWLTH = a.S_ZJWLTH,
+ S_ZJWLMS = a.S_ZJWLMS,
+ S_ZHFHBS = a.S_ZHFHBS,
+ S_CJRQ = a.S_CJRQ,
+ S_LLDSCBS = a.S_LLDSCBS,
+ S_SCGLY = a.S_SCGLY,
+ S_GXH = a.S_GXH,
+ S_XQRQ = a.S_XQRQ,
+ S_YLXMH = a.S_YLXMH,
S_CGPZXMBH = a.S_CGPZXMBH,
S_ERP_WH_CODE = a.S_ERP_WH_CODE,
N_ITEM_STATE = a.N_ITEM_STATE
--
Gitblit v1.9.1