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

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

@@ -7721,7 +7721,6 @@ WHERE WorkPoint='{0}' AND Quantity>ISNULL(TransferQuantity, 0) order by Transfer
                             {
                                 //形态转换
                                 sql.Append($@"UPDATE ICSWareHouseLotInfo SET InvCode='{afterInvCode}' WHERE LotNo='{data.LotNo}' AND WorkPoint='{item.WorkPoint}' AND InvCode='{beforInvCode}' AND WarehouseCode='{item.WHCode}';
-                                     UPDATE ICSWareHouseLotInfoLog SET InvCode='' WHERE  LotNo='{data.LotNo}' AND WorkPoint='{item.WorkPoint}' AND InvCode='{beforInvCode}' ;
                                      UPDATE ICSInventoryLot SET InvCode='{afterInvCode}' WHERE LotNo='{data.LotNo}' AND InvCode='{beforInvCode}' AND WorkPoint='{item.WorkPoint}'  AND ExtensionID='{beforExtensionID}';");
                                 sql.Append($@"INSERT INTO [dbo].[ICSWareHouseLotInfoLog] ([ID], [Identification], [TransCode], [TransSequence], [LotNo], [InvCode], [FromWarehouseCode], [FromLocationCode], [ToWarehouseCode], [ToLocationCode], [Quantity], [Memo], [Lock], [TransType], [BusinessCode], [ERPUpload], [ERPID], [ERPDetailID], [ERPCode], [ERPSequence], [LogID], [MergeID], [MUSER], [MUSERName], [MTIME], [WorkPoint], [EATTRIBUTE1], [EATTRIBUTE2], [EATTRIBUTE3]) 
                                                                                SELECT NEWID(), NEWID(), '{item.TransCode}', '{item.TransSequence}', '{data.LotNo}', '{beforInvCode}', {item.WHCode}, NULL, NULL, NULL, {data.Quantity}, NULL, '0', N'10', N'35', '0', NULL, NULL, NULL, NULL, NULL, NULL,f.F_Account ,f.F_RealName , SYSDATETIME(), '{item.WorkPoint}', NULL, NULL, '{beforExtensionID}' FROM  Sys_SRM_User f WHERE f.F_Account='{item.User}' ;");

WMS-BS/NFine.Application/WMS/BlitemApp.cs

@@ -398,11 +398,11 @@ DELETE FROM dbo.ICSCheck  WHERE ID IN ({0}) and WorkPoint ='{1}'", keyValue.Trim
             }
             if (NFine.Code.OperatorProvider.Provider.GetCurrent().RoleEnCode != "admin")
             {
-                sql += " and a.WorkPoint='" + NFine.Code.OperatorProvider.Provider.GetCurrent().Location + "'";
+                sql += " and WorkPoint='" + NFine.Code.OperatorProvider.Provider.GetCurrent().Location + "'";
             }
             if (NFine.Code.OperatorProvider.Provider.GetCurrent().RoleEnCode == "Vendor")
             {
-                sql += " and a.VenCode='" + NFine.Code.OperatorProvider.Provider.GetCurrent().UserCode + "'";
+                sql += " and VenCode='" + NFine.Code.OperatorProvider.Provider.GetCurrent().UserCode + "'";
             }
             return Repository().FindTablePageBySql(sql.ToString(), parameter.ToArray(), ref jqgridparam);
         }