From 150b2843db8bf76a35615aa46c17f59df1a0f0f4 Mon Sep 17 00:00:00 2001
From: 杨张扬 <634643841@qq.com>
Date: 星期三, 28 五月 2025 17:25:04 +0800
Subject: [PATCH] 双钱-搬送流程记录班次字段

---
 api/ApiHelper.cs |  350 ++++++++++++++++++++++++++++-----------------------------
 1 files changed, 171 insertions(+), 179 deletions(-)

diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index a8b37e2..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);
                         });
@@ -640,204 +642,188 @@
                 var startPoint = Settings.ProductionLines.FirstOrDefault(a => a.PointOut == model.StartLoc);
                 if (startPoint != null)//璧风偣瀛樺湪
                 {
-                    var woInfo = db.Queryable<TN_WorkOrder>().Where(a => a.S_LINE_NO == startPoint.ProductionLine_Name && a.S_B_STATE == "寮�惎").OrderBy(b => b.T_CREATE, OrderByType.Desc).First();
-
-                    if (woInfo != null)//褰撳墠浜х嚎涓嶅瓨鍦ㄥ紑鍚殑鏈�柊鐨勫伐鍗�+                    var startLoc = db.Queryable<TN_Location>().First(a => a.S_LOCK_STATE == "鏃� && a.N_LOCK_STATE == 0 && a.S_CODE == model.StartLoc && a.C_ENABLE == "Y");
+                    if (startLoc != null)//璇ヤ骇绾跨殑璧风偣娌¢攣浣�                     {
-                        var startLoc = db.Queryable<TN_Location>().First(a => a.S_LOCK_STATE == "鏃� && a.N_LOCK_STATE == 0 && a.S_CODE == model.StartLoc && a.C_ENABLE == "Y");
-                        if (startLoc != null)//璇ヤ骇绾跨殑璧风偣娌¢攣浣�+                        var cgInfo = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == model.RfId);
+                        if (cgInfo != null)//鏈夋畫鐣欑殑瀹瑰櫒璐у搧鏄庣粏鍏崇郴琛ㄤ俊鎭�                         {
-                            var cgInfo = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == model.RfId);
-                            if (cgInfo != null)//鏈夋畫鐣欑殑瀹瑰櫒璐у搧鏄庣粏鍏崇郴琛ㄤ俊鎭�+                            result.resultCode = 1;
+                            result.resultMsg = $"璇ュ鍣▄model.RfId}宸茬粦瀹氳揣鍝亄cgInfo.S_ITEM_CODE}锛屽鏋滆浣跨敤锛屽鍣ㄥ厛瑙g粦璐у搧";
+                            LogHelper.Info(result.resultMsg);
+                            return result;
+                        }
+                        else
+                        {
+                            var locCntrRel = db.Queryable<TN_Loc_Container>().First(a => a.S_CNTR_CODE == model.RfId);
+                            if (locCntrRel != null)//褰撳墠瀹瑰櫒鏄惁缁戝畾浜嗚揣浣�                             {
-                                result.resultCode = 1;
-                                result.resultMsg = $"璇ュ鍣▄model.RfId}宸茬粦瀹氳揣鍝亄cgInfo.S_ITEM_CODE}锛屽鏋滆浣跨敤锛屽鍣ㄥ厛瑙g粦璐у搧";
+                                result.resultCode = 2;
+                                result.resultMsg = $"璇ュ鍣▄model.RfId}宸茬粦瀹氳揣浣峽locCntrRel.S_LOC_CODE}锛屽鏋滆浣跨敤锛屽鍣ㄥ厛瑙g粦璐т綅";
                                 LogHelper.Info(result.resultMsg);
                                 return result;
                             }
                             else
                             {
-                                var locCntrRel = db.Queryable<TN_Loc_Container>().First(a => a.S_CNTR_CODE == model.RfId);
-                                if (locCntrRel != null)//褰撳墠瀹瑰櫒鏄惁缁戝畾浜嗚揣浣�+                                //鏂板璐т綅瀹瑰櫒鍏崇郴琛�+                                locCntrRel = new TN_Loc_Container()
                                 {
-                                    result.resultCode = 2;
-                                    result.resultMsg = $"璇ュ鍣▄model.RfId}宸茬粦瀹氳揣浣峽locCntrRel.S_LOC_CODE}锛屽鏋滆浣跨敤锛屽鍣ㄥ厛瑙g粦璐т綅";
+                                    S_LOC_CODE = startPoint.PointOut,
+                                    S_CNTR_CODE = model.RfId,
+                                };
+
+                                var readBytes1 = S7Helper.ReadBytes(startPoint.ProductionLine_IP, 20, 2, 4);
+                                byte[] rfid = new byte[4] { readBytes1[0], readBytes1[1], readBytes1[2], readBytes1[3] };
+                                string rfids16 = BitConverter.ToString(rfid);
+                                string rfids = (((readBytes1[0]) << 24) + (readBytes1[1] << 16) + (readBytes1[2] << 8) + readBytes1[3]).ToString();
+                                LogHelper.Info($"浜х嚎瀹瑰櫒鍙凤細{rfids}锛屽叾16杩涘埗褰㈠紡锛歿rfids16}");
+
+                                if (rfids != model.RfId)
+                                {
+                                    result.resultCode = 9;
+                                    result.resultMsg = $"PDA濉叆鐨勫鍣ㄥ彿{model.RfId}涓嶴7浜х嚎閫氳鐨勫鍣ㄥ彿{rfids}涓嶅悓";
                                     LogHelper.Info(result.resultMsg);
                                     return result;
                                 }
-                                else
+                                var readBytes2 = S7Helper.ReadBytes(startPoint.ProductionLine_IP, 20, 26, 2);
+                                var modelWeight = ((readBytes2[0]) << 8) + readBytes2[1];
+
+                                var modelCI = db.Queryable<TN_CAR_IN>().First(i => i.S_CAR_CODE == model.CarCode && i.S_CNTR_CODE == model.RfId && i.S_B_STATE == "0");//鏌ヨ鏄惁鏈夎繖涓搴旂殑涓旂姸鎬佹甯哥殑瀹瑰櫒杞﹀彿瀛愯〃
+
+                                TN_CG_Detail tN_CG_Detail = new TN_CG_Detail()//鏂板瀹瑰櫒璐у搧鏄庣粏琛�                                 {
-                                    //鏂板璐т綅瀹瑰櫒鍏崇郴琛�-                                    locCntrRel = new TN_Loc_Container()
+                                    S_CNTR_CODE = model.RfId,
+                                    S_ITEM_SPEC = model.Spe,
+                                    S_SPE = model.Spe,
+                                    S_CAR_CODE = model.CarCode,
+                                    N_ITEM_STATE = 1,
+                                    S_ITEM_STATE = "寰呮",
+                                    F_QTY = modelWeight,//杩欓噷鐨勯噸閲忚褰撴垚鏁伴噺鏉ヤ娇鐢�+                                };
+
+                                var endLoc = db.Queryable<TN_Location>().
+                                                      Where(c => c.S_AREA_CODE == Settings.Areas[1] && c.S_LOCK_STATE == "鏃� && c.N_LOCK_STATE == 0 && c.N_CURRENT_NUM == 0 && c.C_ENABLE == "Y").
+                                                      OrderBy(o => o.T_MODIFY, OrderByType.Asc).First();//鏌ヨ鍚堥�鐨勭粓鐐硅揣浣嶏紝鐩存帴鍒ゆ柇褰撳墠鏁伴噺涓�鍗冲彲
+
+                                if (endLoc != null)
+                                {
+                                    var task1 = new TN_Task()
                                     {
-                                        S_LOC_CODE = startPoint.PointOut,
+                                        S_CODE = WCSHelper.GenerateTaskNo(),
+                                        S_START_AREA = startLoc.S_AREA_CODE,
+                                        S_END_AREA = endLoc.S_AREA_CODE,
+                                        S_START_LOC = startLoc.S_CODE,
+                                        S_END_LOC = endLoc.S_CODE,
+                                        S_TYPE = "PDA婊℃墭涓嬬嚎鍏ュ簱",
+                                        N_B_STATE = 0,
                                         S_CNTR_CODE = model.RfId,
+                                        S_SPEC = model.Spe,
                                     };
 
-                                    var readBytes1 = S7Helper.ReadBytes(startPoint.ProductionLine_IP, 20, 2, 4);
-                                    byte[] rfid = new byte[4] { readBytes1[0], readBytes1[1], readBytes1[2], readBytes1[3] };
-                                    string rfids16 = BitConverter.ToString(rfid);
-                                    string rfids = (((readBytes1[0]) << 24) + (readBytes1[1] << 16) + (readBytes1[2] << 8) + readBytes1[3]).ToString();
-                                    LogHelper.Info($"浜х嚎瀹瑰櫒鍙凤細{rfids}锛屽叾16杩涘埗褰㈠紡锛歿rfids16}");
+                                    startLoc.N_LOCK_STATE = 2;
+                                    startLoc.S_LOCK_STATE = "鍑哄簱閿�;
+                                    startLoc.N_CURRENT_NUM = 1;
+                                    startLoc.T_MODIFY = DateTime.Now;
 
-                                    if (rfids != model.RfId)
+                                    endLoc.N_LOCK_STATE = 1;
+                                    endLoc.S_LOCK_STATE = "鍏ュ簱閿�;
+                                    startLoc.T_MODIFY = DateTime.Now;
+
+                                    using (var tran = db.Ado.UseTran())
                                     {
-                                        result.resultCode = 9;
-                                        result.resultMsg = $"PDA濉叆鐨勫鍣ㄥ彿{model.RfId}涓嶴7浜х嚎閫氳鐨勫鍣ㄥ彿{rfids}涓嶅悓";
-                                        LogHelper.Info(result.resultMsg);
-                                        return result;
-                                    }
-                                    var readBytes2 = S7Helper.ReadBytes(startPoint.ProductionLine_IP, 20, 26, 2);
-                                    var modelWeight = ((readBytes2[0]) << 8) + readBytes2[1];
-
-                                    var modelCI = db.Queryable<TN_CAR_IN>().First(i => i.S_CAR_CODE == model.CarCode && i.S_CNTR_CODE == model.RfId && i.S_B_STATE == "0");//鏌ヨ鏄惁鏈夎繖涓搴旂殑涓旂姸鎬佹甯哥殑瀹瑰櫒杞﹀彿瀛愯〃
-                                    
-                                    TN_CG_Detail tN_CG_Detail = new TN_CG_Detail()//鏂板瀹瑰櫒璐у搧鏄庣粏琛�-                                    {
-                                        S_CNTR_CODE = model.RfId,
-                                        S_ITEM_CODE = woInfo.S_ITEM_CODE,
-                                        S_BATCH_NO = woInfo.S_BATCH_CODE,
-                                        S_ITEM_SPEC = woInfo.S_ITEM_SPEC,
-                                        S_SPE= woInfo.S_ITEM_SPEC,
-                                        S_CAR_CODE = model.CarCode,
-                                        N_ITEM_STATE = 1,
-                                        S_ITEM_STATE = "寰呮",
-                                        F_QTY = modelWeight,//杩欓噷鐨勯噸閲忚褰撴垚鏁伴噺鏉ヤ娇鐢�-                                    };
-
-                                    var endLoc = db.Queryable<TN_Location>().
-                                                          Where(c => c.S_AREA_CODE == Settings.Areas[1] && c.S_LOCK_STATE == "鏃� && c.N_LOCK_STATE == 0 && c.N_CURRENT_NUM == 0 && c.C_ENABLE == "Y").
-                                                          OrderBy(o => o.T_MODIFY, OrderByType.Asc).First();//鏌ヨ鍚堥�鐨勭粓鐐硅揣浣嶏紝鐩存帴鍒ゆ柇褰撳墠鏁伴噺涓�鍗冲彲
-
-                                    if (endLoc != null)
-                                    {
-                                        var task1 = new TN_Task()
+                                        if (modelCI == null)//瀹瑰櫒杞﹀彿瀛愯〃涓嶅瓨鍦�                                         {
-                                            S_CODE = WCSHelper.GenerateTaskNo(),
-                                            S_START_AREA = startLoc.S_AREA_CODE,
-                                            S_END_AREA = endLoc.S_AREA_CODE,
-                                            S_START_LOC = startLoc.S_CODE,
-                                            S_END_LOC = endLoc.S_CODE,
-                                            S_TYPE = "PDA婊℃墭涓嬬嚎鍏ュ簱",
-                                            N_B_STATE = 0,
-                                            S_CNTR_CODE = model.RfId,
-                                            S_SPEC = model.Spe,
-                                        };
-
-                                        startLoc.N_LOCK_STATE = 2;
-                                        startLoc.S_LOCK_STATE = "鍑哄簱閿�;
-                                        startLoc.N_CURRENT_NUM = 1;
-                                        startLoc.T_MODIFY = DateTime.Now;
-
-                                        endLoc.N_LOCK_STATE = 1;
-                                        endLoc.S_LOCK_STATE = "鍏ュ簱閿�;
-                                        startLoc.T_MODIFY = DateTime.Now;
-
-                                        using (var tran = db.Ado.UseTran())
-                                        {
-                                            if (modelCI == null)//瀹瑰櫒杞﹀彿瀛愯〃涓嶅瓨鍦�+                                            modelCI = new TN_CAR_IN()
                                             {
-                                                modelCI = new TN_CAR_IN()
-                                                {
-                                                    S_CNTR_CODE = model.RfId,
-                                                    S_CAR_CODE = model.CarCode,
-                                                    S_B_STATE = "0",
-                                                };
-                                                if (db.Insertable<TN_CAR_IN>(modelCI).ExecuteCommand() <= 0)
-                                                {
-                                                    tran.RollbackTran();
-                                                    result.resultCode = 8;
-                                                    result.resultMsg = $"鏂板鐨凾N_CAR_IN琛ㄦ彃鍏ュけ璐ワ紝瀹瑰櫒锛歿modelCI.S_CNTR_CODE}锛岃溅鍙凤細{modelCI.S_CAR_CODE}";
-                                                    LogHelper.Info(result.resultMsg);
-                                                    return result;
-                                                }
-                                            }
-
-                                            if (db.Insertable<TN_Task>(task1).ExecuteCommand() > 0 &&
-                                                db.Updateable<TN_Location>(startLoc).ExecuteCommand() > 0 &&
-                                                db.Updateable<TN_Location>(endLoc).ExecuteCommand() > 0 &&
-                                                db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() > 0 &&
-                                                db.Insertable<TN_CG_Detail>(tN_CG_Detail).ExecuteCommand() > 0)//鍒涘缓鎼�浠诲姟锛岃捣鐐圭粓鐐瑰鍣�-                                            {
-                                                tran.CommitTran();
-                                                result.resultCode = 0;
-                                                result.resultMsg = "鎴愬姛";
-                                                LogHelper.Info($"鐢熸垚PDA婊℃墭涓嬬嚎鍏ュ簱浠诲姟鎴愬姛锛屽鍣細{modelCI.S_CNTR_CODE}锛岃捣鐐癸細{startPoint.PointOut}锛岀粓鐐癸細{endLoc.S_CODE}");
-
-                                                Task task99 = Task.Run(() =>
-                                                {
-                                                    WMSHelper.InsertOpInfo(model.staff, "PDA婊℃墭涓嬬嚎鍏ュ簱", modelCI.S_CNTR_CODE);
-                                                });
-
-                                                Task task98 = Task.Run(() =>
-                                                {
-                                                    var target = new TN_EquipProDetail()
-                                                    {
-                                                        S_ID = tN_CG_Detail.S_ID,
-                                                        TASKTYPE = "PDA婊℃墭涓嬬嚎鍏ュ簱",
-                                                        RFID = model.RfId,
-                                                        SPEC = woInfo.S_ITEM_SPEC,
-                                                        CARCODE = model.CarCode,
-                                                        WEIGHT = modelWeight,
-                                                        ITEMSTATE = "寰呮",
-                                                        ITEMCODE = woInfo.S_ITEM_CODE,
-                                                        LOGINNAME = model.staff,
-                                                        SHIFT = "None",
-                                                        STARTLOC = startLoc.S_CODE,
-                                                    };
-                                                    SpecHelper.InsertEquipProDetail(target);
-                                                });
-
-                                                Task task27 = Task.Run(() =>
-                                                {
-                                                    var target = new TN_InventoryM()
-                                                    {
-                                                        S_ID = tN_CG_Detail.S_ID,
-                                                        RFID = model.RfId,
-                                                        SPEC = woInfo.S_ITEM_SPEC,
-                                                        WEIGHT = modelWeight,
-                                                        ITEMSTATE = "寰呮",
-                                                        ITEMCODE = woInfo.S_ITEM_CODE,
-                                                        LOGINNAME = model.staff,
-                                                        SHIFT = "None",
-                                                    };
-                                                    SpecHelper.InsertInventoryM(target);
-                                                });
-
-                                                return result;
-                                            }
-                                            else
+                                                S_CNTR_CODE = model.RfId,
+                                                S_CAR_CODE = model.CarCode,
+                                                S_B_STATE = "0",
+                                            };
+                                            if (db.Insertable<TN_CAR_IN>(modelCI).ExecuteCommand() <= 0)
                                             {
                                                 tran.RollbackTran();
-                                                result.resultCode = 7;
-                                                result.resultMsg = $"鐢熸垚婊℃墭涓嬬嚎鍏ュ簱浠诲姟澶辫触锛屽鍣細{modelCI.S_CNTR_CODE}锛岃捣鐐癸細{startPoint.PointOut}锛岀粓鐐癸細{endLoc.S_CODE}";
+                                                result.resultCode = 8;
+                                                result.resultMsg = $"鏂板鐨凾N_CAR_IN琛ㄦ彃鍏ュけ璐ワ紝瀹瑰櫒锛歿modelCI.S_CNTR_CODE}锛岃溅鍙凤細{modelCI.S_CAR_CODE}";
                                                 LogHelper.Info(result.resultMsg);
                                                 return result;
                                             }
                                         }
-                                    }
-                                    else
-                                    {
-                                        result.resultCode = 4;
-                                        result.resultMsg = $"鏈壘鍒板悎閫傜殑缁堢偣锛屽鍣細{modelCI.S_CNTR_CODE}";
-                                        LogHelper.Info(result.resultMsg);
-                                        return result;
+
+                                        if (db.Insertable<TN_Task>(task1).ExecuteCommand() > 0 &&
+                                            db.Updateable<TN_Location>(startLoc).ExecuteCommand() > 0 &&
+                                            db.Updateable<TN_Location>(endLoc).ExecuteCommand() > 0 &&
+                                            db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() > 0 &&
+                                            db.Insertable<TN_CG_Detail>(tN_CG_Detail).ExecuteCommand() > 0)//鍒涘缓鎼�浠诲姟锛岃捣鐐圭粓鐐瑰鍣�+                                        {
+                                            tran.CommitTran();
+                                            result.resultCode = 0;
+                                            result.resultMsg = "鎴愬姛";
+                                            LogHelper.Info($"鐢熸垚PDA婊℃墭涓嬬嚎鍏ュ簱浠诲姟鎴愬姛锛屽鍣細{modelCI.S_CNTR_CODE}锛岃捣鐐癸細{startPoint.PointOut}锛岀粓鐐癸細{endLoc.S_CODE}");
+
+                                            Task task99 = Task.Run(() =>
+                                            {
+                                                WMSHelper.InsertOpInfo(model.staff, "PDA婊℃墭涓嬬嚎鍏ュ簱", modelCI.S_CNTR_CODE);
+                                            });
+
+                                            Task task98 = Task.Run(() =>
+                                            {
+                                                var target = new TN_EquipProDetail()
+                                                {
+                                                    S_ID = tN_CG_Detail.S_ID,
+                                                    TASKTYPE = "PDA婊℃墭涓嬬嚎鍏ュ簱",
+                                                    RFID = model.RfId,
+                                                    SPEC = model.Spe,
+                                                    CARCODE = model.CarCode,
+                                                    WEIGHT = modelWeight,
+                                                    ITEMSTATE = "寰呮",
+                                                    LOGINNAME = model.staff,
+                                                    SHIFT = model.shift,
+                                                    STARTLOC = startLoc.S_CODE,
+                                                };
+                                                SpecHelper.InsertEquipProDetail(target);
+                                            });
+
+                                            Task task27 = Task.Run(() =>
+                                            {
+                                                var target = new TN_InventoryM()
+                                                {
+                                                    S_ID = tN_CG_Detail.S_ID,
+                                                    RFID = model.RfId,
+                                                    SPEC = model.Spe,
+                                                    WEIGHT = modelWeight,
+                                                    ITEMSTATE = "寰呮",
+                                                    LOGINNAME = model.staff,
+                                                    SHIFT = model.shift,
+                                                };
+                                                SpecHelper.InsertInventoryM(target);
+                                            });
+
+                                            return result;
+                                        }
+                                        else
+                                        {
+                                            tran.RollbackTran();
+                                            result.resultCode = 7;
+                                            result.resultMsg = $"鐢熸垚婊℃墭涓嬬嚎鍏ュ簱浠诲姟澶辫触锛屽鍣細{modelCI.S_CNTR_CODE}锛岃捣鐐癸細{startPoint.PointOut}锛岀粓鐐癸細{endLoc.S_CODE}";
+                                            LogHelper.Info(result.resultMsg);
+                                            return result;
+                                        }
                                     }
                                 }
