Merge branch 'master' of http://119.3.29.177:3000/Jjie/OMAY_WMS

ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs

@@ -3185,6 +3185,7 @@ a.ExtensionID
                                                 a.Quantity*(a.Amount/a.Quantity) AS Amount,
                                                 {0},{2},
                                                 lotdd.TransCode,lotdd.TransSequence,
+                                                a.Type,
                                                 {3}
                                                 {1}
                                                 ext.BatchCode AS BatchCode,";
@@ -3199,6 +3200,7 @@ a.ExtensionID
                                     columns = @"a.Quantity AS Quantity,
                                                 a.Quantity*(a.Amount/a.Quantity) AS Amount,
                                                 {0},{2},
+                                                a.Type,
                                                 {3}
                                                 {1}
                                                 ext.BatchCode AS BatchCode,";
@@ -3832,7 +3834,7 @@ a.ExtensionID
                                 }
                                 #endregion
 
-                                #region 副产品入库
+                                #region 副产品入库(无源头)
                                 else if (TransType == TransTypeEnum.MOStockINByProductNoTrans.GetDescription())
                                 {
                                     log.Debug("无源头副产品入库" + TransType);