回写逻辑修改

ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSManufactureService.cs

@@ -128,8 +128,10 @@ namespace ICSSoft.DataProject
                             foreach (var detail in resdetail)
                             {
                                 JObject det = (JObject)detail;
+                                string allcol = jo["cWhCode"].ToString() + det["ProjectCode"].ToString() + det["BatchCode"].ToString() + det["Version"].ToString() + det["Brand"].ToString() + det["cFree1"].ToString() + det["cFree2"].ToString() + det["cFree3"].ToString() + det["cFree4"].ToString() + det["cFree5"].ToString()
+                                    + det["cFree6"].ToString() + det["cFree7"].ToString() + det["cFree8"].ToString() + det["cFree9"].ToString() + det["cFree10"].ToString();
                                 ICSWareHouseLotInfoService.WareHouseLotInfoLogUpdate(TransType, det["SourceDetailID"].ToString(), Identification, jo["ID"].ToString(),
-                                    det["DetailID"].ToString(), jo["IssueCode"].ToString(), det["Sequence"].ToString(), cmd, language);
+                                    det["DetailID"].ToString(), jo["IssueCode"].ToString(), det["Sequence"].ToString(), allcol,cmd, language);
                             }
                         }
                     }
@@ -255,8 +257,10 @@ namespace ICSSoft.DataProject
                             foreach (var detail in resdetail)
                             {
                                 JObject det = (JObject)detail;
+                                string allcol = jo["cWhCode"].ToString() + det["ProjectCode"].ToString() + det["BatchCode"].ToString() + det["Version"].ToString() + det["Brand"].ToString() + det["cFree1"].ToString() + det["cFree2"].ToString() + det["cFree3"].ToString() + det["cFree4"].ToString() + det["cFree5"].ToString()
+                                    + det["cFree6"].ToString() + det["cFree7"].ToString() + det["cFree8"].ToString() + det["cFree9"].ToString() + det["cFree10"].ToString();
                                 ICSWareHouseLotInfoService.WareHouseLotInfoLogUpdate(TransType, det["SourceDetailID"].ToString(), Identification, jo["ID"].ToString(),
-                                    det["DetailID"].ToString(), jo["IssueCode"].ToString(), det["Sequence"].ToString(), cmd, language);
+                                    det["DetailID"].ToString(), jo["IssueCode"].ToString(), det["Sequence"].ToString(), allcol, cmd, language);
                             }
                         }
                     }
@@ -370,7 +374,7 @@ namespace ICSSoft.DataProject
                     {
                         foreach (DataRow dr in dt.Rows)
                         {
-                            ICSWareHouseLotInfoService.WareHouseLotInfoLogUpdate(TransType, dr["ID"].ToString(), Identification, "", "", "", "", cmd, language);
+                            ICSWareHouseLotInfoService.WareHouseLotInfoLogUpdate(TransType, dr["ID"].ToString(), Identification, "", "", "", "", "",cmd, language);
                         }
                     }
                     catch (Exception ex)
@@ -687,8 +691,11 @@ namespace ICSSoft.DataProject
                             foreach (var detail in resdetail)
                             {
                                 JObject det = (JObject)detail;
+                                string allcol = jo["cWhCode"].ToString() + det["ProjectCode"].ToString() + det["BatchCode"].ToString() + det["Version"].ToString() + det["Brand"].ToString() + det["cFree1"].ToString() + det["cFree2"].ToString() + det["cFree3"].ToString() + det["cFree4"].ToString() + det["cFree5"].ToString()
+                                    + det["cFree6"].ToString() + det["cFree7"].ToString() + det["cFree8"].ToString() + det["cFree9"].ToString() + det["cFree10"].ToString();
                                 ICSWareHouseLotInfoService.WareHouseLotInfoLogUpdate(TransType, det["SourceDetailID"].ToString(), Identification, jo["ID"].ToString(),
-                                    det["DetailID"].ToString(), jo["IssueNEGCode"].ToString(), det["Sequence"].ToString(), cmd, language);
+                                    det["DetailID"].ToString(), jo["IssueNEGCode"].ToString(), det["Sequence"].ToString(), allcol, cmd, language);
+                               
                             }
                         }
                     }
