非生产领料申请提交时创建预留单号，终止时删除

topsun/src/main/java/com/huigou/topsun/sap/nonProducePick/application/NonProducePickApplication.java

@@ -24,6 +24,6 @@ public interface NonProducePickApplication {
 
     Map<String, Object> slicedNonProducePickList(NonProducePickQueryRequest queryRequest);
 
-    public void sendNonProducePickData(NonProducePick nonProducePick);
+    public void sendNonProducePickData(NonProducePick nonProducePick,String ztype);
 
 }

topsun/src/main/java/com/huigou/topsun/sap/nonProducePick/application/impl/NonProducePickApplicationImpl.java

@@ -78,9 +78,11 @@ public class NonProducePickApplicationImpl extends FlowBroker implements NonProd
     }
 
     @Override
-    public void sendNonProducePickData(NonProducePick nonProducePick) {
+    public void sendNonProducePickData(NonProducePick nonProducePick,String ztype) {
         //List<NonProducePickVo> nonProducePickVoList = new ArrayList<>();
         NonProducePickVo nonProducePickVo = new NonProducePickVo();
+        nonProducePickVo.setRsnum(nonProducePick.getMessage());
+        nonProducePickVo.setZtype(ztype);
         nonProducePickVo.setBster(DateUtil.getDateFormat("yyyyMMdd",nonProducePick.getFillinDate()));
         nonProducePickVo.setWerks(nonProducePick.getWerks());
         nonProducePickVo.setUsnam(nonProducePick.getPersonMemberName());
@@ -99,6 +101,7 @@ public class NonProducePickApplicationImpl extends FlowBroker implements NonProd
             BeanUtils.copyProperties(pickItem, nonProducePickItemVo);
             nonProducePickItemVo.setWerks(nonProducePick.getWerks());
             nonProducePickItemVo.setErfme(pickItem.getMeins());
+            nonProducePickItemVo.setResItem(pickItem.getRspos());
             return nonProducePickItemVo;
         }).collect(Collectors.toList());
         nonProducePickVo.setItems(pickItemVoList);
@@ -111,7 +114,11 @@ public class NonProducePickApplicationImpl extends FlowBroker implements NonProd
                 throw new RuntimeException("数据传输失败，"+ sapResult.getMESSAGE());
             }
             nonProducePick.setType(sapResult.getTYPE());
-            nonProducePick.setMessage(sapResult.getMESSAGE_V1());
+            if ("Y".equals(ztype)){
+                nonProducePick.setMessage(sapResult.getMESSAGE_V1());
+            }else if ("N".equals(ztype)){
+                nonProducePick.setMessage(sapResult.getMESSAGE());
+            }
             nonProducePickRepository.save(nonProducePick);
         } catch (IOException e) {
             throw new RuntimeException(e);
@@ -181,6 +188,11 @@ public class NonProducePickApplicationImpl extends FlowBroker implements NonProd
         if (this.isApplyProcUnit(delegateTask) && this.getApprovalParameter().isAdvanceProcessAction()) {
             updateStatus(bizId, BizBillStatus.APPROVING);
         }
+        NonProducePick nonProducePick = nonProducePickRepository.findOne(bizId);
+        //第一次提交推送到SAP
+        if (StringUtil.isBlank(nonProducePick.getMessage()) && this.getApprovalParameter().isAdvanceProcessAction()){
+            this.sendNonProducePickData(nonProducePick,"Y");
+        }
     }
 
     /**
@@ -209,7 +221,6 @@ public class NonProducePickApplicationImpl extends FlowBroker implements NonProd
         NonProducePick nonProducePick = nonProducePickRepository.findOne(bizId);
         nonProducePick.setStatusId(status.getId());
         nonProducePickRepository.save(nonProducePick);
-        this.sendNonProducePickData(nonProducePick);
     }
 
     @Override
@@ -219,6 +230,8 @@ public class NonProducePickApplicationImpl extends FlowBroker implements NonProd
         NonProducePick nonProducePick = nonProducePickRepository.findOne(bizId);
         nonProducePick.setStatusId(BizBillStatus.ABORTED.getId());
         nonProducePickRepository.save(nonProducePick);
+        //终止推送到SAP
+        this.sendNonProducePickData(nonProducePick,"N");
     }
 
     /**

topsun/src/main/java/com/huigou/topsun/sap/nonProducePick/vo/NonProducePickItemVo.java

@@ -58,4 +58,7 @@ public class NonProducePickItemVo implements Serializable {
     @JsonProperty("WEMPF")
     private String wempf;
 
+    @JsonProperty("RES_ITEM")
+    private String resItem;
+
 }

topsun/src/main/java/com/huigou/topsun/sap/nonProducePick/vo/NonProducePickVo.java

@@ -61,6 +61,14 @@ public class NonProducePickVo implements Serializable {
     @JsonProperty("BSTER")
     private String bster;
 
+    /**
+     * 标识
+     * Y：创建
+     * N：删除
+     */
+    @JsonProperty("ZTYPE")
+    private String ztype;
+
     @JsonProperty("ITEM")
     private List<NonProducePickItemVo> items;