Merge branch 'master' of http://119.3.29.177:3000/Luy/NWeiWMS

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

@@ -2097,6 +2097,36 @@ namespace ICSSoft.DataProject
                         {
 
                             if (ScanType == "LOTNO")
+                            {
+                                if (TransType == TransTypeEnum.MTDOC.GetDescription())
+                                {
+
+                                    sql = @"IF NOT EXISTS(SELECT a.ID FROM ICSWareHouseLotInfo a WHERE a.LotNo='{2}' AND a.WorkPoint='{3}' AND a.Quantity>0 AND  a.LockQuantity=0)
+                                    BEGIN
+	                                    RAISERROR('" + string.Format(language.GetNameByCode("WMSAPIInfo038"), "{2}") + @"',16,1);
+                                        RETURN
+                                    END
+                                    " + sql;
+
+                                    columns = @"a.Quantity,
+                                    a.Quantity*(lot.Amount/lot.Quantity) AS Amount,
+                                    a.WarehouseCode AS WHCode,
+                                    wh.WarehouseName AS WHName,
+                                    inv.LotEnable,     
+                                    a.LocationCode,    
+                                    loc.LocationName,     
+                                    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,";
+
+                                    tableName = @"ICSWareHouseLotInfo a
+                                    INNER JOIN ICSInventoryLot lot ON a.LotNo=lot.LotNo AND a.WorkPoint=lot.WorkPoint
+                                    INNER JOIN ICSExtension ext ON lot.ExtensionID=ext.ID AND lot.WorkPoint=ext.WorkPoint
+                                    INNER JOIN ICSWarehouse wh ON a.WarehouseCode=wh.WarehouseCode AND a.WorkPoint=wh.WorkPoint
+                                    INNER JOIN ICSLocation loc ON a.LocationCode=loc.LocationCode AND a.WorkPoint=loc.WorkPoint
+                                    LEFT JOIN ICSInventoryBatchEnable invBat ON a.InvCode=invBat.InvCode AND a.WarehouseCode=invBat.WHCode AND a.WorkPoint=invBat.WorkPoint";
+                                    LotDetail = $@"LEFT JOIN ICSInventoryDetail detail ON inv.InvCode= detail.INVCode AND a.WarehouseCode = detail.WHCode  AND a.WorkPoint = detail.WorkPoint ";
+                                    con = "detail.LocationCode AS Area,";
+                                }
+                                else
                                 {
                                     sql = @"IF NOT EXISTS(SELECT a.ID FROM ICSWareHouseLotInfo a WHERE a.LotNo='{2}' AND a.WorkPoint='{3}' AND a.Quantity>0)
                                     BEGIN
@@ -2123,6 +2153,7 @@ namespace ICSSoft.DataProject
                                     LotDetail = $@"LEFT JOIN ICSInventoryDetail detail ON inv.InvCode= detail.INVCode AND a.WarehouseCode = detail.WHCode  AND a.WorkPoint = detail.WorkPoint ";
                                     con = "detail.LocationCode AS Area,";
                                 }
+                            }
                             else
                             {
                                 sql = @"