@@ -828,13 +835,13 @@ namespace ICSSoft.DataProject
                             {
                                 JObject det = (JObject)detail;
                                 ICSWareHouseLotInfoService.WareHouseLotInfoLogUpdate(TransType, det["MODetailID"].ToString(), Identification, jo["ID"].ToString(),
-                                    det["DetailID"].ToString(), jo["MRCVCode"].ToString(), det["Sequence"].ToString(), cmd, language);
+                                    det["DetailID"].ToString(), jo["MRCVCode"].ToString(), det["Sequence"].ToString(),"", cmd, language);
                                 JArray resdetails = (JArray)JsonConvert.DeserializeObject(det["detailss"].ToString());
                                 foreach (var details in resdetails)
                                 {
                                     JObject dets = (JObject)details;
                                     ICSWareHouseLotInfoService.WareHouseLotInfoLogUpdate(TransType, det["MODetailID"].ToString(), Identification, det["ERPID"].ToString(),
-                                        dets["ERPDetailID"].ToString(), dets["MRCVCode"].ToString(), dets["Sequence"].ToString(), cmd, language);
+                                        dets["ERPDetailID"].ToString(), dets["MRCVCode"].ToString(), dets["Sequence"].ToString(),"", cmd, language);
                                 }
                             }
                         }
@@ -949,7 +956,7 @@ namespace ICSSoft.DataProject
                     {
                         foreach (DataRow dr in dt.Rows)
                         {
-                            ICSWareHouseLotInfoService.WareHouseLotInfoLogUpdate(TransType, dr["ID"].ToString(), Identification, "", "", "", "", cmd, language);
+                            ICSWareHouseLotInfoService.WareHouseLotInfoLogUpdate(TransType, dr["ID"].ToString(), Identification, "", "", "", "", "",cmd, language);
                         }
                     }
                     catch (Exception ex)
@@ -1082,8 +1089,9 @@ namespace ICSSoft.DataProject
                             foreach (var detail in resdetail)
                             {
                                 JObject det = (JObject)detail;
+                                string col = "";
                                 ICSWareHouseLotInfoService.WareHouseLotInfoLogUpdate(TransType, det["MODetailID"].ToString(), Identification, jo["ID"].ToString(),
-                                    det["DetailID"].ToString(), jo["MRCVCode"].ToString(), det["Sequence"].ToString(), cmd, language);
+                                    det["DetailID"].ToString(), jo["MRCVCode"].ToString(), det["Sequence"].ToString(), col, cmd, language);
                             }
                         }
                     }

ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSOutsourcingService.cs

@@ -127,8 +127,11 @@ namespace ICSSoft.DataProject
                             foreach (var detail in resdetail)
                             {
                                 JObject det = (JObject)detail;
+
+                                string allcol = jo["cWhCode"].ToString() + det["ProjectCode"].ToString() + det["BatchCode"].ToString() + det["Version"].ToString() + det["Brand"].ToString() + det["cFree1"].ToString() + det["cFree2"].ToString() + det["cFree3"].ToString() + det["cFree4"].ToString() + det["cFree5"].ToString()
+                                    + det["cFree6"].ToString() + det["cFree7"].ToString() + det["cFree8"].ToString() + det["cFree9"].ToString() + det["cFree10"].ToString();
                                 ICSWareHouseLotInfoService.WareHouseLotInfoLogUpdate(TransType, det["SourceDetailID"].ToString(), Identification, jo["ID"].ToString(),
-                                    det["DetailID"].ToString(), jo["IssueCode"].ToString(), det["Sequence"].ToString(), cmd, language);
+                                    det["DetailID"].ToString(), jo["IssueCode"].ToString(), det["Sequence"].ToString(), allcol,cmd, language);
                             }
                         }
                     }
@@ -255,7 +258,7 @@ namespace ICSSoft.DataProject
                             {
                                 JObject det = (JObject)detail;
                                 ICSWareHouseLotInfoService.WareHouseLotInfoLogUpdate(TransType, det["SourceDetailID"].ToString(), Identification, jo["ID"].ToString(),
-                                    det["DetailID"].ToString(), jo["IssueCode"].ToString(), det["Sequence"].ToString(), cmd, language);
+                                    det["DetailID"].ToString(), jo["IssueCode"].ToString(), det["Sequence"].ToString(),"", cmd, language);
                             }
                         }
                     }
@@ -367,7 +370,7 @@ namespace ICSSoft.DataProject
                     {
                         foreach (DataRow dr in dt.Rows)
                         {
-                            ICSWareHouseLotInfoService.WareHouseLotInfoLogUpdate(TransType, dr["ID"].ToString(), Identification, "", "", "", "", cmd, language);
+                            ICSWareHouseLotInfoService.WareHouseLotInfoLogUpdate(TransType, dr["ID"].ToString(), Identification, "", "", "", "", "", cmd, language);
                         }
                     }
                     catch (Exception ex)
