Merge remote-tracking branch 'origin/dev' into dev

topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyMRP.js

@@ -175,8 +175,7 @@ function bindEvent(){
     if ($('#vint2').val()==''){
         $('#vint2').val("999");
     }
-    if ($('#vrmod').val()=='')
-    {
+    if ($('#vrmod').val()==''){ //消耗模式
       $('#vrmod').val("2");
     }
     $('#lgproName').searchbox({

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

@@ -116,10 +116,9 @@
                 <x:selectC name="vrmod" label="消耗模式" labelCol="1" fieldCol="2" dictionary="vrmod"/>
                 <x:inputC name="vint1" label="逆推消耗期间" labelCol="1" fieldCol="2" mask="99999"/>
                 <x:inputC name="vint2" label="顺推消耗期间" labelCol="1" fieldCol="2" mask="99999"/>
-                <x:inputC name="miskz" label="综合MRP" labelCol="1" fieldCol="2"/>
-
-                <x:inputC name="perkz" label="期间标识" labelCol="1" fieldCol="2"/>
+                <x:selectC name="miskz" label="综合MRP" labelCol="1" fieldCol="2"  dictionary="MISKZ"/>
 
+                <x:selectC name="perkz" label="期间标识" labelCol="1" fieldCol="2"  dictionary="perkz"/>
             </div>
         </div>
 

topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyProduce.js

@@ -175,6 +175,17 @@ function bindEvent(){
             $('#ausme').val(data.MSEHI);
             $('#ausmeName').val(data.MSEHL);
         }
+    });  //"T024F
+    //alert($('#werks').val());
+    $('#fevor').searchbox({
+        type: "system", name: "dictionary",
+        getParam: function (item) {
+            return {fieldName: "T024F", filterValue: $('#werks').val()}
+        },
+        onChange: function (value, data) {
+            $('#fevor').val(data.FEVOR);
+           // $('#fevorName').val(data.LGOBE);
+        }
     });
 }
 

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

@@ -17,6 +17,7 @@
     <form class="hg-form" method="post" action="" id="submitForm">
         <x:hidden name="active"/> <!--状态-->
         <x:hidden name="meId"/> <!--状态-->
+        <x:hidden name="werks"/>
         <div style="float: right; margin-right: 10px;display: none;" class="btn-group" id="buttonBox">
             <button id="save" title="" type="button" onclick="saveForm(0)" class="btn btn-gray"><i
                     class="fa fa-save"></i>保存
@@ -79,7 +80,7 @@
                 <x:inputC name="umrenProd" label="转换分母" labelCol="1" fieldCol="3"/>
                 <x:inputC name="umrezProd" label="转换分子" labelCol="1" fieldCol="3"/>
                 <x:selectC name="sfcpf" label="生产计划参数文件" labelCol="2" fieldCol="2" dictionary="sfcpf"/>
-                <x:inputC name="fevor" label="生产主管" labelCol="1" fieldCol="2"/>
+                <x:inputC name="fevor" label="生产主管" labelCol="1" fieldCol="2" wrapper="select"/>
             </div>
         </div>
 

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/addPurchaseInfoRecordDetail.js

@@ -11,11 +11,13 @@ function initialize(){
  //   if (isDetailPage) {
    //     $("#jobPageTop").hide();
  //   }
+   // alert($("#isReadOnly").val());
     if ($("#isReadOnly").val()=="true") {
          disableForm("infoRecord","disable");
     } else {
          var readwriteList = UICtrl.getUIElementPermissions(UIPO.READWRITE, UIPK.DETAIL);
-        if (($("#statusId").val() == 1 && readwriteList.length > 0)) {
+        // alert("dsd=="+readwriteList.length); alert(TaskKind.isReplenishTask(taskKindId)); 打回的
+        if (($("#statusId").val() == 1 && readwriteList.length > 0&&TaskKind.isReplenishTask(taskKindId)!=true)) {
              disableForm("infoRecord", "disable");
             $.each(readwriteList, function (i, o) {
                 $("#" + o).removeAttr('disabled');

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/purchaseInfoRecordDetail.js

@@ -688,7 +688,8 @@ function  viewHandler(data){
     var param = JSON.stringify(data);
     var rowId=data.__id;
     var readwriteList = UICtrl.getUIElementPermissions(UIPO.READWRITE, UIPK.DETAIL);
-    if ($("#isReadOnly").val()=="true"||($("#statusId").val()==1&&readwriteList.length==0)) {
+   // alert($("#isReadOnly").val()); alert(readwriteList.length);
+    if ($("#isReadOnly").val()=="true"||($("#statusId").val()==1&&readwriteList.length==0&&TaskKind.isReplenishTask(taskKindId)!=true)) {
       UICtrl.showAjaxDialog({
         title: "查看采购信息记录",
         url: web_app.name + '/sapPurchaseInfoRecord/addSapPurchaseInfoRecordDetail.load?id=' + data.id + '&rowId=' + rowId+'&isReadOnly=true',

topsun/src/main/java/com/huigou/topsun/ep/order/application/impl/EpSaleOrderApplicationImpl.java

@@ -267,7 +267,7 @@ public class EpSaleOrderApplicationImpl extends FlowBroker implements EpSaleOrde
         try {
             String execute = httpClient.executeForEp(map, "od/saleOrder/auditedResult");
             EpResult epResult = JSONObject.parseObject(execute, EpResult.class);
-            resultMap.put("type", epResult.getCode());
+            resultMap.put("TYPE", epResult.getCode());
             resultMap.put("message", epResult.getMsg());
             if (!"200".equals(epResult.getCode())){
                 throw new RuntimeException("数据传输失败，"+ epResult.getMsg());

topsun/src/main/java/com/huigou/topsun/ep/order/application/impl/EpSaleOrderCancelApplicationImpl.java

@@ -266,7 +266,7 @@ public class EpSaleOrderCancelApplicationImpl extends FlowBroker implements EpSa
         try {
             String execute = httpClient.executeForEp(map, "od/saleOrder/auditedResult");
             EpResult epResult = JSONObject.parseObject(execute, EpResult.class);
-            resultMap.put("type", epResult.getCode());
+            resultMap.put("TYPE", epResult.getCode());
             resultMap.put("message", epResult.getMsg());
             if (!"200".equals(epResult.getCode())){
                 throw new RuntimeException("数据传输失败，"+ epResult.getMsg());

topsun/src/main/java/com/huigou/topsun/sap/common/application/impl/SapMutualEpLogApplicationImpl.java

@@ -40,6 +40,7 @@ public class SapMutualEpLogApplicationImpl extends FlowBroker implements SapMutu
             sapMutualEpLog = ClassHelper.fromMap(SapMutualEpLog.class, map);
             String message = map.get("MESSAGE")!=null?map.get("MESSAGE").toString():"";
             sapMutualEpLog.setMessage(message);
+            sapMutualEpLog.setType(map.get("TYPE")!=null?map.get("TYPE").toString():"");
             //BeanUtil.mapToBean(map, ClassHelpersapMutualEpLog);
             Date date = new Date();
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -47,6 +48,8 @@ public class SapMutualEpLogApplicationImpl extends FlowBroker implements SapMutu
             sapMutualEpLog.setCreatedDate(sdf.format(date));
             sapMutualEpLogRepository.save(sapMutualEpLog);
         }catch (Exception ex){
+            sapMutualEpLog.setMessage(sapMutualEpLog.getMessage()+":保存日志:"+ex.getMessage());
+            sapMutualEpLogRepository.save(sapMutualEpLog);
             ex.printStackTrace();
         }
         return sapMutualEpLog;

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

@@ -331,6 +331,9 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
         //存储分区标识默认001
         sapVO.setLgbkz("001");
          sapVO.setMbrsh("M");//行业默认M
+        if ("0".equals(sapVO.getPerkz())){ //期间标识
+           sapVO.setPerkz("");
+        }
         //销售单位转换
         if (StringUtil.isNotBlank(sapVO.getVrkme())){
             Map<String,Object> unitsaleMap = new HashMap<>();
@@ -358,7 +361,7 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
         backMap.put("businessId", baseInfo.getId());
         backMap.put("parameter", JSON.toJSONString(mapList));
         backMap.put("sequence", backMap.get("row"));
-        backMap.put("type", "E");
+        backMap.put("TYPE", "E");
         try {
             String result = defaultHttpClient.execute(mapList, url);
             List<Map<String, Object>> resultList = objectMapper.readValue(result, new TypeReference<List<Map<String, Object>>>() {
@@ -371,8 +374,8 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
             // resultMap.put("businessType", busiType);
             // resultMap.put("parameter", JSON.toJSONString(map));
             //  resultMap.put("businessId", prodApplyBaseInfo.getId());
-            if ("S".equals(backMap.get("TYPE"))) {
-                backMap.put("type", "S");
+            if ("S".equals(returnMap.get("TYPE"))) {
+                backMap.put("TYPE", "S");
                 backMap.put("MESSAGE",applyDept.getMatnr()+":"+backMap.get("MESSAGE"));
                 if (!"product".equals(baseInfo.getKind())) {
                     applyDept.setMatnr((String) backMap.get("MESSAGE_V1"));
@@ -446,7 +449,7 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
        // if ("product".equals(baseInfo.getKind())) {
        //     messageExecute.setTaskDescribe(deptName + "产品数据维护");
        // } else {
-         if ("S".equals(map.get("type").toString())){
+         if ("S".equals(map.get("TYPE").toString())){
             messageExecute.setTaskDescribe("成功"+map.get("MESSAGE").toString());
          } else {
             messageExecute.setTaskDescribe("错误"+map.get("MESSAGE").toString());

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

@@ -303,7 +303,7 @@ public class NonProdApplyController extends CommonController {
         messageMap.put("Message_Text","成功");
         LOG.info("参数:=={}",prodApplyFromSapVO);
         HashMap<String, Object> resultMap = new HashMap<>();
-        resultMap.put("type", "S");
+        resultMap.put("TYPE", "S");
         resultMap.put("MESSAGE","成功");
         resultMap.put("businessType", "接收SAP产品数据");
 
@@ -317,18 +317,18 @@ public class NonProdApplyController extends CommonController {
                 message="产品编号"+prodApplyFromSapVO.getMatnr()+"已经存在！";
                 messageMap.put("Message_Status","E");
                 messageMap.put("Message_Text",message);
-                resultMap.put("type", "E");
+                resultMap.put("TYPE", "E");
              } else {
                 message=nonProdApplyApplication.saveProdApplyFromSapVO(prodApplyFromSapVO);
                 if (StringUtil.isNotBlank(message)){
-                  resultMap.put("type", "E");
+                  resultMap.put("TYPE", "E");
                 }
             }
              resultMap.put("MESSAGE",message);
         }catch (Exception e){
             messageMap.put("Message_Status","E");
             messageMap.put("Message_Text",e);
-            resultMap.put("type", "E");
+            resultMap.put("TYPE", "E");
             resultMap.put("MESSAGE",e.getMessage());
         }
         sapMutualEpLogApplication.saveSapMutualEpLog(resultMap);

topsun/src/main/java/com/huigou/topsun/sap/purchase/application/impl/SapPurchaseApplicationImpl.java

@@ -160,13 +160,13 @@ public class SapPurchaseApplicationImpl extends FlowBroker implements SapPurchas
             if (!"S".equals(sapResult.getTYPE())){
                 throw new RuntimeException("数据传输失败，"+ sapResult.getMESSAGE());
             } else {
-                resultMap.put("type", sapResult.getTYPE());
+                resultMap.put("TYPE", sapResult.getTYPE());
                 resultMap.put("MESSAGE", sapResult.getMESSAGE());
             }
             sapPurchase.setBanfn(sapResult.getMESSAGE_V1());//SAP采购申请编号
             sapPurchaseRepository.save(sapPurchase);
         } catch (IOException e) {
-            resultMap.put("type", "E");
+            resultMap.put("TYPE", "E");
             resultMap.put("MESSAGE", e.getMessage());
             throw new RuntimeException(e);
         }finally {

topsun/src/main/java/com/huigou/topsun/sap/purchaseApproval/application/impl/SapPurchaseApprovalApplicationImpl.java

@@ -438,14 +438,14 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa
             if (!"S".equals(backMap.get("TYPE"))) {
                 throw new RuntimeException("数据传输失败，请稍后手动重试！"+backMap.get("MESSAGE"));
             } else {
-                resultMap.put("type", backMap.get("TYPE"));
+                resultMap.put("TYPE", backMap.get("TYPE"));
                 resultMap.put("MESSAGE", backMap.get("MESSAGE"));
             }
             sapPurchaseApproval.setType((String) backMap.get("TYPE"));
             sapPurchaseApproval.setMessage((String) backMap.get("MESSAGE"));
             sapPurchaseApprovalRepository.save(sapPurchaseApproval);
         } catch (Exception e) {
-            resultMap.put("type", "E");
+            resultMap.put("TYPE", "E");
             resultMap.put("MESSAGE", e.getMessage());
             throw new RuntimeException("数据传输失败请检查数据后重试！"+e.getMessage());
         }finally {

topsun/src/main/java/com/huigou/topsun/sap/purchaseInfoRecord/application/impl/SapPurchaseInfoRecordApplicationImpl.java

@@ -158,18 +158,18 @@ public class SapPurchaseInfoRecordApplicationImpl extends FlowBroker implements
                 List<SapResult> resultList = JSONObject.parseArray(execute, SapResult.class);
                 SapResult sapResult = resultList.get(0);
                 if (!"S".equals(sapResult.getTYPE())){
-                    resultMap.put("type", sapResult.getTYPE());
+                    resultMap.put("TYPE", sapResult.getTYPE());
                     resultMap.put("MESSAGE", "数据传输失败，"+ sapResult.getMESSAGE());
                     throw new RuntimeException("数据传输失败，"+ sapResult.getMESSAGE());
                 } else {
-                    resultMap.put("type", sapResult.getTYPE());
+                    resultMap.put("TYPE", sapResult.getTYPE());
                     resultMap.put("MESSAGE", sapResult.getMESSAGE());
                 }
                 sapPurchaseInfoRecordItem.setTYPE(sapResult.getTYPE());
                 sapPurchaseInfoRecordItem.setMESSAGE(sapResult.getMESSAGE());
                 sapPurchaseInfoRecordItemApplication.save(sapPurchaseInfoRecordItem);
             } catch (IOException e) {
-                resultMap.put("type", "E");
+                resultMap.put("TYPE", "E");
                 resultMap.put("MESSAGE", e.getMessage());
                 throw new RuntimeException(e);
             }finally {

topsun/src/main/java/com/huigou/topsun/sap/suppliers/application/impl/SuppliersDataApplicationImpl.java

@@ -384,7 +384,7 @@ public class SuppliersDataApplicationImpl extends FlowBroker implements Supplier
             resultMap.put("sequence", resultMap.get("row"));
             if ("S".equals(sapResult.getTYPE())&&"0".equals(suppliersInfo.getApplyType())) {
                 suppliersInfo.setPartner(sapResult.getMESSAGE_V1().substring(4));
-                resultMap.put("type", sapResult.getTYPE());
+                resultMap.put("TYPE", sapResult.getTYPE());
                 resultMap.put("MESSAGE", sapResult.getMESSAGE());
                 suppliersInfoRepository.save(suppliersInfo);
 
@@ -392,7 +392,7 @@ public class SuppliersDataApplicationImpl extends FlowBroker implements Supplier
                 throw new RuntimeException("数据传输失败，请稍后手动重试！" + sapResult.getMESSAGE());
             }
         } catch (Exception e) {
-            resultMap.put("type", "E");
+            resultMap.put("TYPE", "E");
             resultMap.put("MESSAGE", e.getMessage());
             throw new RuntimeException("数据传输失败请检查数据后重试！" + e.getMessage());
         } finally {

topsun/src/main/java/com/huigou/topsun/sap/transfers/application/impl/SapStockTransfersApplicationImpl.java

@@ -219,7 +219,7 @@ public class SapStockTransfersApplicationImpl extends FlowBroker implements SapS
             if ("S".equals(sapResult.getTYPE())) {
                 SapStockTransfers sapStockTransfers = this.getStockTransfersById(id);
                 //  suppliersInfo.setPartner(sapResult.getMESSAGE_V1());
-                resultMap.put("type", sapResult.getTYPE());
+                resultMap.put("TYPE", sapResult.getTYPE());
                 resultMap.put("MESSAGE", sapResult.getMESSAGE());
                 sapStockTransfers.setType(sapResult.getTYPE());
                 sapStockTransfers.setMessage(sapResult.getMESSAGE_V1());
@@ -228,7 +228,7 @@ public class SapStockTransfersApplicationImpl extends FlowBroker implements SapS
                 throw new RuntimeException("数据传输失败，请稍后手动重试！" + sapResult.getMESSAGE());
             }
         } catch (Exception e) {
-            resultMap.put("type", "E");
+            resultMap.put("TYPE", "E");
             resultMap.put("MESSAGE", e.getMessage());
             throw new RuntimeException("数据传输失败请检查数据后重试！" + e.getMessage());
         } finally {

topsun/src/main/java/com/huigou/topsun/syncOrg/application/impl/OrgSyncApplicationImpl.java

@@ -237,10 +237,10 @@ public class OrgSyncApplicationImpl extends BaseApplication implements OrgSyncAp
                 }
             }
             personRepository.save(personList);
-            resultMap.put("type", "S");
+            resultMap.put("TYPE", "S");
             resultMap.put("message", "成功");
         } catch (Exception e) {
-            resultMap.put("type", "E");
+            resultMap.put("TYPE", "E");
             resultMap.put("message", e.getMessage());
             throw new RuntimeException("数据传输失败请检查数据后重试！" + e.getMessage());
         } finally {