采购退货增加物流信息

ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSPurchaseService.cs

@@ -1435,7 +1435,7 @@ SELECT * FROM ICSInventoryBatchEnable";
         /// <param name="Quantity"></param>
         /// <param name="WorkPoint"></param>
         /// <param name="cmd"></param>
-        public static void PurchaseReceiveDoctNegative(string TransCode, string TransSequence, string Quantity, string WorkPoint, SqlCommand cmd, Dictionary<string, string> language,string TransID)
+        public static void PurchaseReceiveDoctNegative(string TransCode, string TransSequence, string Quantity, string WorkPoint, string Logistics, SqlCommand cmd, Dictionary<string, string> language,string TransID)
         {
             try
             {
@@ -1453,7 +1453,7 @@ SELECT * FROM ICSInventoryBatchEnable";
                                     RETURN
                                 END
 
-                                UPDATE a SET RCVQuantity=ISNULL(RCVQuantity,0)+'{2}'
+                                UPDATE a SET RCVQuantity=ISNULL(RCVQuantity,0)+'{2}',EATTRIBUTE9='{5}'
                                 FROM ICSDeliveryNotice  a
                                 WHERE a.DNCode='{0}' AND a.Sequence='{3}' and a.ID='{4}'  AND a.WorkPoint='{1}' AND DNType='2'
 
@@ -1487,7 +1487,7 @@ SELECT * FROM ICSInventoryBatchEnable";
                                 END
 ";
 
-                sql = string.Format(sql, TransCode, WorkPoint, Quantity, TransSequence, TransID);
+                sql = string.Format(sql, TransCode, WorkPoint, Quantity, TransSequence, TransID, Logistics);
 
                 if (!DBHelper.ExecuteNonQuery(sql, cmd))
                 {

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

@@ -11343,10 +11343,7 @@ BEGIN
                         {
                             BusinessCode = TransTypeEnum.PurchaseReceiveDoctNegative.GetDescription<DBValue>();
                             //更新源头单据数量
-                            ICSPurchaseService.PurchaseReceiveDoctNegative(item.TransCode, item.TransSequence, item.Quantity, item.WorkPoint, cmd, language, item.TransID);
-
-
-
+                            ICSPurchaseService.PurchaseReceiveDoctNegative(item.TransCode, item.TransSequence, item.Quantity, item.WorkPoint, item.Logistics, cmd, language, item.TransID);
                             foreach (var itemInfo in item.detail)
                             {
                                 //出库
@@ -11899,7 +11896,7 @@ BEGIN
                         {
                             BusinessCode = TransTypeEnum.PurchaseReceiveDoctNegative.GetDescription<DBValue>();
                             //更新源头单据数量
-                            ICSPurchaseService.PurchaseReceiveDoctNegative(item.TransCode, item.TransSequence, item.Quantity, item.WorkPoint, cmd, language, item.TransID);
+                            ICSPurchaseService.PurchaseReceiveDoctNegative(item.TransCode, item.TransSequence, item.Quantity, item.WorkPoint, item.Logistics, cmd, language, item.TransID);
 
 
 
@@ -12454,7 +12451,7 @@ BEGIN
                         {
                             BusinessCode = TransTypeEnum.PurchaseReceiveDoctNegative.GetDescription<DBValue>();
                             //更新源头单据数量
-                            ICSPurchaseService.PurchaseReceiveDoctNegative(item.TransCode, item.TransSequence, item.Quantity, item.WorkPoint, cmd, language, item.TransID);
+                            ICSPurchaseService.PurchaseReceiveDoctNegative(item.TransCode, item.TransSequence, item.Quantity, item.WorkPoint, item.Logistics, cmd, language, item.TransID);
 
                             foreach (var itemInfo in item.detail)
                             {
@@ -12986,11 +12983,11 @@ BEGIN
                                 throw new Exception(language.GetNameByCode("WMSAPIInfo010")); //"送货单子表信息更新失败！");
                             }
 
-                            sql = @"UPDATE ICSInventoryLot SET Quantity='{2}'
+                            sql = @"UPDATE ICSInventoryLot SET Quantity='{2}',EATTRIBUTE15='{3}'
                                     WHERE LotNo='{0}' AND WorkPoint='{1}'";
                             if (itemInfo.IsUrgency == "1")
                                 sql = @"UPDATE ICSInventoryLot SET Quantity='{2}' ,eattribute6 = '1' WHERE LotNo='{0}' AND WorkPoint='{1}'";
-                            sql = string.Format(sql, itemInfo.LotNo, item.WorkPoint, itemInfo.Quantity);
+                            sql = string.Format(sql, itemInfo.LotNo, item.WorkPoint, itemInfo.Quantity, itemInfo.locationCode);
 
                             if (!DBHelper.ExecuteNonQuery(sql, cmd))
                             {
@@ -16265,8 +16262,9 @@ END";
                         foreach (var itemInfo in item.detail)
                         {
                             sql = @"UPDATE ICSOASNDetail SET ODNQuantity=ISNULL(ODNQuantity, 0)+'{2}'
-                                    WHERE LotNo='{0}' AND WorkPoint='{1}'";
-                            sql = string.Format(sql, itemInfo.LotNo, item.WorkPoint, itemInfo.Quantity);
+                                    WHERE LotNo='{0}' AND WorkPoint='{1}'
+                                    UPDATE ICSInventoryLot SET EATTRIBUTE15='{3}' WHERE LotNo='{0}' AND WorkPoint='{1}'";
+                            sql = string.Format(sql, itemInfo.LotNo, item.WorkPoint, itemInfo.Quantity, itemInfo.locationCode);
 
                             if (!DBHelper.ExecuteNonQuery(sql, cmd))
                             {
@@ -32791,7 +32789,7 @@ END as NEWLotNo
                         //修改送货单到货数量
                         foreach (var itemInfo in item.detail)
                         {
-                            string detailSql = @"UPDATE ICSInventoryLot SET EATTRIBUTE15='' WHERE LotNo='{0}' AND WorkPoint='{4}'
+                            string detailSql = @"UPDATE ICSInventoryLot SET EATTRIBUTE15='{6}' WHERE LotNo='{0}' AND WorkPoint='{4}'
                                                 IF EXISTS(SELECT 1 FROM ICSInventoryLotDetail WHERE LotNo='{0}' AND WorkPoint='{4}')
                                                   BEGIN
                                                     UPDATE ICSInventoryLotDetail SET TransCode='{1}',TransSequence='{2}',TransID='{5}' WHERE LotNo='{0}' AND WorkPoint='{4}'

ICSSoft.WMS.WebAPI/ICSSoft.Entity/LOTStockModel.cs

@@ -50,6 +50,8 @@ namespace ICSSoft.Entity
         public string CourierCode { get; set; }
         //快递单号
         public string passFlag { get; set; }
+        //物流信息
+        public string Logistics { get; set; }
 
         public List<LOTStockModelList> detail { get; set; }