@@ -686,7 +689,7 @@ namespace ICSSoft.DataProject
                             {
                                 JObject det = (JObject)detail;
                                 ICSWareHouseLotInfoService.WareHouseLotInfoLogUpdate(TransType, det["SourceDetailID"].ToString(), Identification, jo["ID"].ToString(),
-                                    det["DetailID"].ToString(), jo["IssueNEGCode"].ToString(), det["Sequence"].ToString(), cmd, language);
+                                    det["DetailID"].ToString(), jo["IssueNEGCode"].ToString(), det["Sequence"].ToString(), "",cmd, language);
                             }
                         }
                         //List<ICSERPReturnIssueNEG> negList = JsonConvert.DeserializeObject<List<ICSERPReturnIssueNEG>>(result.Data.ToString());
@@ -917,13 +920,13 @@ namespace ICSSoft.DataProject
                             {
                                 JObject det = (JObject)detail;
                                 ICSWareHouseLotInfoService.WareHouseLotInfoLogUpdate(TransType, det["OODetailID"].ToString(), Identification, jo["ID"].ToString(),
-                                    det["DetailID"].ToString(), jo["ORCVTCode"].ToString(), det["Sequence"].ToString(), cmd, language);
+                                    det["DetailID"].ToString(), jo["ORCVTCode"].ToString(), det["Sequence"].ToString(), "",cmd, language);
                                 JArray resdetails = (JArray)JsonConvert.DeserializeObject(det["detailss"].ToString());
                                 foreach (var details in resdetails)
                                 {
                                     JObject dets = (JObject)details;
                                     ICSWareHouseLotInfoService.WareHouseLotInfoLogUpdate(TransType, det["OODetailID"].ToString(), Identification, det["ERPID"].ToString(),
-                                        dets["ERPDetailID"].ToString(), dets["MRCVCode"].ToString(), dets["Sequence"].ToString(), cmd, language);
+                                        dets["ERPDetailID"].ToString(), dets["MRCVCode"].ToString(), dets["Sequence"].ToString(), "", cmd, language);
                                 }
                             }
                         }
@@ -1055,7 +1058,7 @@ namespace ICSSoft.DataProject
                             {
                                 JObject det = (JObject)detail;
                                 ICSWareHouseLotInfoService.WareHouseLotInfoLogUpdate(TransType, det["ODNDetailID"].ToString(), Identification, jo["ID"].ToString(),
-                                    det["DetailID"].ToString(), jo["ORCVTCode"].ToString(), det["Sequence"].ToString(), cmd, language);
+                                    det["DetailID"].ToString(), jo["ORCVTCode"].ToString(), det["Sequence"].ToString(), "",cmd, language);
                             }
                         }
                     }
@@ -1393,7 +1396,7 @@ namespace ICSSoft.DataProject
                             {
                                 JObject det = (JObject)detail;
                                 ICSWareHouseLotInfoService.WareHouseLotInfoLogUpdate(TransType, det["ODNRTDetailID"].ToString(), Identification, jo["ID"].ToString(),
-                                    det["DetailID"].ToString(), jo["ORCVNEGCode"].ToString(), det["Sequence"].ToString(), cmd, language);
+                                    det["DetailID"].ToString(), jo["ORCVNEGCode"].ToString(), det["Sequence"].ToString(),"", cmd, language);
                             }
                         }
                     }
@@ -1505,7 +1508,7 @@ namespace ICSSoft.DataProject
                     {
                         foreach (DataRow dr in dt.Rows)
                         {
-                            ICSWareHouseLotInfoService.WareHouseLotInfoLogUpdate(TransType, dr["ID"].ToString(), Identification, "", "", "", "", cmd, language);
+                            ICSWareHouseLotInfoService.WareHouseLotInfoLogUpdate(TransType, dr["ID"].ToString(), Identification, "", "", "", "", "", cmd, language);
                         }
                     }
                     catch (Exception ex)

ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSWareHouseLotInfoService.cs

@@ -1551,7 +1551,7 @@ namespace ICSSoft.DataProject
         /// <param name="Code"></param>
         /// <param name="Sequence"></param>
         /// <param name="cmd"></param>
-        public static void WareHouseLotInfoLogUpdate(string TransType, string SourceDetailID, string Identification, string ID, string DetailID, string Code, string Sequence, SqlCommand cmd, Dictionary<string, string> language)
+        public static void WareHouseLotInfoLogUpdate(string TransType, string SourceDetailID, string Identification, string ID, string DetailID, string Code, string Sequence, string col, SqlCommand cmd, Dictionary<string, string> language)
         {
             string ERPupdate = string.Empty;
             try