+                                else
+                                {
+                                    result.resultCode = 4;
+                                    result.resultMsg = $"鏈壘鍒板悎閫傜殑缁堢偣锛屽鍣細{modelCI.S_CNTR_CODE}";
+                                    LogHelper.Info(result.resultMsg);
+                                    return result;
+                                }
                             }
-                        }
-                        else
-                        {
-                            result.resultCode = 9;
-                            result.resultMsg = $"姝や綅缃細{startPoint.PointOut}宸查攣浣�;
-                            LogHelper.Info(result.resultMsg);
-                            return result;
                         }
                     }
                     else
                     {
-                        result.resultCode = 10;
-                        result.resultMsg = $"褰撳墠浜х嚎{startPoint.ProductionLine_Name}浣嶇疆{startPoint.PointOut}娌℃湁寮�惎鐨勫伐鍗�;
+                        result.resultCode = 9;
+                        result.resultMsg = $"姝や綅缃細{startPoint.PointOut}宸查攣浣�;
                         LogHelper.Info(result.resultMsg);
                         return result;
                     }
@@ -1042,6 +1028,7 @@
                            WEIGHT = cgInfo.F_QTY,
                            SPEC = model.Spe,
                            TASKNO = taskNo,
+                           SHIFT = model.shift,
                         };
                         SpecHelper.InsertComponentDetail(target);
                     });
@@ -1293,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);
                     });
@@ -1309,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);
                     });
@@ -1693,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);
                                 }
@@ -1709,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);
                                 }
@@ -1728,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);
                                 }
@@ -1743,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);
                                 }
@@ -1817,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();
                 }
 
                 //鍒涘缓鐐瑰鐐逛换鍔�@@ -1849,7 +1841,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