no message

SRM/NFine.Application/SRM/CreateItemLotApp.cs

@@ -61,7 +61,11 @@ namespace NFine.Application
                             FROM ICSDeliveryNotice a
                             left join ICSPurchaseOrder b on a.PODetailID=b.PODetailID 
                             group by b.POCode,b.Sequence,a.DNType,a.WorkPoint having  a.DNType='2' 
-
+     UNION ALL
+                                select b.POCode,b.Sequence,sum(cast(a.EATTRIBUTE30 as decimal)) as returnqty,a.WorkPoint  from ICSPurchaseReceive a
+                                left join ICSPurchaseOrder b on a.SourceCode=b.POCode and a.SourceSequence=b.Sequence and a.WorkPoint=b.WorkPoint
+                                where a.Type='2' 
+                                group by b.POCode,b.Sequence,a.WorkPoint 
                             UNION ALL
                             SELECT b.POCode,b.Sequence,sum(isnull(a.RCVQuantity,0)) returnqty ,a.WorkPoint
                             FROM  ICSPurchaseReceive a
@@ -676,6 +680,11 @@ namespace NFine.Application
                                 FROM ICSDeliveryNotice a
                                 left join ICSPurchaseOrder b on a.PODetailID=b.PODetailID 
                                 group by b.POCode,b.Sequence,a.DNType,a.WorkPoint having  a.DNType='2' 
+                                UNION ALL
+                                select b.POCode,b.Sequence,sum(cast(a.EATTRIBUTE30 as decimal)) as returnqty,a.WorkPoint  from ICSPurchaseReceive a
+                                left join ICSPurchaseOrder b on a.SourceCode=b.POCode and a.SourceSequence=b.Sequence and a.WorkPoint=b.WorkPoint
+                                where a.Type='2' 
+                                group by b.POCode,b.Sequence,a.WorkPoint 
 
                                 UNION ALL
                                 SELECT b.POCode,b.Sequence,sum(isnull(a.RCVQuantity,0)) returnqty ,a.WorkPoint

SRM/NFine.Web/Configs/database.config

@@ -2,12 +2,12 @@
 <connectionStrings>
 
   <!--海格正式-->
-  <add name="NFineDbContext" connectionString="Server=10.0.1.20;Initial Catalog=ICSWMS_HG;User ID=sa;Password=aA123456" providerName="System.Data.SqlClient" />
-  <add name="connstr" connectionString="Server=10.0.1.20;Initial Catalog=ICSWMS_HG;User ID=sa;Password=aA123456"  providerName="System.Data.SqlClient" />
+  <add name="NFineDbContext" connectionString="Server=10.0.1.22;Initial Catalog=ICSWMS_HG;User ID=sa;Password=HgSa.2026*.com" providerName="System.Data.SqlClient" />
+  <add name="connstr" connectionString="Server=10.0.1.22;Initial Catalog=ICSWMS_HG;User ID=sa;Password=HgSa.2026*.com"  providerName="System.Data.SqlClient" />
   
  <!--海格测试-->
-  <!--<add name="NFineDbContext" connectionString="Server=10.0.1.20;Initial Catalog=ICSWMS_Base;User ID=sa;Password=aA123456" providerName="System.Data.SqlClient" />
-  <add name="connstr" connectionString="Server=10.0.1.20;Initial Catalog=ICSWMS_Base;User ID=sa;Password=aA123456"  providerName="System.Data.SqlClient" />-->
+  <!--<add name="NFineDbContext" connectionString="Server=192.168.0.49;Initial Catalog=ICSWMS_HG;User ID=sa;Password=HgSa.2026*.com" providerName="System.Data.SqlClient" />
+  <add name="connstr" connectionString="Server=192.168.0.49;Initial Catalog=ICSWMS_HG;User ID=sa;Password=HgSa.2026*.com"  providerName="System.Data.SqlClient" />-->
 
 
   <add name="U9connstr" connectionString="Server=119.3.29.177;Initial Catalog=UFDATA_106_2019;User ID=sa;Password=Pwd=EYuX1bqSi^fIBWDX" providerName="System.Data.SqlClient" />