非生产性领料验证领料数量

topsun-xt/src/main/webapp/biz/topsun/sap/nonProducePick/nonProducePickDetail.js

@@ -127,7 +127,10 @@ function loadGrid() {
                         type: 'system',
                         name: "dictionary",
                         getParam: function (item) {
-                            return {fieldName: "LGORT"}
+                            return {
+                                fieldName: "LGORT",
+                                filterValue: $("#werks").val()
+                            }
                         },
                         back: {
                             LGORT: "lgort",

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

@@ -83,6 +83,10 @@ public class NonProducePickApplicationImpl extends FlowBroker implements NonProd
         NonProducePickVo nonProducePickVo = new NonProducePickVo();
         nonProducePickVo.setRsnum(nonProducePick.getMessage());
         nonProducePickVo.setZtype(ztype);
+        //审批通过，不传ztype，state传3
+        if (StringUtil.isBlank(ztype)){
+            nonProducePickVo.setState("3");
+        }
         nonProducePickVo.setBster(DateUtil.getDateFormat("yyyyMMdd",nonProducePick.getFillinDate()));
         nonProducePickVo.setWerks(nonProducePick.getWerks());
         nonProducePickVo.setUsnam(nonProducePick.getPersonMemberName());
@@ -118,6 +122,8 @@ public class NonProducePickApplicationImpl extends FlowBroker implements NonProd
                 nonProducePick.setMessage(sapResult.getMESSAGE_V1());
             }else if ("N".equals(ztype)){
                 nonProducePick.setMessage(sapResult.getMESSAGE());
+            }else if (StringUtil.isBlank(ztype)){
+                nonProducePick.setMessage(sapResult.getMESSAGE());
             }
             nonProducePickRepository.save(nonProducePick);
         } catch (IOException e) {
@@ -219,6 +225,7 @@ public class NonProducePickApplicationImpl extends FlowBroker implements NonProd
         String bizId = delegateExecution.getProcessBusinessKey();
         BizBillStatus status = approvePassed() ? BizBillStatus.COMPLETED : BizBillStatus.ABORTED;
         NonProducePick nonProducePick = nonProducePickRepository.findOne(bizId);
+        this.sendNonProducePickData(nonProducePick,"");
         nonProducePick.setStatusId(status.getId());
         nonProducePickRepository.save(nonProducePick);
     }

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

@@ -69,6 +69,9 @@ public class NonProducePickVo implements Serializable {
     @JsonProperty("ZTYPE")
     private String ztype;
 
+    @JsonProperty("STATE")
+    private String state;
+
     @JsonProperty("ITEM")
     private List<NonProducePickItemVo> items;