物品报废申请与过账

topsun-xt/src/main/webapp/biz/topsun/sap/productScrapApply/productScrapApplyDetail.js

@@ -41,6 +41,7 @@ function getGridColumns() {
          {display: "报废申请号", name: "zsanum", width: 150, minWidth: 60, type: "string", align: "center"}
         , {display: "项目", name: "zsapos", width: 150, minWidth: 60, type: "string", align: "center"}
         , {display: "物料", name: "matnr", width: 150, minWidth: 60, type: "string", align: "center"}
+        , {display: "物料描述", name: "maktx", width: 300, minWidth: 60, type: "string", align: "center"}
         , {display: "数量", name: "erfmg", width: 150, minWidth: 60, type: "string", align: "center"}
         , {display: "单位", name: "erfme", width: 150, minWidth: 60, type: "string", align: "center"}
         //, {display: "单位描述", name: "erfmeName", width: 150, minWidth: 60, type: "string", align: "center"}

topsun-xt/src/main/webapp/biz/topsun/sap/productScrapApply/productScrapApplyList.js

@@ -20,6 +20,7 @@ function initPurchaseListGrid() {
                 , {display: "报废申请号", name: "zsanum", width: 150, minWidth: 60, type: "string", align: "center"}
                 , {display: "项目", name: "zsapos", width: 150, minWidth: 60, type: "string", align: "center"}
                 , {display: "物料", name: "matnr", width: 150, minWidth: 60, type: "string", align: "center"}
+                , {display: "物描述料", name: "maktx", width: 300, minWidth: 60, type: "string", align: "center"}
                 , {display: "数量", name: "erfmg", width: 150, minWidth: 60, type: "string", align: "center"}
                 , {display: "单位", name: "erfme", width: 150, minWidth: 60, type: "string", align: "center"}
                 //, {display: "单位描述", name: "erfmeName", width: 150, minWidth: 60, type: "string", align: "center"}
@@ -63,7 +64,7 @@ function initPurchaseListGrid() {
             }
             ,
             onDblClickRow: function (data, rowindex, rowobj) {
-                viewHandler(data.id);
+                viewHandler(data.productScrapApplyId);
             },
             onAfterShowData: function (currentData) {
 

topsun/src/main/java/com/huigou/topsun/sap/productScrapApply/controller/ProductScrapApplyController.java

@@ -18,6 +18,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -56,7 +57,13 @@ public class ProductScrapApplyController extends CommonController {
         LOG.info("物品报废申请与过账平台数据=={}", JSONUtil.toString(productScrapApplyVoListVo));
         String billCode = "";
         try {
-            billCode = this.productScrapApplyApplication.saveProductScrapApplyVo(productScrapApplyVoListVo);
+            if (CollectionUtils.isEmpty(productScrapApplyVoListVo)){
+                messageMap.put("Message_Status","E");
+                messageMap.put("Message_Text","未接收到数据，请检查");
+                messageMap.put("ZBPMID",billCode);
+            }else {
+                billCode = this.productScrapApplyApplication.saveProductScrapApplyVo(productScrapApplyVoListVo);
+            }
             messageMap.put("ZBPMID",billCode);
         }catch (RuntimeException e){
             messageMap.put("Message_Status","E");

topsun/src/main/java/com/huigou/topsun/sap/productScrapApply/domain/ProductScrapApplyItem.java

@@ -39,6 +39,12 @@ public class ProductScrapApplyItem extends AbstractEntity {
     @Column(name = "MATNR")
     private String matnr;
 
+    /**
+     * 物料描述
+     */
+    @JsonProperty("MAKTX")
+    private String maktx;
+
     /**
      * 数量
      */

topsun/src/main/java/com/huigou/topsun/sap/productScrapApply/vo/ProductScrapApplyVo.java

@@ -30,6 +30,12 @@ public class ProductScrapApplyVo implements Serializable {
     @JsonProperty("MATNR")
     private String matnr;
 
+    /**
+     * 物料描述
+     */
+    @JsonProperty("MAKTX")
+    private String maktx;
+
     /**
      * 数量
      */