FWHL-377 已完成

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/UnplannedreceiptRequestDetailController.java

@@ -217,6 +217,7 @@ public class UnplannedreceiptRequestDetailController {
             for(UnplannedreceiptRequestDetailRespVO vo : result.getList()) {
                 vo.setCreator(userApi.getUserNickname(vo.getCreator()));
                 vo.setUpdater(userApi.getUserNickname(vo.getUpdater()));
+                vo.setDetailId(vo.getId());
                 UnplannedreceiptRequestMainDO unplannedreceiptRequestMainDO = mainMap.get(vo.getMasterId());
                 if(unplannedreceiptRequestMainDO != null){
                     unplannedreceiptRequestMainDO.setId(null);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/vo/UnplannedreceiptRequestDetailRespVO.java

@@ -30,6 +30,10 @@ public class UnplannedreceiptRequestDetailRespVO extends UnplannedreceiptRequest
      * details
      */
     private String details;
+    /**
+     * detailId
+     */
+    private Long detailId;
     /**
      * 单据号
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRequest/UnplannedreceiptRequestMainServiceImpl.java

@@ -336,7 +336,7 @@ public class UnplannedreceiptRequestMainServiceImpl implements UnplannedreceiptR
                 }
                 for (PackageDO packageDO : packageDOList) {
                     for (UnplannedreceiptRequestDetailDO unplannedreceiptRequestDetailDO : detailDOList) {
-                        if (packageDO.getRequestNumber().equals(mainDO.getNumber()) && packageDO.getItemCode().equals(unplannedreceiptRequestDetailDO.getItemCode())) {
+                        if (packageDO.getRequestNumber().equals(mainDO.getNumber()) && packageDO.getItemCode().equals(unplannedreceiptRequestDetailDO.getItemCode()) && packageDO.getDetailId().equals(unplannedreceiptRequestDetailDO.getId())) {
                             UnplannedreceiptRecordDetailCreateReqVO unplannedreceiptRecordDetailCreateReqVO = new UnplannedreceiptRecordDetailCreateReqVO();
                             BeanUtils.copyProperties(unplannedreceiptRequestDetailDO, unplannedreceiptRecordDetailCreateReqVO);
                             unplannedreceiptRecordDetailCreateReqVO.setNumber(number);
@@ -590,7 +590,7 @@ public class UnplannedreceiptRequestMainServiceImpl implements UnplannedreceiptR
         List<UnplannedreceiptJobDetailDO> unplannedreceiptJobDetailDOList = new ArrayList<>();
         for (PackageDO packageDO : packageDOList) {
             for (UnplannedreceiptRequestDetailDO unplannedreceiptRequestDetailDO : detailDOList) {
-                if (packageDO.getRequestNumber().equals(mainDO.getNumber()) && packageDO.getItemCode().equals(unplannedreceiptRequestDetailDO.getItemCode())) {
+                if (packageDO.getRequestNumber().equals(mainDO.getNumber()) && packageDO.getItemCode().equals(unplannedreceiptRequestDetailDO.getItemCode()) && packageDO.getDetailId().equals(unplannedreceiptRequestDetailDO.getId())) {
                     UnplannedreceiptJobDetailDO unplannedreceiptJobDetailDO = UnplannedreceiptJobDetailConvert.INSTANCE.convert(unplannedreceiptRequestDetailDO);
                     BeanUtils.copyProperties(unplannedreceiptRequestDetailDO, unplannedreceiptJobDetailDO);
                     unplannedreceiptJobDetailDO.setId(null);