Merge remote-tracking branch 'origin/master_hella' into master_hella

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapJob/ScrapJobMainServiceImpl.java

@@ -431,6 +431,7 @@ public class ScrapJobMainServiceImpl implements ScrapJobMainService {
             if (StringUtils.isEmpty(locationDO.getQadLocationCode())) {
                 throw exception(LOCATION_QAD_EXCEPTION, locationDO.getCode() + "该库位QAD不存在");
             }
+            unplannedissueRecordDTO.setProjectCode(scrapRecordMainDO.getProjectCode());
             unplannedissueRecordDTO.setQadLocationCode(locationDO.getQadLocationCode());
             dtoList.add(unplannedissueRecordDTO);
         }
@@ -456,7 +457,7 @@ public class ScrapJobMainServiceImpl implements ScrapJobMainService {
                 interfaceInfoDO.setNumber("post" + "_" + InterfaceTypeEnum.RECORD_UNPLANNEDISSUE_MAIN.getCode() + '_' + scrapRecordMainDO.getId());
                 interfaceInfoDO.setInterfaceType("WMS-QAD");
                 interfaceInfoDO.setInterfaceName("推送计划外出库记录");
-                interfaceInfoDO.setUrl("/wms/unplannedissue-job-main/execute");
+                interfaceInfoDO.setUrl("/wms/scrap-job-main/execute");
                 interfaceInfoDO.setRemark("报废出库也通过推送计划外出库记录");
                 // 根据当前时间调用账期日历获取有效时间
                 LocalDateTime activeTime = accountcalendarService.getAccountCalendar();

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordMainServiceImpl.java

@@ -309,12 +309,10 @@ public class ScrapRecordMainServiceImpl implements ScrapRecordMainService {
             UnplannedissueRecordDTO unplannedissueRecordDTO = new UnplannedissueRecordDTO();
             BeanUtils.copyProperties(scrapRecordMainDO, unplannedissueRecordDTO);
             BeanUtils.copyProperties(scrapRecordDetailDO, unplannedissueRecordDTO);
-
             ItembasicDO itembasicDO = itembasicService.getItembasicBycode(unplannedissueRecordDTO.getItemCode());
             if (itembasicDO == null || "TRUE".equals(itembasicDO.getIsOutErp())) {
                 continue;
             }
-
             unplannedissueRecordDTO.setTtisTmks(scrapRecordMainDO.getOrderNumber());
             String qadUnplannedissueNumber = serialNumberApi.generateCode(RuleCodeEnum.QAD_UNPLANNEDISSUE_NUMBER.getCode());
             unplannedissueRecordDTO.setQadNumber(qadUnplannedissueNumber);
@@ -324,6 +322,7 @@ public class ScrapRecordMainServiceImpl implements ScrapRecordMainService {
             }
             unplannedissueRecordDTO.setQadLocationCode(locationDO.getQadLocationCode());
             unplannedissueRecordDTO.setQty(unplannedissueRecordDTO.getQty().negate());
+            unplannedissueRecordDTO.setProjectCode(scrapRecordMainDO.getProjectCode());
             filterList.add(unplannedissueRecordDTO);
         }
         Long userId = getLoginUserId();
@@ -334,8 +333,8 @@ public class ScrapRecordMainServiceImpl implements ScrapRecordMainService {
             interfaceInfoDO.setNumber("post" + "_" + InterfaceTypeEnum.RECORD_UNPLANNEDISSUE_MAIN.getCode() + '_' + scrapRecordMainDO.getId());
             interfaceInfoDO.setInterfaceType("WMS-QAD");
             interfaceInfoDO.setInterfaceName("推送计划外出库记录");
-            interfaceInfoDO.setUrl("/wms/unplannedissue-job-main/execute");
-            interfaceInfoDO.setRemark("报废出库也通过推送计划外出库记录");
+            interfaceInfoDO.setUrl("/wms/scrap-record-main/revoke");
+            interfaceInfoDO.setRemark("报废出库也通过推送计划外出库记录revoke");
             // 根据当前时间调用账期日历获取有效时间
             LocalDateTime activeTime = accountcalendarService.getAccountCalendar();
             for (UnplannedissueRecordDTO dto : filterList) {

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRequest/ScrapRequestMainServiceImpl.java

@@ -388,6 +388,9 @@ public class ScrapRequestMainServiceImpl implements ScrapRequestMainService {
                 detailDo.setQadPlCostCenter(mstrDO.getPlScrpCc());
             }
         }
+        // HL-5810 修改成本中心与项目从界面获取值
+        detailDo.setQadPlCostCenter(mainDo.getCostCenterCode());
+        detailDo.setProjectCode(mainDo.getProjectCode());
     }
 
     private ScrapRequestMainDO validateMainMethod(ScrapRequestMainBaseVO baseVO, BusinesstypeDO businesstypeDO, RequestsettingDO requestsettingDO) {

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRequest/UnplannedissueRequestMainServiceImpl.java

@@ -137,7 +137,6 @@ public class UnplannedissueRequestMainServiceImpl implements UnplannedissueReque
     @Lazy
     @Resource
     private ExpectoutService expectoutService;
-
     @Resource
     private UnplannedissueJobDetailMapper unplannedissueJobDetailMapper;
     @Resource