工序外协打印；ECN变更优化

topsun-xt/src/main/resources/application.properties

@@ -16,7 +16,7 @@ shiro.host=127.0.0.1
 shiro.port=6379
 #shiro.host=192.168.222.122
 #shiro.port=6401
-shiro.expire=1800000
+shiro.expire=18000
 
 system.dataSource=dataSource
 system.hibernate.dialect=com.huigou.data.dialect.MySQL5InnoDBDialect

topsun/src/main/java/com/huigou/topsun/ep/change/application/impl/EpChangeFormApplicationImpl.java

@@ -346,7 +346,9 @@ public class EpChangeFormApplicationImpl extends FlowBroker implements EpChangeF
                     itemMap.put("comment",approvalMap.get("opinion"));
                 }
             });
+            if (itemMap.get("date") != null && itemMap.get("date") != ""){
                 itemMap.put("date",DateUtil.getDateFormat((Date) itemMap.get("date"),"yyyy-MM-dd"));
+            }
         });
         List<Map<String, Object>> stockItemMaps = (List<Map<String, Object>>) stockItemMap.get("Rows");
         stockItemMaps.forEach(itemMap->{
@@ -355,7 +357,9 @@ public class EpChangeFormApplicationImpl extends FlowBroker implements EpChangeF
                     itemMap.put("comment",approvalMap.get("opinion"));
                 }
             });
+            if (itemMap.get("date") != null && itemMap.get("date") != ""){
                 itemMap.put("date",DateUtil.getDateFormat((Date) itemMap.get("date"),"yyyy-MM-dd"));
+            }
         });
         map.put("printTime", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm").format(LocalDateTime.now()));
         map.put("implItemMaps", implItemMaps);

topsun/src/main/java/com/huigou/topsun/ep/change/controller/EpChangeFormController.java

@@ -71,7 +71,7 @@ public class EpChangeFormController extends CommonController {
             this.putAttribute("reasonForChangeList",reasonForChange);
             return forward("epChangeFormDetail",epChangeForm);
         }else {
-            epChangeForm.setReasonForChange("MATERIAL CHANGE");
+            //epChangeForm.setReasonForChange("MATERIAL CHANGE");
             return forward("epMaterialChangeFormDetail",epChangeForm);
         }
     }
@@ -81,11 +81,11 @@ public class EpChangeFormController extends CommonController {
         String id = sdo.getBizId();
         EpChangeForm epChangeForm = epChangeFormApplication.findEpChangeFormById(id);
         Map<String, String> reasonForChange = new HashMap<>();
-        if ("MATERIAL CHANGE".equals(epChangeForm.getReasonForChange())){
+        if ("".equals(epChangeForm.getReasonForChange())){
             return forward("epMaterialChangeFormDetail",epChangeForm);
         }
         reasonForChange = DictUtil.getDictionary("reasonForChange");
-        reasonForChange.remove("MATERIAL CHANGE");
+        //reasonForChange.remove("MATERIAL CHANGE");
         this.putAttribute("reasonForChangeList",reasonForChange);
         return forward("epChangeFormDetail",epChangeForm);
     }

topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/application/impl/SapPurchaseOrderApplicationImpl.java

@@ -461,6 +461,9 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
 
     public Map<String, Object> getSupplierInfo(Map<String, Object> map, String lifnr){
         List<SuppliersInfo> suppliersInfoList = suppliersInfoRepository.findByPartner(lifnr);
+        if (CollectionUtils.isEmpty(suppliersInfoList)){
+            throw new RuntimeException("根据编码：" + lifnr + "未找到供应商信息");
+        }
         SuppliersInfo suppliersInfo = suppliersInfoList
                 .stream()
                 .sorted(Comparator.comparing(SuppliersInfo::getFillinDate, Comparator.reverseOrder()))
@@ -468,7 +471,7 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
         StringBuffer addressBuf = new StringBuffer();
         addressBuf.append(suppliersInfo.getLand1Name())
                 .append(suppliersInfo.getRegionName())
-                .append(suppliersInfo.getCity1Name())
+                .append(suppliersInfo.getCity1())
                 .append(suppliersInfo.getStreet())
                 .append(suppliersInfo.getStrSuppl1())
                 .append(suppliersInfo.getStrSuppl2())
@@ -560,7 +563,7 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
         map.put("outProcess02",outsourceOrderItem.getTxz02());
         //临时工序外发，计算印张数；实际送货数量，LOSS数
         BigDecimal number = (BigDecimal) map.getOrDefault("number",BigDecimal.ZERO);//成品数量
-        BigDecimal model = (BigDecimal)map.getOrDefault("model", BigDecimal.ZERO);//排版数量
+        BigDecimal model = (BigDecimal)map.get("model") != null ? (BigDecimal)map.get("model") : BigDecimal.ZERO;//排版数量
         BigDecimal printLoss = outsourceOrderItem.getPrintLoss() != null ? outsourceOrderItem.getPrintLoss() : BigDecimal.ZERO;//印张LOSS数
         map.put("printLoss",printLoss);
         //印张量 = 成品数量/排版数量