修改副产品生成入库单记录

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

@@ -991,22 +991,27 @@ ext.cFree4,ext.cFree5,ext.cFree6,ext.cFree7,ext.cFree8,ext.cFree9,ext.cFree10,a.
                     log.Debug(sql);
                     ds = DBHelper.SQlReturnDataSet(sql, cmd);
 
-                    Inputstr = DataToJsonHelper.DataSetToJson(ds, "details", "Costre");
-                    resultStr = HTTPHelper.HttpPost(TransType, ERPUrl.ManufactureReceiveDocURL, Inputstr);
+                    string ByProductInputstr = DataToJsonHelper.DataSetToJson(ds, "details", "Costre");
+                    string byProductResultStr = HTTPHelper.HttpPost(TransType, ERPUrl.ManufactureReceiveDocURL, ByProductInputstr);
                     result = new Result();
-                    result = JsonConvert.DeserializeObject<Result>(resultStr);
+                    result = JsonConvert.DeserializeObject<Result>(byProductResultStr);
                     if (result.Success)
                     {
                         //向副产品生成入库单记录表中插入数据
+                        sql = @"SELECT a.TransCode,a.TransSequence,a.Quantity,c.BatchCode,b.InvCode,a.WorkPoint
+	                            FROM ICSWareHouseLotInfoLog a
+	                            LEFT JOIN ICSInventoryLot b ON b.LotNo=a.LotNo AND b.WorkPoint=a.WorkPoint
+	                            LEFT JOIN ICSExtension c ON c.ID=b.ExtensionID AND c.WorkPoint=a.WorkPoint
+	                            WHERE a.Identification='{0}'";
+                        DataTable dtt = DBHelper.SQlReturnData(sql, cmd);
+                        Inputstr = dtt.ToString();
                         List<MoStockInModel> moStockIns = JsonConvert.DeserializeObject<List<MoStockInModel>>(Inputstr);
                         foreach (MoStockInModel moStockIn in moStockIns)
-                        {
-                            foreach (MoStockInDetail detail in moStockIn.details)
                         {
                             try
                             {
                                 sql = @"INSERT INTO ICSMOByProductLog VALUES(NEWID(),'{0}','{1}',{2},'{3}','{4}','{5}')";
-                                    sql = string.Format(sql, moStockIn.MOCode, detail.Sequence, detail.Quantity, detail.BatchCode, detail.InvCode, moStockIn.WorkPoint);
+                                sql = string.Format(sql, moStockIn.TransCode, moStockIn.TransSequence, moStockIn.Quantity, moStockIn.BatchCode, moStockIn.InvCode, moStockIn.WorkPoint);
                                 log.Debug("向副产品生成入库单记录表中插入数据：");
                                 log.Debug(sql);
                                 DBHelper.ExecuteNonQuery(sql, cmd);
@@ -1015,8 +1020,6 @@ ext.cFree4,ext.cFree5,ext.cFree6,ext.cFree7,ext.cFree8,ext.cFree9,ext.cFree10,a.
                             {
                                 throw new Exception(language.GetNameByCode("WMSAPIInfo466"));
                             }
-
-                            }
                         }
                         log.Debug(language.GetNameByCode("WMSAPIInfo465") + "：" + result.ToString());
                     }

ICSSoft.WMS.WebAPI/ICSSoft.Entity/MoStockInModel.cs

@@ -8,38 +8,46 @@ namespace ICSSoft.Entity
 {
     public class MoStockInModel
     {
-        public string Costre { get; set; }
-        public string WorkPoint { get; set; }
-        public string DepCode { get; set; }
-        public string WHCode { get; set; }
-        public string MOCode { get; set; }
-        public string User { get; set; }
-        public string MTime { get; set; }
-        public string UpdateTodoQuantity { get; set; }
-        public List<MoStockInDetail> details { get; set; }
-    }
-
-    public class MoStockInDetail
-    {
-        public string Costre { get; set; }
-        public string Sequence { get; set; }
-        public string InvCode { get; set; }
+        public string TransCode { get; set; }
+        public string TransSequence { get; set; }
         public string Quantity { get; set; }
-        public string Amount { get; set; }
-        public string AmountMODetailID { get; set; }
-        public string ProjectCode { get; set; }
         public string BatchCode { get; set; }
-        public string Version { get; set; }
-        public string Brand { get; set; }
-        public string cFree1 { get; set; }
-        public string cFree2 { get; set; }
-        public string cFree3 { get; set; }
-        public string cFree4 { get; set; }
-        public string cFree5 { get; set; }
-        public string cFree6 { get; set; }
-        public string cFree7 { get; set; }
-        public string cFree8 { get; set; }
-        public string cFree9 { get; set; }
-        public string cFree10 { get; set; }
+        public string InvCode { get; set; }
+        public string WorkPoint { get; set; }
+
+
+        //public string Costre { get; set; }
+        //public string WorkPoint { get; set; }
+        //public string DepCode { get; set; }
+        //public string WHCode { get; set; }
+        //public string MOCode { get; set; }
+        //public string User { get; set; }
+        //public string MTime { get; set; }
+        //public string UpdateTodoQuantity { get; set; }
+        //public List<MoStockInDetail> details { get; set; }
     }
+
+    //public class MoStockInDetail
+    //{
+    //    public string Costre { get; set; }
+    //    public string Sequence { get; set; }
+    //    public string InvCode { get; set; }
+    //    public string Quantity { get; set; }
+    //    public string Amount { get; set; }
+    //    public string AmountMODetailID { get; set; }
+    //    public string ProjectCode { get; set; }
+    //    public string BatchCode { get; set; }
+    //    public string Version { get; set; }
+    //    public string Brand { get; set; }
+    //    public string cFree1 { get; set; }
+    //    public string cFree2 { get; set; }
+    //    public string cFree3 { get; set; }
+    //    public string cFree4 { get; set; }
+    //    public string cFree5 { get; set; }
+    //    public string cFree6 { get; set; }
+    //    public string cFree7 { get; set; }
+    //    public string cFree8 { get; set; }
+    //    public string cFree9 { get; set; }
+    //    public string cFree10 { get; set; }
+    //}
 }