退料申请；接收退料冲销优化；物料变更、扩展显示中文、英文文本描述；物料申请和信息填报单位不一致的问题

topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/materialNameElement.jsp

@@ -22,8 +22,8 @@
             <x:inputC name="quarter" label="季度" labelCol="2" fieldCol="10" maxlength="40"/>
             <x:inputC name="material" label="材质" labelCol="2" fieldCol="10" maxlength="40"/>
             <x:inputC name="color" label="颜色" labelCol="2" fieldCol="10" maxlength="40"/>
-            <x:inputC name="specifications" label="规格mm" labelCol="2" fieldCol="10" maxlength="40"/>
-            <x:inputC name="thickness" label="厚度cm" labelCol="2" fieldCol="10" maxlength="40" mask="nnnnnnnn.nnnn"/>
+            <x:inputC name="specifications" label="规格" labelCol="2" fieldCol="10" maxlength="40"/>
+            <x:inputC name="thickness" label="厚度" labelCol="2" fieldCol="10" maxlength="40" mask="nnnnnnnn.nnnn"/>
             <x:inputC name="weight" label="克重g" labelCol="2" fieldCol="10" maxlength="40" mask="nnnnnnnn.nnnn"/>
             <x:textareaC name="maktxRemZh" label="物料描述" labelCol="2" fieldCol="10" rows="4"/>
             <x:inputC name="maktx" label="SAP品名" labelCol="2" fieldCol="10" readonly="true" maxlength="40"/>

topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyDetail.jsp

@@ -38,6 +38,8 @@
         <x:hidden name="positionName"/>
         <x:hidden name="personMemberId"/>
         <x:hidden name="createdDate"/>
+        <x:hidden name="maktxRemZh"/>
+        <x:hidden name="maktxRemEn"/>
 <%--        <x:hidden name="personMemberName"/>--%>
     <x:title title="申请人填写区域" name="group"/>
     <div class="hg-form-cols">

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyDeptApplicationImpl.java

@@ -150,7 +150,6 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
         ClassHelper.copyProperties(deptVo,nonProdApplyDept);
 
         nonProdApplyDept = this.save(nonProdApplyDept);
-        LOG.info("物料主数据视图实体:={}", JSON.toJSONString(nonProdApplyDept));
         map.put("applyDeptId",nonProdApplyDept.getApplyDeptId());
         map.put("type","S");
         //不是分发的  提交后产生领导的待办信息

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/controller/NonProdApplyNextController.java

@@ -206,7 +206,7 @@ public void getBaseInfoAttrs(NonProdApplyBaseInfo baseInfo,SapNonProdApplyDept n
         nonProdApplyDept.setTextDescription(baseInfo.getTextDescription());
 
         nonProdApplyDept.setBaseUnitName(baseInfo.getBaseUnitName());
-        if (StringUtil.isNotBlank(baseInfo.getBaseUnit())){
+        if (StringUtil.isNotBlank(baseInfo.getBaseUnit()) && StringUtil.isBlank(nonProdApplyDept.getMeins())){
             nonProdApplyDept.setMeins(baseInfo.getBaseUnit());
             nonProdApplyDept.setMeinsName(baseInfo.getBaseUnitName());
         }

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

@@ -3,6 +3,7 @@ package com.huigou.topsun.sap.nonProducePick.application;
 import com.huigou.topsun.sap.nonProducePick.domain.NonProducePick;
 import com.huigou.topsun.sap.nonProducePick.domain.query.NonProducePickQueryRequest;
 import com.huigou.topsun.sap.nonProducePick.vo.PDABackPickVo;
+import com.huigou.topsun.sap.nonProducePick.vo.PDANonProducePickItemVo;
 
 import java.util.List;
 import java.util.Map;
@@ -34,7 +35,7 @@ public interface NonProducePickApplication {
      * @param rsnums
      * @return
      */
-    String getNonProducePick(List<String> rsnums);
+    List<PDANonProducePickItemVo> getNonProducePick(List<String> rsnums);
 
     void backNonProducePick(PDABackPickVo requestBody);
 }

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

@@ -149,7 +149,7 @@ public class NonProducePickApplicationImpl extends FlowBroker implements NonProd
     }
 
     @Override
-    public String getNonProducePick(List<String> rsnums) {
+    public List<PDANonProducePickItemVo> getNonProducePick(List<String> rsnums) {
         String join = StringUtils.join(rsnums, ",");
         NonProducePickQueryRequest queryRequest = new NonProducePickQueryRequest();
         queryRequest.setMessage(join);
@@ -165,15 +165,15 @@ public class NonProducePickApplicationImpl extends FlowBroker implements NonProd
                 .map(map1 -> {
                     PDANonProducePickItemVo pdaNonProducePickItemVo = ClassHelper.fromMap(PDANonProducePickItemVo.class, map1);
                     String used = pdaNonProducePickItemVo.getUsed();
-                    used.replace("C","R");
+                    used = used.replace("C","R");
                     pdaNonProducePickItemVo.setUsed(used);
                     return pdaNonProducePickItemVo;
                 }).collect(Collectors.toList());
-        String jsonString = "";
-        if (ObjectUtil.isNotEmpty(itemVoList)){
-            jsonString = JSONArray.toJSONString(itemVoList);
-        }
-        return jsonString;
+//        String jsonString = "";
+//        if (ObjectUtil.isNotEmpty(itemVoList)){
+//            jsonString = JSONArray.toJSONString(itemVoList);
+//        }
+        return itemVoList;
     }
 
     @Override
@@ -181,6 +181,9 @@ public class NonProducePickApplicationImpl extends FlowBroker implements NonProd
         List<PDABackPickItemVo> items = requestBody.getData();
         items.forEach(item -> {
             NonProducePick producePick = nonProducePickRepository.findByMessage(item.getMessage());
+            if (producePick == null){
+                throw new RuntimeException("预留号不存在："+item.getMessage());
+            }
             List<NonProducePickItem> itemList = nonProducePickItemApplication.findByNonProducePickId(producePick.getId());
             itemList.forEach(pickItem -> {
                 if (pickItem.getRspos().equals(item.getRspos())){

topsun/src/main/java/com/huigou/topsun/sap/nonProducePick/controller/NonProducePickController.java

@@ -153,15 +153,15 @@ public class NonProducePickController extends CommonController {
         HashMap<String, Object> messageMap = new HashMap<>();
         messageMap.put("CODE","S");
         messageMap.put("MSG","成功");
-        String vo = "";
+        List<PDANonProducePickItemVo> itemVoList = new ArrayList<>();
         try {
             List<String> rsnums = requestBody.get("rsnums");
-            vo = nonProducePickApplication.getNonProducePick(rsnums);
-            messageMap.put("DATA",vo);
+            itemVoList = nonProducePickApplication.getNonProducePick(rsnums);
+            messageMap.put("DATA",itemVoList);
         }catch (RuntimeException e){
             messageMap.put("CODE","E");
             messageMap.put("MSG",e.getMessage());
-            messageMap.put("DATA",vo);
+            messageMap.put("DATA","");
         }
         return messageMap;
     }
@@ -174,7 +174,7 @@ public class NonProducePickController extends CommonController {
         HashMap<String, Object> messageMap = new HashMap<>();
         messageMap.put("CODE","S");
         messageMap.put("MSG","成功");
-        messageMap.put("DATA",requestBody);
+        messageMap.put("DATA","");
         try {
             nonProducePickApplication.backNonProducePick(requestBody);
         }catch (RuntimeException e){