优化

platform-dao/src/main/java/com/platform/dao/dto/merge/LongYanPurchaseOrderMergeDTO.java

@@ -26,7 +26,7 @@ public class LongYanPurchaseOrderMergeDTO extends BaseDTO implements Serializabl
     private List<LongYanPurchaseOrderVO> longYanPurchaseOrderVOS;
     private String createdUserName;
     private String title;
-    private Integer status;//0:草稿1：成功，2：失败
+    private Integer status;//1:草稿
 
     private String yongYouId;
       /**

platform-dao/src/main/java/com/platform/dao/entity/merge/LongYanPurchaseOrderMerge.java

@@ -29,7 +29,8 @@ public class LongYanPurchaseOrderMerge implements Serializable{
 
     private String createdUserName;
     private String title;
-    private Integer status;//0:草稿1：成功，2：失败
+    private Integer status;//1:草稿
+
     private String yongYouId;
 
     /**

platform-dao/src/main/java/com/platform/dao/vo/query/merge/LongYanPurchaseOrderMergeVO.java

@@ -26,7 +26,8 @@ public class LongYanPurchaseOrderMergeVO extends BaseVO implements Serializable{
     private List<LongYanPurchaseOrderVO> longYanPurchaseOrderVOS;
     private String createdUserName;
     private String title;
-    private Integer status;//0:草稿1：成功，2：失败
+    private Integer status;//1:草稿
+
 
     private String yongYouId;
     /**

platform-rest/src/main/java/com/platform/rest/controller/yongyou/YongyouController.java

@@ -150,6 +150,11 @@ public class YongyouController {
         return new R(yongyouService.getLongYanPurchaseDetailListVOs(detailDTO, pageNum, pageSize));
     }
 
+    @GetMapping("/merge/purchaseOrder/list")
+    public R<AbstractPageResultBean<LongYanPurchaseDetailListVO>> getMergeLongYanPurchaseDetailListVOs(LongYanPurchaseOrderDTO detailDTO, @RequestParam(defaultValue = "1") int pageNum, @RequestParam(defaultValue = "20") int pageSize) {
+        return new R(yongyouService.getMergeLongYanPurchaseDetailListVOs(detailDTO, pageNum, pageSize));
+    }
+
 
     /**
      * 发起用友出库单

platform-service/src/main/java/com/platform/service/yongyou/YongyouService.java

@@ -25,6 +25,8 @@ public interface YongyouService {
     String pushMergePurchaseOrder(String id);
     void purchaseOrderUpdate();
     AbstractPageResultBean<LongYanPurchaseDetailListVO> getLongYanPurchaseDetailListVOs(LongYanPurchaseOrderDTO detailDTO, Integer pageNum, Integer pageSize);
+
+    AbstractPageResultBean<LongYanPurchaseDetailListVO> getMergeLongYanPurchaseDetailListVOs(LongYanPurchaseOrderDTO detailDTO, Integer pageNum, Integer pageSize);
     List<PurchasePriceVO> getPurchasePrice(List<String> codes,Integer isNew);
 
     String deletePurchaseOrder(String id);

platform-service/src/main/java/com/platform/service/yongyou/impl/YongyouServiceImpl.java

@@ -717,7 +717,55 @@ public class YongyouServiceImpl implements YongyouService {
         boms.add(sbModelSpareBom);
     }
 
+    @Override
+    public AbstractPageResultBean<LongYanPurchaseDetailListVO> getMergeLongYanPurchaseDetailListVOs(LongYanPurchaseOrderDTO detailDTO, Integer pageNum, Integer pageSize) {
+        GetLongYanPurchaseDetalListRequest request = new GetLongYanPurchaseDetalListRequest();
+        // 正式环境代码开始
+        request.setToken(geToken(detailDTO.getOldOrNew()));
+        request.setCAcc_ID(getCAccId2(detailDTO.getOldOrNew()));
+        request.setConn(getConn2(detailDTO.getOldOrNew()));
+        // 正式环境代码结束
+        // 测试环境代码开始
+        /*request.setToken(geTokenTest());
+        request.setCAcc_ID(getCAccIdTest());
+        request.setConn(getConnTest());*/
+        // 测试环境代码结束
+        StringBuffer strWhere = new StringBuffer("1=1 and ccode = ").append("'"+detailDTO.getYongYouId()+"'");
+        request.setStrWhere(strWhere.toString());
+        GetPurchaseDetailListHandler handler = new GetPurchaseDetailListHandler();
+        handler.setRequest(request);
+        String responseStr = handler.handler();
+        GetPurchaseDetailListResponse response = JsonUtils.jsonToModel(responseStr,GetPurchaseDetailListResponse.class);
+        if (response.getResult()) {
+            List<LongYanPurchaseDetailListVO> data = response.getData();
+            if (data!=null&&data.size()>0){
+                String yongYouId = data.get(0).getCCode();
+                LongYanPurchaseOrderMerge merge = new LongYanPurchaseOrderMerge();
+                merge.setYongYouId(yongYouId);
+                LongYanPurchaseOrderMerge udpMerge = longYanPurchaseOrderMergeMapper.selectOne(merge);
+//                udpOrder.setStatus(data.get(0).getIStatus());
+                addMergeStatus(data, merge);
+                longYanPurchaseOrderMergeMapper.updateByPrimaryKeySelective(udpMerge);
+                List<LongYanPurchaseDetailDTO> list = new ArrayList<>();
+                for (LongYanPurchaseDetailListVO vo:data){
+                    LongYanPurchaseDetailDTO detail = new LongYanPurchaseDetailDTO();
+                    detail.setNo(vo.getCInvCode());
+                    detail.setYongYouId(vo.getCTrackNo());
+                    detail.setPurchasedNum(vo.getIPOSum());
+                    detail.setInStoreNum(vo.getIRDSum());
+                    addDetailStatus(data, detail);
+                    list.add(detail);
+                }
+                if (list.size()>0){
+                    longYanPurchaseDetailMapper.updateBatchPurchaseDetails(list);
+                }
+            }
+            AbstractPageResultBean<LongYanPurchaseDetailListVO> voMyPage = PageUtils.getPageInfo(pageNum,pageSize,data);
+            return voMyPage;
+        }
 
