倒冲

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

@@ -859,7 +859,7 @@ namespace ICSSoft.DataProject
             try
             {
                 #region ERP
-                string sql = @"SELECT c.VenCode+a.ToWarehouseCode+c.OOCode+a.MUSER+f.ODNCode AS Costre,c.VenCode,a.ToWarehouseCode AS WarehouseCode,c.OOCode,c.OOID,f.ODNCode,f.ODNDetailID,a.MUSER,f.Sequence AS ODNSequence,ROW_NUMBER() OVER (ORDER BY c.VenCode,a.ToWarehouseCode,c.OOCode,c.OODetailID,a.InvCode) AS Sequence,
+                string sql = @"SELECT c.VenCode+a.ToWarehouseCode+c.OOCode+a.MUSER+f.ODNCode AS Costre,c.OODetailID AS Costre2,c.VenCode,a.ToWarehouseCode AS WarehouseCode,c.OOCode,c.OOID,f.ODNCode,f.ODNDetailID,a.MUSER,f.Sequence AS ODNSequence,ROW_NUMBER() OVER (ORDER BY c.VenCode,a.ToWarehouseCode,c.OOCode,c.OODetailID,a.InvCode) AS Sequence,
                                 a.InvCode,SUM(a.Quantity) AS Quantity,SUM(a.Quantity*(lot.Amount/lot.Quantity)) AS Amount,isnull((c.UnitPrice),0) as UnitPrice,c.Currency,c.OODetailID,con.Enable AS UpdateTodoQuantity,conn.Enable
                                 ,a.WorkPoint,ISNULL(ext.ProjectCode, '') AS ProjectCode,CASE WHEN (invBat.BatchEnable IS NULL AND ISNULL(inv.BatchEnable, '0')='1') OR ISNULL(invBat.BatchEnable, '0')='1' THEN ISNULL(ext.BatchCode, '') ELSE '' END AS BatchCode,ISNULL(ext.Version, '') AS Version,ISNULL(ext.Brand, '') AS Brand,
 	                            ISNULL(ext.cFree1, '') AS cFree1,ISNULL(ext.cFree2, '') AS cFree2,ISNULL(ext.cFree3, '') AS cFree3,ISNULL(ext.cFree4, '') AS cFree4,ISNULL(ext.cFree5, '') AS cFree5,ISNULL(ext.cFree6, '') AS cFree6,ISNULL(ext.cFree7, '') AS cFree7,ISNULL(ext.cFree8, '') AS cFree8,ISNULL(ext.cFree9, '') AS cFree9,ISNULL(ext.cFree10, '') AS cFree10,conv.Enable AS CompleteVerification                                   
@@ -872,10 +872,10 @@ namespace ICSSoft.DataProject
                                 INNER JOIN ICSInventoryLotDetail b ON a.LotNo=b.LotNo AND a.WorkPoint=b.WorkPoint
                                 INNER JOIN ICSOASNDetail g ON a.LotNo=g.LotNo AND a.WorkPoint=g.WorkPoint
                                 INNER JOIN ICSODeliveryNotice f ON g.OASNCode=f.OASNCode AND g.WorkPoint=f.WorkPoint
-																INNER JOIN ICSOutsourcingOrder c ON b.TransCode = c.OOCode 
-																			AND b.TransSequence = c.Sequence 
-																			AND f.OODetailID = c.OODetailID 
-																			AND b.WorkPoint = c.WorkPoint
+								INNER JOIN ICSOutsourcingOrder c ON b.TransCode = c.OOCode 
+											AND b.TransSequence = c.Sequence 
+											AND f.OODetailID = c.OODetailID 
+											AND b.WorkPoint = c.WorkPoint
                                 INNER JOIN ICSConfiguration con ON con.Code='Stock001' AND a.WorkPoint=con.WorkPoint
                                 INNER JOIN ICSConfiguration conn ON con.WorkPoint=conn.WorkPoint AND conn.Code='Escrow001'
                                 INNER JOIN ICSConfiguration conv ON conv.Code='CompleteVerification' AND a.WorkPoint=conv.WorkPoint
@@ -885,7 +885,7 @@ namespace ICSSoft.DataProject
                                 ISNULL(ext.cFree1, ''),ISNULL(ext.cFree2, ''),ISNULL(ext.cFree3, ''),ISNULL(ext.cFree4, ''),ISNULL(ext.cFree5, ''),ISNULL(ext.cFree6, ''),ISNULL(ext.cFree7, ''),ISNULL(ext.cFree8, ''),ISNULL(ext.cFree9, ''),ISNULL(ext.cFree10, '')
 
                                 SELECT DISTINCT Costre,WorkPoint,VenCode,WarehouseCode AS WHCode,OOCode,ODNCode,MUSER AS [User],SYSDATETIME() AS MTime,Enable,UpdateTodoQuantity,CompleteVerification FROM #TempERP
-                                SELECT Costre,Sequence,ODNSequence,InvCode,Quantity,Amount,OODetailID,Currency,UnitPrice,ProjectCode,BatchCode,Version,Brand,cFree1,cFree2,cFree3,cFree4,cFree5,cFree6,cFree7,cFree8,cFree9,cFree10
+                                SELECT Costre,Costre2,Sequence,ODNSequence,InvCode,Quantity,Amount,OODetailID,Currency,UnitPrice,ProjectCode,BatchCode,Version,Brand,cFree1,cFree2,cFree3,cFree4,cFree5,cFree6,cFree7,cFree8,cFree9,cFree10
                                 FROM #TempERP
                                 SELECT c.OODetailID AS Costre2,a.TransCode,a.TransSequence AS Sequence,a.InvCode,a.Quantity,c.Amount,c.PickID,ISNULL(ext.ProjectCode, '') AS ProjectCode,CASE WHEN (invBat.BatchEnable IS NULL AND ISNULL(inv.BatchEnable, '0')='1') OR ISNULL(invBat.BatchEnable, '0')='1' THEN ISNULL(ext.BatchCode, '') ELSE '' END AS BatchCode,ISNULL(ext.Version, '') AS Version,ISNULL(ext.Brand, '') AS Brand,ISNULL(ext.cFree1, '') AS cFree1,ISNULL(ext.cFree2, '') AS cFree2,ISNULL(ext.cFree3, '') AS cFree3,ISNULL(ext.cFree4, '') AS cFree4,ISNULL(ext.cFree5, '') AS cFree5,ISNULL(ext.cFree6, '') AS cFree6,ISNULL(ext.cFree7, '') AS cFree7,ISNULL(ext.cFree8, '') AS cFree8,ISNULL(ext.cFree9, '') AS cFree9,ISNULL(ext.cFree10, '') AS cFree10
 	                                FROM ICSWareHouseLotInfoLog a
@@ -922,7 +922,7 @@ namespace ICSSoft.DataProject
                                 foreach (var details in resdetails)
                                 {
                                     JObject dets = (JObject)details;
-                                    ICSWareHouseLotInfoService.WareHouseLotInfoLogUpdate(TransType, det["MODetailID"].ToString(), Identification, det["IDSS"].ToString(),
+                                    ICSWareHouseLotInfoService.WareHouseLotInfoLogUpdate(TransType, det["OODetailID"].ToString(), Identification, det["IDSS"].ToString(),
                                         dets["DetailID"].ToString(), dets["MRCVCode"].ToString(), dets["Sequence"].ToString(), cmd, language);
                                 }
                             }

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

@@ -282,7 +282,7 @@ namespace ICSSoft.DataProject
                             END
 
                             select TransCode,LotNo,LocationQty AS Quantity,InvCode,DetailID,Sequence,TransSequence from #resulttemp
-                            select * from #resulttemp
+                            --select * from #resulttemp
 
                             DROP table #maintemp
                             DROP table #resulttemp
@@ -312,53 +312,53 @@ namespace ICSSoft.DataProject
                     #region sql
                     sql = @"-- 1.创建临时表 初始单据数据 maintemp
                             SELECT
-								c.OOCode AS TransCode,
-								a.OODetailID AS DetailID,
-								a.InvCode,
-								b.InvName,
-								b.InvStd,
-								a.Quantity,
-								a.Amount,
-								a.Sequence AS TransSequence,
-								a.IssueQuantity,
-								c.Sequence,
-								inv.InvUnit,
-								0 AS LocationQty,
-								inv.AmountUnit,
-								a.ExtensionID,
-								a.WorkPoint,
-								ext.ProjectCode,
-								CASE WHEN ISNULL(inv.BatchEnable, '0')='1' THEN ext.BatchCode ELSE '' END AS BatchCode,
-								ext.Version,
-								ext.Brand,
-								ext.cFree1,
-								ext.cFree2,
-								ext.cFree3,
-								ext.cFree4,
-								ext.cFree5,
-								ext.cFree6,
-								ext.cFree7,
-								ext.cFree8,
-								ext.cFree9,
-								ext.cFree10
-								INTO #maintemp
-											
-							FROM
-								ICSOOPick a
-									inner join ICSOutsourcingOrder c on a.OODetailID=c.OODetailID and a.WorkPoint=c.WorkPoint
-									LEFT JOIN ICSINVENTORY b ON a.InvCode = b.InvCode AND a.WorkPoint=b.WorkPoint
-									INNER JOIN ICSExtension ext ON a.ExtensionID=ext.ID AND a.WorkPoint=ext.WorkPoint
-									INNER JOIN ICSInventory inv ON a.InvCode=inv.InvCode AND a.WorkPoint=inv.WorkPoint
-									INNER JOIN (
-											SELECT a.OOCode,a.Sequence,a.WorkPoint
-											FROM ICSOutsourcingOrder a
-											INNER JOIN ICSInventoryLotDetail b ON b.TransCode=a.OOCode AND b.TransSequence=a.Sequence AND b.WorkPoint=a.WorkPoint
-											INNER JOIN ICSInventoryLot c ON c.LotNo=b.LotNo AND c.WorkPoint=b.WorkPoint
-											WHERE c.LotNo='{0}' AND c.WorkPoint='{1}'
-									) temp ON  c.OOCode=temp.OOCode AND a.WorkPoint=temp.WorkPoint AND c.Sequence=temp.Sequence
-                                    WHERE a.SupplyType='1'
-									GROUP BY c.OOCode,a.Quantity,a.InvCode,b.InvName,b.InvStd,a.WhCode,a.ExtensionID,a.WorkPoint,inv.BatchEnable,a.OODetailID,a.Amount,a.Sequence,a.IssueQuantity,inv.InvName,inv.InvCode,inv.InvUnit,inv.AmountUnit,c.Sequence,
-									ext.ProjectCode,ext.BatchCode,ext.Version,ext.Brand,ext.cFree1,ext.cFree2,ext.cFree3,ext.cFree4,ext.cFree5,ext.cFree6,ext.cFree7,ext.cFree8,ext.cFree9,ext.cFree10
+	                                                    c.OOCode AS TransCode,
+													                            a.OODetailID AS DetailID,
+	                                                    a.InvCode,
+	                                                    b.InvName,
+	                                                    b.InvStd,
+	                                                    a.Quantity,
+													                            a.Amount,
+													                            a.Sequence AS TransSequence,
+													                            a.IssueQuantity,
+													                            c.Sequence,
+													                            inv.InvUnit,
+													                            0 AS LocationQty,
+													                            inv.AmountUnit,
+													                            a.ExtensionID,
+													                            a.WorkPoint,
+													                            ext.ProjectCode,
+													                            CASE WHEN ISNULL(inv.BatchEnable, '0')='1' THEN ext.BatchCode ELSE '' END AS BatchCode,
+													                            ext.Version,
+													                            ext.Brand,
+													                            ext.cFree1,
+													                            ext.cFree2,
+													                            ext.cFree3,
+													                            ext.cFree4,
+													                            ext.cFree5,
+													                            ext.cFree6,
+													                            ext.cFree7,
+													                            ext.cFree8,
+													                            ext.cFree9,
+													                            ext.cFree10
+                                                     INTO #maintemp
+												
+												                            FROM
+	                                                    ICSOOPick a
+														                            inner join ICSOutsourcingOrder c on a.OODetailID=c.OODetailID and a.WorkPoint=c.WorkPoint
+                                                        LEFT JOIN ICSINVENTORY b ON a.InvCode = b.InvCode AND a.WorkPoint=b.WorkPoint
+														                            INNER JOIN ICSExtension ext ON a.ExtensionID=ext.ID AND a.WorkPoint=ext.WorkPoint
+														                            INNER JOIN ICSInventory inv ON a.InvCode=inv.InvCode AND a.WorkPoint=inv.WorkPoint
+														                            INNER JOIN (
+																                            SELECT a.OOCode,a.Sequence,a.WorkPoint
+																                            FROM ICSOutsourcingOrder a
+																                            INNER JOIN ICSInventoryLotDetail b ON b.TransCode=a.OOCode AND b.TransSequence=a.Sequence AND b.WorkPoint=a.WorkPoint
+																                            INNER JOIN ICSInventoryLot c ON c.LotNo=b.LotNo AND c.WorkPoint=b.WorkPoint
+																                            WHERE c.LotNo='{0}' AND c.WorkPoint='{1}'
+														                            ) temp ON  c.OOCode=temp.OOCode AND a.WorkPoint=temp.WorkPoint AND c.Sequence=temp.Sequence
+                                                                                    WHERE a.SupplyType='1'
+														                            GROUP BY c.OOCode,a.Quantity,a.InvCode,b.InvName,b.InvStd,a.WhCode,a.ExtensionID,a.WorkPoint,inv.BatchEnable,a.OODetailID,a.Amount,a.Sequence,a.IssueQuantity,inv.InvName,inv.InvCode,inv.InvUnit,inv.AmountUnit,c.Sequence,
+														                            ext.ProjectCode,ext.BatchCode,ext.Version,ext.Brand,ext.cFree1,ext.cFree2,ext.cFree3,ext.cFree4,ext.cFree5,ext.cFree6,ext.cFree7,ext.cFree8,ext.cFree9,ext.cFree10;
 				
                             select * into #resulttemp from #maintemp
                             ALTER TABLE #resulttemp ADD LotNo VARCHAR(50)
@@ -418,7 +418,7 @@ namespace ICSSoft.DataProject
                             END
 
                             select TransCode,LotNo,LocationQty AS Quantity,InvCode,DetailID,Sequence,TransSequence from #resulttemp
-                            -- select * from #resulttemp
+                            --select * from #resulttemp
 
                             DROP table #maintemp
                             DROP table #resulttemp
@@ -432,7 +432,7 @@ namespace ICSSoft.DataProject
                     {
                         WareHouseLotInfoDown(Identification, model.TransCode, model.Sequence + "~" + model.TransSequence, model.LotNo, model.Quantity, User, WorkPoint, "12", BusinessCode, cmd, language);
                         //回写已领数量
-                        sql = @"UPDATE ICSMOPick SET IssueQuantity=(ISNULL(IssueQuantity,0)+" + model.Quantity+") WHERE MODetailID='{0}' AND Sequence='{1}' AND WorkPoint='{2}'";
+                        sql = @"UPDATE ICSOOPick SET IssueQuantity=(ISNULL(IssueQuantity,0)+" + model.Quantity+") WHERE OODetailID='{0}' AND Sequence='{1}' AND WorkPoint='{2}'";
                         sql = String.Format(sql, model.DetailID, model.TransSequence, WorkPoint);
                         if (!DBHelper.ExecuteNonQuery(sql, cmd))
                         {

ICSSoft.WMS.WebAPI/ICSSoft.Entity/ICSSoft.Entity.csproj

@@ -55,6 +55,7 @@
   <ItemGroup>
     <Compile Include="BarCodeModel.cs" />
     <Compile Include="ControlMode.cs" />
+    <Compile Include="DownItemModel.cs" />
     <Compile Include="ERPDeliveryNotice.cs" />
     <Compile Include="ERPODNRT.cs" />
     <Compile Include="ERPPurchaseOrder.cs" />