From 150b2843db8bf76a35615aa46c17f59df1a0f0f4 Mon Sep 17 00:00:00 2001
From: 杨张扬 <634643841@qq.com>
Date: 星期三, 28 五月 2025 17:25:04 +0800
Subject: [PATCH] 双钱-搬送流程记录班次字段
---
wms/LocationHelper.cs | 5 +++--
core/Monitor.cs | 3 ++-
api/ApiHelper.cs | 42 +++++++++++++++++++++++++-----------------
api/ApiModel.cs | 4 ++++
4 files changed, 34 insertions(+), 20 deletions(-)
diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index 9b86ead..4040d48 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);
});
@@ -775,7 +777,7 @@
WEIGHT = modelWeight,
ITEMSTATE = "寰呮",
LOGINNAME = model.staff,
- SHIFT = "None",
+ SHIFT = model.shift,
STARTLOC = startLoc.S_CODE,
};
SpecHelper.InsertEquipProDetail(target);
@@ -791,7 +793,7 @@
WEIGHT = modelWeight,
ITEMSTATE = "寰呮",
LOGINNAME = model.staff,
- SHIFT = "None",
+ SHIFT = model.shift,
};
SpecHelper.InsertInventoryM(target);
});
@@ -1026,6 +1028,7 @@
WEIGHT = cgInfo.F_QTY,
SPEC = model.Spe,
TASKNO = taskNo,
+ SHIFT = model.shift,
};
SpecHelper.InsertComponentDetail(target);
});
@@ -1277,7 +1280,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 +1297,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 +1681,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 +1698,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 +1718,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 +1733,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 +1807,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 +1841,7 @@
ITEMSTATE = cginfo.S_ITEM_STATE,
ITEMCODE = cginfo.S_ITEM_CODE,
LOGINNAME = model.staff,
- SHIFT = "None",
+ SHIFT = model.shift,
};
SpecHelper.InsertInventoryM(target);
}
diff --git a/api/ApiModel.cs b/api/ApiModel.cs
index cab31b1..5ca2ce0 100644
--- a/api/ApiModel.cs
+++ b/api/ApiModel.cs
@@ -399,6 +399,7 @@
public string EndLoc { get; set; }//缁堢偣
public string Spe { get; set; }//瑙勬牸
public string staff { get; set; } = "None";//鎿嶄綔浜�+ public string shift { get; set; } = "None";//鐝
}
public class EmptyInStackAreaInfo
@@ -416,6 +417,7 @@
public string cntID { get; set; }//瀹瑰櫒ID
public string staff { get; set; } = "None";//鎿嶄綔浜�+ public string shift { get; set; } = "None";//鐝
}
public class SplitOutWarehouseInfo
@@ -434,6 +436,7 @@
public string new_StartLoc { get; set; }//鏂板鍣↖D璧风偣
public int new_IsOK { get; set; }//鏂板鍣↖D鐨勮揣鍝佺殑0鍚堟牸1涓嶅悎鏍硷紵
public string staff { get; set; } = "None";//鎿嶄綔浜�+ public string shift { get; set; } = "None";//鐝
}
public class UpCgDetailModel
@@ -450,6 +453,7 @@
public string startLoc { get; set; }//璧风偣
public string endLoc { get; set; }//缁堢偣
public string staff { get; set; } = "None";//鎿嶄綔浜�+ public string shift { get; set; } = "None";//鐝
}
}
}
diff --git a/core/Monitor.cs b/core/Monitor.cs
index 4926007..ac0b0fb 100644
--- a/core/Monitor.cs
+++ b/core/Monitor.cs
@@ -467,7 +467,8 @@
SPEC = outTimeCg.S_SPE,
CARCODE = outTimeCg.S_CAR_CODE,
WEIGHT = outTimeCg.F_QTY,
- REMELTTIME = DateTime.Now
+ REMELTTIME = DateTime.Now,
+ SHIFT = "None",
};
SpecHelper.InsertRemeltDetail(target);
});
diff --git a/wms/LocationHelper.cs b/wms/LocationHelper.cs
index a4c680e..f159708 100644
--- a/wms/LocationHelper.cs
+++ b/wms/LocationHelper.cs
@@ -565,6 +565,7 @@
public string Spe { get; set; }//瑙勬牸
public string CarCode { get; set; }//杞﹀彿
public string staff { get; set; } = "None";//鎿嶄綔浜�+ public string shift { get; set; } = "None";//鐝
}
public class ErrorLocCntResetInfo
@@ -584,6 +585,7 @@
public int cgState { get; set; }//鐗╂枡鐘舵�
public string staff { get; set; } = "None";//鎿嶄綔浜�+ public string shift { get; set; } = "None";//鐝
}
public class ShowCntCountBySpeInfo
@@ -597,9 +599,8 @@
public class PDAReturnResetInfo
{
public string rfId { get; set; }//瀹瑰櫒鍙�-
public string startLoc { get; set; }//璧风偣璐т綅
-
public string staff { get; set; } = "None";//鎿嶄綔浜�+ public string shift { get; set; } = "None";//鐝
}
}
--
Gitblit v1.9.1