+        return null;
+    }
 
     @Override
     public AbstractPageResultBean<LongYanPurchaseDetailListVO> getLongYanPurchaseDetailListVOs(LongYanPurchaseOrderDTO detailDTO, Integer pageNum, Integer pageSize) {
@@ -769,6 +817,8 @@ public class YongyouServiceImpl implements YongyouService {
         return null;
     }
 
+
+
     @Override
     public List<PurchasePriceVO> getPurchasePrice(List<String> codes,Integer isNew) {
         GetPurchasePriceRequest request = new GetPurchasePriceRequest();
@@ -824,6 +874,23 @@ public class YongyouServiceImpl implements YongyouService {
             udpOrder.setStatus(LongYanPurchaseOrderStatusEnum.unknowing_status.getValue());
         }
     }
+    private void addMergeStatus(List<LongYanPurchaseDetailListVO> data, LongYanPurchaseOrderMerge merge) {
+        if ("锁定".equals(data.get(0).getIStatus())){
+            merge.setStatus(LongYanPurchaseOrderStatusEnum.locked.getValue());
+        }else if ("开立".equals(data.get(0).getIStatus())){
+            merge.setStatus(LongYanPurchaseOrderStatusEnum.stand.getValue());
+        }else if ("审核".equals(data.get(0).getIStatus())){
+            merge.setStatus(LongYanPurchaseOrderStatusEnum.check.getValue());
+        }else if ("取消关闭".equals(data.get(0).getIStatus())){
+            merge.setStatus(LongYanPurchaseOrderStatusEnum.cancel_close.getValue());
+        }
+        else if ("正常关闭".equals(data.get(0).getIStatus())){
+            merge.setStatus(LongYanPurchaseOrderStatusEnum.normal_close.getValue());
+        }
+        else if ("未知状态".equals(data.get(0).getIStatus())){
+            merge.setStatus(LongYanPurchaseOrderStatusEnum.unknowing_status.getValue());
+        }
+    }
 
     @Override
     public String deleteMergePurchaseOrder(String id) {