优化

platform-service/src/main/java/com/platform/service/merge/impl/LongYanPurchaseOrderMergeServiceImpl.java

@@ -41,9 +41,9 @@ public class LongYanPurchaseOrderMergeServiceImpl extends BaseServiceImpl<LongYa
     public void modModelByDTO(LongYanPurchaseOrderMergeDTO model) {
         List<LongYanPurchaseOrderVO> longYanPurchaseOrders = model.getPurchaseOrderStr();
         List<DictVO> dictVOS = DictCache.getChildren("MERGE_PARAM_JUGMENT");
-        if (longYanPurchaseOrders==null||longYanPurchaseOrders.size()<2){
-            throw new BusinessException("请选择至少两个请购单进行合并！");
-        }
+//        if (longYanPurchaseOrders==null||longYanPurchaseOrders.size()<2){
+//            throw new BusinessException("请选择至少两个请购单进行合并！");
+//        }
         LongYanPurchaseOrder first = BeanConverterUtil.copyListProperties(longYanPurchaseOrders,LongYanPurchaseOrder.class).get(0);
         //计划类型
         if ("1".equals(dictVOS.get(0).getValue().toString())){
@@ -149,9 +149,9 @@ public class LongYanPurchaseOrderMergeServiceImpl extends BaseServiceImpl<LongYa
             throw new BusinessException("存在非草稿的采购单，不可合并！");
         }
         List<DictVO> dictVOS = DictCache.getChildren("MERGE_PARAM_JUGMENT");
-        if (longYanPurchaseOrders==null||longYanPurchaseOrders.size()<2){
-            throw new BusinessException("请选择至少两个请购单进行合并！");
-        }
+//        if (longYanPurchaseOrders==null||longYanPurchaseOrders.size()<2){
+//            throw new BusinessException("请选择至少两个请购单进行合并！");
+//        }
         LongYanPurchaseOrder first = longYanPurchaseOrders.get(0);
         //计划类型
         if ("1".equals(dictVOS.get(0).getValue().toString())){

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

@@ -151,7 +151,7 @@ public class YongyouServiceImpl implements YongyouService {
         LoginRequest req = new LoginRequest();
         req.setCSrv("192.168.16.249");
         req.setPUserId("sb");
-        req.setPPassword("123456");
+        req.setPPassword("321.jkl");
         req.setPAccId("005");
         req.setPDate(DateUtils.dateToString(LocalDate.now(), DateUtils.PATTERN_YMD));
         req.setPSubId("DP");
@@ -173,7 +173,7 @@ public class YongyouServiceImpl implements YongyouService {
         LoginRequest req = new LoginRequest();
         req.setCSrv("192.168.16.249");
         req.setPUserId("sb");
-        req.setPPassword("123456");
+        req.setPPassword("321.jkl");
         boolean isDev = BeanUtils.isDev();
 //        boolean isDev = BeanUtils.isDev();
         if(!isDev){
@@ -183,7 +183,7 @@ public class YongyouServiceImpl implements YongyouService {
                 req.setPAccId("004");
             }
         }else{
-            req.setPAccId("dmt");
+            req.setPAccId("994");
         }
         req.setPDate(DateUtils.dateToString(LocalDate.now(), DateUtils.PATTERN_YMD));
         req.setPSubId("DP");
@@ -218,8 +218,8 @@ public class YongyouServiceImpl implements YongyouService {
         LoginRequest req = new LoginRequest();
         req.setCSrv("192.168.16.249");
         req.setPUserId("sb");
-        req.setPPassword("123456");
-        req.setPAccId("dmt");
+        req.setPPassword("321.jkl");
+        req.setPAccId("994");
         req.setPDate(DateUtils.dateToString(LocalDate.now(), DateUtils.PATTERN_YMD));
         req.setPSubId("DP");
         handler.setRequest(req);
@@ -303,7 +303,7 @@ public class YongyouServiceImpl implements YongyouService {
                 req.setCAcc_ID("004");
             }
         }else{
-            req.setCAcc_ID("dmt");
+            req.setCAcc_ID("994");
         }
         req.setPageNum(pageNum);
         req.setPageSize(pageSize);
@@ -426,7 +426,7 @@ public class YongyouServiceImpl implements YongyouService {
                 req.setCAcc_ID("004");
             }
         }else{
-            req.setCAcc_ID("dmt");
+            req.setCAcc_ID("994");
         }
         req.setPageNum(pageNum);
         req.setPageSize(pageSize);
@@ -616,7 +616,7 @@ public class YongyouServiceImpl implements YongyouService {
                     }
                     else {
                         if (entry.getKey() == 1) {
-                            req.setCAcc_ID("dmt");
+                            req.setCAcc_ID("994");
                             req.setToken(geToken(1));
                             req.setConn(getConn2(1));
                             for (SpareVO spareVO : oldF) {
@@ -1121,7 +1121,7 @@ public class YongyouServiceImpl implements YongyouService {
                 throw new BusinessException("采购单未选择新老厂！采购单id："+vo.getId());
             }
             LongYanPurchaseDetailDTO longYanPurchaseDetailDTO = new LongYanPurchaseDetailDTO();
-            longYanPurchaseDetailDTO.setLongYangPurchaseOrderId(id);
+            longYanPurchaseDetailDTO.setLongYangPurchaseOrderId(vo.getId());
             List<LongYanPurchaseDetailVO> detailVOS = longYanPurchaseDetailMapper.selectList(longYanPurchaseDetailDTO);
             if (vo.getSbId()!=null) {
                 addBom(vo,detailVOS);
@@ -1170,7 +1170,7 @@ public class YongyouServiceImpl implements YongyouService {
                 }
             for (LongYanPurchaseDetailVO orderVO:detailVOS){
                 PuAppDetail detail = new PuAppDetail();
-                detail.setCdefine30(orderVO.getCdefine30());
+                detail.setCdefine30(vo.getPositionNo());
                 detail.setCdefine22(orderVO.getCdefine22());
                 detail.setCdefine28(orderVO.getCdefine28());
                 detail.setCdefine29(dept);
@@ -1251,16 +1251,17 @@ public class YongyouServiceImpl implements YongyouService {
         }else {
             longYanPurchaseOrderMerge.setStatus(2);
         }
-        longYanPurchaseOrderMergeMapper.updateByPrimaryKey(longYanPurchaseOrderMerge);
         for (LongYanPurchaseOrderVO vo:list){
             LongYanPurchaseOrder order = new LongYanPurchaseOrder();
             order.setId(vo.getId());
             if (response.getResult()){
                 order.setStatus(3);
                 order.setYongYouId(response.getData());
+                longYanPurchaseOrderMerge.setStatus(3);
 //            detail.setLongYangPurchaseOrderId(order.getId());
                 detail.setDetailStatus(9);
             }else {
+                longYanPurchaseOrderMerge.setStatus(0);
                 order.setStatus(0);
                 detail.setDetailStatus(10);
             }
@@ -1270,10 +1271,12 @@ public class YongyouServiceImpl implements YongyouService {
             WeekendCriteria<LongYanPurchaseDetail,Object> weekendCriteria = weekend.weekendCriteria();
             weekendCriteria.andEqualTo(LongYanPurchaseDetail::getLongYangPurchaseOrderId,order.getId());
             longYanPurchaseDetailMapper.updateByExampleSelective(detail,weekend);
+
             if (!response.getResult()){
                 throw new BusinessException(response.getMsg());
             }
         }
+        longYanPurchaseOrderMergeMapper.updateByPrimaryKeySelective(longYanPurchaseOrderMerge);
 
         return response.getMsg();
 
@@ -1507,7 +1510,7 @@ public class YongyouServiceImpl implements YongyouService {
                 req.setCAcc_ID("004");
             }
         }else{
-            req.setCAcc_ID("dmt");
+            req.setCAcc_ID("994");
         }
         req.setPageNum(1);
         req.setPageSize(9999);
@@ -1786,7 +1789,7 @@ public class YongyouServiceImpl implements YongyouService {
                 req.setCAcc_ID("004");
             }
         }else{
-            req.setCAcc_ID("dmt");
+            req.setCAcc_ID("994");
         }
         req.setPageNum(pageNum);
         req.setPageSize(pageSize);