更新版本

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanExtendAppService.cs

@@ -246,19 +246,19 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         public async Task<string> WmsKanbanOutPut(WmsJitRequestDto input)
         {
 
-            var _count1 = _wmsVersionRepository.Count(p => p.Version == input.Version );
-            if (_count1 > 0)
-            {
-                var checkList = new List<ErrorExportDto>();
+            //var _count1 = _wmsVersionRepository.Count(p => p.Version == input.Version );
+            //if (_count1 > 0)
+            //{
+            //    var checkList = new List<ErrorExportDto>();
                
-                checkList.Add(new ErrorExportDto() { Message = "有重复期间数据" });
+            //    checkList.Add(new ErrorExportDto() { Message = "有重复期间数据" });
                 
-                if (checkList.Count > 0)
-                {
+            //    if (checkList.Count > 0)
+            //    {
 
-                    return await ExportErrorReportAsync(checkList);
-                }
-            }
+            //        return await ExportErrorReportAsync(checkList);
+            //    }
+            //}
             var _billNum = "KA" + DateTime.Now.ToString("yyyyMMddhhmmss");
             var _list = _dapper.GetNoKanbanSettleDetail(input.Version);
             var stockList = _wmsDapper.GetSalesStock();

src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs

@@ -453,8 +453,6 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
             Qty = qty;
             SockQty = sockQty;
             OutputQty = outputQty;
-
-
             Extend = extend;
             BillNum = billnum;
             State = state;

src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/SettleKBWithCodeDapperReportRepository.cs

@@ -114,7 +114,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
        "		LEFT JOIN Set_material t1 ON A.MaterialCode = t1.CustomerPartCode \n" +
        "	) temp5 ON temp1.SapMaterialCode = temp5.MaterialCode \n" +
        "	AND temp1.Kanban = temp5.Kanban \n" +
-       "	AND temp1.SapMaterialCode = temp3.MaterialCode\n" +
+       
        "	LEFT JOIN ( SELECT Price, --定价\n" +
        "		MaterialCode --厂内物料号\n" +
        "	FROM Set_PriceList WHERE VERSION = ( SELECT MAX ( VERSION ) FROM Set_PriceList ) ) TEMP2 ON TEMP1.SapMaterialCode = TEMP2.MaterialCode \n" +