原材料页面调整

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

@@ -47,8 +47,8 @@
 
             <x:radioC name="maintenanceType" label="维护类型" labelCol="1" fieldCol="2" dictionary="maintainType" value="new" disabled="true"/>
             <x:selectC name="statusId" label="批准状态" dictionary="bizBillStatus"  disabled="true" labelCol="1" fieldCol="2"/>
-            <x:inputC name="approver" label="批准人" labelCol="1" fieldCol="2"/>
-            <x:inputC name="approvalDate" label="批准日期" wrapper="date" labelCol="1" fieldCol="2"/>
+            <x:inputC name="approver" label="批准人" readonly="true" labelCol="1" fieldCol="2"/>
+            <x:inputC name="approvalDate" label="批准日期" readonly="true" wrapper="date" labelCol="1" fieldCol="2"/>
         </div>
     </div>
     <x:title title="维护物品总体内容" name="group"/>

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

@@ -10,6 +10,7 @@ $(document).ready(function () {
     loadGrid();
     // initAssistantGrid();
     loadRejectReasonBox();
+    bindEvent();
 })
 
 
@@ -171,6 +172,18 @@ function loadGrid() {
     UICtrl.setSearchAreaToggle(gridManager);
 }
 
+function bindEvent(){
+    $('#werksName').searchbox({
+        type: "system", name: "dictionary",
+        getParam: function (item) {
+            return {fieldName: "WERKS"}
+        },
+        onChange: function (value, data) {
+            $('#werks').val(data.WERKS);
+            $('#werksName').val(data.NAME1);
+        }
+    });
+}
 
 /**
  * 表单提交

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

@@ -173,28 +173,21 @@ function bindEvent(){
     $('#lgproName').searchbox({
         type: "system", name: "dictionary",
         getParam: function (item) {
-            return {
-                fieldName: "LGTYP",
-                //filterValue:$('#lgnum').val()
-            }
+            return {fieldName: "LGORT"}
         },
         onChange: function (value, data) {
-            $('#lgpro').val(data.LGTYP);
-            $('#lgproName').val(data.LTYPT);
+            $('#lgpro').val(data.LGORT);
+            $('#lgproName').val(data.LGOBE);
         }
     });
-
     $('#lgfsbName').searchbox({
         type: "system", name: "dictionary",
         getParam: function (item) {
-            return {
-                fieldName: "LGTYP",
-                //filterValue:$('#lgnum').val()
-            }
+            return {fieldName: "LGORT"}
         },
         onChange: function (value, data) {
-            $('#lgfsb').val(data.LGTYP);
-            $('#lgfsbName').val(data.LTYPT);
+            $('#lgfsb').val(data.LGORT);
+            $('#lgfsbName').val(data.LGOBE);
         }
     });
 

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

@@ -82,19 +82,15 @@
                 <x:inputC name="werksName" label="工厂" labelCol="1" fieldCol="2"/>
                 <x:selectC name="disgr" label="MRP组" labelCol="1" fieldCol="2" dictionary="disgr"/>
                 <x:selectC name="dismm" label="MRP类型" labelCol="1" fieldCol="2" dictionary="dismm"/>
-
                 <x:hidden name="minbe"/>
                 <x:inputC name="minbeName" label="重订货点" labelCol="1" fieldCol="2" required="true" wrapper="select"/>
-
-                <x:hidden name="dispo"/>
-                <x:inputC name="dispoName" label="MRP控制者" labelCol="1" fieldCol="2" required="true" wrapper="select"/>
-
+                <x:selectC name="dispo" label="MRP控制者" labelCol="1" fieldCol="2" required="true" dictionary="dispo"/>
                 <x:selectC name="disls" label="批量规模" labelCol="1" fieldCol="2" required="true" dictionary="disls"/>
                 <x:inputC name="bstfe" label="固定批量" labelCol="1" fieldCol="2"/>
                 <x:inputC name="bstma" label="最大批量" labelCol="1" fieldCol="2"/>
                 <x:inputC name="bstmi" label="最小批量" labelCol="1" fieldCol="2"/>
                 <x:inputC name="mabst" label="最大存货水平" labelCol="1" fieldCol="2"/>
-                <x:inputC name="bstrf" label="设入值" labelCol="1" fieldCol="2"/>
+                <x:inputC name="bstrf" label="舍入值" labelCol="1" fieldCol="2"/>
                 <x:selectC name="beskz" label="获取类型" labelCol="1" fieldCol="2" dictionary="beskz"/>
                 <x:inputC name="sobsl" label="特殊获取方式" labelCol="1" fieldCol="2"/>
                 <x:inputC name="lgproName" label="默认生产库存地" labelCol="1" fieldCol="2" wrapper="select"/>

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

@@ -82,7 +82,7 @@
         <x:title title="维护基本信息" name="group"/>
         <div class="hg-form-cols">
             <div class="hg-form-row">
-                <x:inputC name="matnr" label="物品编码" labelCol="1" fieldCol="2"/>
+                <x:inputC name="matnr" label="物品编码" readonly="true" labelCol="1" fieldCol="2"/>
                 <x:selectC name="mtart" label="物品类型" required="true" labelCol="1" fieldCol="2" dictionary="suppliesType"/>
                 <x:inputC name="matklName" label="物料组" required="true" labelCol="1" fieldCol="2" wrapper="select"/>
                 <x:hidden name="matkl"/>
@@ -91,14 +91,13 @@
                 <x:hidden name="spart"/>
                 <x:selectC name="mtposMara" label="项目类别组" labelCol="1" fieldCol="2" dictionary="mtposMara"/>
                 <x:inputC name="maktx" label="汉语品名" required="true" labelCol="1" fieldCol="2"/>
-                <x:inputC name="xchpf" label="批次管理" labelCol="1" fieldCol="2"/>
+                <x:selectC name="xchpf" label="批次管理" labelCol="1" fieldCol="2" dictionary="xchpf"/>
                 <x:inputC name="magrv" label="包装物料组" labelCol="1" fieldCol="2"/>
 
                 <x:inputC name="maktxEn" label="英语品名" labelCol="1" fieldCol="2"/>
                 <x:inputC name="meinsName" label="基本计量单位" labelCol="1" fieldCol="2" wrapper="select"/>
                 <x:hidden name="meins"/>
-                <x:hidden name="raube"/>
-                <x:inputC name="raubeName" label="存储条件" required="true" labelCol="1" fieldCol="2"  wrapper="select"/>
+                <x:selectC name="raube" label="存储条件" required="true" labelCol="1" fieldCol="2" dictionary="raube"/>
                 <x:inputC name="brgew" label="毛重" labelCol="1" fieldCol="2"/>
                 <x:selectC name="gewei" label="重量单位" labelCol="1" fieldCol="2" dictionary="gewei"/>
                 <x:inputC name="volum" label="体积" labelCol="1" fieldCol="2"/>
@@ -220,13 +219,13 @@
                         <x:selectC name="disgr" label="MRP组" labelCol="1" fieldCol="2" dictionary="disgr"/>
                         <x:selectC name="dismm" label="MRP类型" labelCol="1" fieldCol="2" dictionary="dismm"/>
                         <x:inputC name="minbe" label="重订货点" labelCol="1" fieldCol="2"/>
-                        <x:inputC name="dispo" label="MRP控制者" labelCol="1" fieldCol="2"/>
+                        <x:selectC name="dispo" label="MRP控制者" labelCol="1" fieldCol="2" dictionary="dispo"/>
                         <x:selectC name="disls" label="批量规模" labelCol="1" fieldCol="2" dictionary="disls"/>
                         <x:inputC name="bstfe" label="固定批量" labelCol="1" fieldCol="2"/>
                         <x:inputC name="bstma" label="最大批量" labelCol="1" fieldCol="2"/>
                         <x:inputC name="bstmi" label="最小批量" labelCol="1" fieldCol="2"/>
                         <x:inputC name="mabst" label="最大存货水平" labelCol="1" fieldCol="2"/>
-                        <x:inputC name="bstrf" label="设入值" labelCol="1" fieldCol="2"/>
+                        <x:inputC name="bstrf" label="舍入值" labelCol="1" fieldCol="2"/>
                         <x:selectC name="beskz" label="获取类型" labelCol="1" fieldCol="2" dictionary="beskz"/>
                         <x:inputC name="sobsl" label="特殊获取方式" labelCol="1" fieldCol="2"/>
                         <x:inputC name="lgpro" label="默认生产库存地" labelCol="1" fieldCol="2"/>

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

@@ -106,7 +106,7 @@ function loadGrid() {
     $("#brand").attr("disabled",true);
     $("#specifications").attr("disabled",true);
     $("#materialUsage").attr("disabled",true);
-    $("#werks").attr("disabled",true);
+    //$("#werks").attr("disabled",true);
 
 
     UICtrl.disable($("#businessUsage"));
@@ -222,6 +222,16 @@ function distributeForm() {
 }
 
 function bindEvent(){
+    $('#werksName').searchbox({
+        type: "system", name: "dictionary",
+        getParam: function (item) {
+            return {fieldName: "WERKS"}
+        },
+        onChange: function (value, data) {
+            $('#werks').val(data.WERKS);
+            $('#werksName').val(data.NAME1);
+        }
+    });
     $('#ekgrpName').searchbox({
         type: "system", name: "dictionary",
         getParam: function (item) {

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

@@ -78,14 +78,15 @@
         <x:title title="维护采购信息" name="group"/>
         <div class="hg-form-cols">
             <div class="hg-form-row">
-                <x:inputC name="werks" label="工厂" labelCol="1" fieldCol="2" wrapper="select"/>
+                <x:inputC name="werksName" label="工厂" labelCol="1" fieldCol="2" wrapper="select"/>
+                <x:hidden name="werks"/>
                 <x:inputC name="bstmeName" label="采购计量单位" labelCol="1" fieldCol="2" wrapper="select"/>
                 <x:hidden name="bstme"/>
                 <x:inputC name="umrenPurch" label="转换分母" labelCol="1" fieldCol="2"/>
                 <x:inputC name="umrezPurch" label="转换分子" labelCol="1" fieldCol="2"/>
                 <x:inputC name="ekgrpName" label="默认采购组" labelCol="1" fieldCol="2" required="true" wrapper="select"/>
                 <x:hidden name="ekgrp"/>
-                <x:inputC name="mprof" label="MPN参数" labelCol="1" fieldCol="2"/>
+                <%--<x:inputC name="mprof" label="MPN参数" labelCol="1" fieldCol="2"/>--%>
             </div>
         </div>
 

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

@@ -384,6 +384,26 @@ function getMeId() {
 }
 
 function bindEvent(){
+    $('#vkorgName').searchbox({
+        type: "system", name: "dictionary",
+        getParam: function (item) {
+            return {fieldName: "VKORG"}
+        },
+        onChange: function (value, data) {
+            $('#vkorg').val(data.VKORG);
+            $('#vkorgName').val(data.VTEXT);
+        }
+    });
+    $('#vtwegName').searchbox({
+        type: "system", name: "dictionary",
+        getParam: function (item) {
+            return {fieldName: "VTWEG"}
+        },
+        onChange: function (value, data) {
+            $('#vtweg').val(data.VTWEG);
+            $('#vtwegName').val(data.VKORGTEXT);
+        }
+    });
 
 
     $('#ladgrName').searchbox({

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

@@ -79,8 +79,9 @@
         <div class="hg-form-cols">
             <div class="hg-form-row">
                 <x:hidden name="vkorg"/>
-                <x:inputC name="vkorgName" required="false" label="销售组织" labelCol="1"  disabled="true" fieldCol="2"/>
-                <x:inputC name="vtwegName" required="false" label="分销渠道" labelCol="1" fieldCol="2" disabled="true"/>
+                <x:inputC name="vkorgName" required="true" label="销售组织" labelCol="1" wrapper="select" fieldCol="2"/>
+                <x:hidden name="vkorg"/>
+                <x:inputC name="vtwegName" required="true" label="分销渠道" labelCol="1" fieldCol="2" wrapper="select"/>
                 <x:hidden name="vtweg"/>
                 <x:selectC name="vrkme" label="销售计量单位" labelCol="1" fieldCol="2" dictionary="measuringUnit"/>
                 <x:inputC name="umrenSale" label="转换分母" labelCol="1" fieldCol="2"/>
@@ -99,7 +100,7 @@
                 <x:inputC name="mvgr4" label="备用" labelCol="1" fieldCol="2"/>
                 <x:inputC name="mvgr5" label="备用" labelCol="1" fieldCol="2"/>
                 <x:inputC name="mtpos" label="销售项次组" labelCol="1" fieldCol="2" required="false"/>
-                <x:inputC name="xchpf" label="批次管理" labelCol="1" fieldCol="2" />
+                <x:selectC name="xchpf" label="批次管理" labelCol="1" fieldCol="2" dictionary="xchpf"/>
                 <x:inputC name="tragr" label="运输组" labelCol="1" fieldCol="2" required="false"/>
                 <x:hidden name="ladgr"/>
                 <x:inputC name="ladgrName" label="装载组" labelCol="1" fieldCol="2" required="false"  wrapper="select"/>

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

@@ -108,8 +108,8 @@ function loadGrid() {
     $("#specifications").attr("disabled",true);
     $("#materialUsage").attr("disabled",true);
 
-    $("#werks").attr("disabled",true);
-    $("#lgort").attr("disabled",true);
+    //$("#werks").attr("disabled",true);
+    //$("#lgort").attr("disabled",true);
     UICtrl.disable($("#materialUsage"));
     UICtrl.disable($("#baseUnit"));
     UICtrl.disable($("#itemAttributes"));
@@ -170,6 +170,16 @@ function loadGrid() {
 }
 
 function bindEvent(){
+    $('#werksName').searchbox({
+        type: "system", name: "dictionary",
+        getParam: function (item) {
+            return {fieldName: "WERKS"}
+        },
+        onChange: function (value, data) {
+            $('#werks').val(data.WERKS);
+            $('#werksName').val(data.NAME1);
+        }
+    });
     $('#lgortName').searchbox({
         type: "system", name: "dictionary",
         getParam: function (item) {

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

@@ -78,7 +78,8 @@
         <x:title title="维护存储信息" name="group"/>
         <div class="hg-form-cols">
             <div class="hg-form-row">
-                <x:inputC name="werks" label="工厂" labelCol="1" fieldCol="2"/>
+                <x:inputC name="werksName" label="工厂" labelCol="1" fieldCol="2" wrapper="select"/>
+                <x:hidden name="werks"/>
                 <x:inputC name="lgortName" label="库存地点" labelCol="1" fieldCol="2" wrapper="select"/>
                 <x:hidden name="lgort"/>
                 <x:inputC name="sernp" label="序列号参数" labelCol="1" fieldCol="2"/>

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

@@ -108,9 +108,9 @@ function loadGrid() {
     $("#specifications").attr("disabled",true);
     $("#materialUsage").attr("disabled",true);
 
-    UICtrl.disable($("#werks"));
+    //UICtrl.disable($("#werks"));
     UICtrl.disable($("#lgort"));
-    UICtrl.disable($("#lgnum"));
+    //UICtrl.disable($("#lgnum"));
     //UICtrl.disable($("#lgtyp"));
 
     UICtrl.disable($("#businessUsage"));
@@ -197,6 +197,26 @@ function saveForm(status) {
 }
 
 function bindEvent(){
+    $('#werksName').searchbox({
+        type: "system", name: "dictionary",
+        getParam: function (item) {
+            return {fieldName: "WERKS"}
+        },
+        onChange: function (value, data) {
+            $('#werks').val(data.WERKS);
+            $('#werksName').val(data.NAME1);
+        }
+    });
+    $('#lgortName').searchbox({
+        type: "system", name: "dictionary",
+        getParam: function (item) {
+            return {fieldName: "LGORT"}
+        },
+        onChange: function (value, data) {
+            $('#lgort').val(data.LGORT);
+            $('#lgortName').val(data.LGOBE);
+        }
+    });
     $('#lgtypName').searchbox({
         type: "system", name: "dictionary",
         getParam: function (item) {

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

@@ -78,7 +78,8 @@
         <x:title title="维护仓库信息" name="group"/>
         <div class="hg-form-cols">
             <div class="hg-form-row">
-                <x:inputC name="werks" label="工厂" labelCol="1" fieldCol="2"/>
+                <x:inputC name="werksName" label="工厂" labelCol="1" fieldCol="2" wrapper="select"/>
+                <x:hidden name="werks"/>
                 <x:inputC name="lgortName" label="库存地点" labelCol="1" fieldCol="2" wrapper="select"/>
                 <x:hidden name="lgort"/>
                 <x:selectC name="lgnum" label="仓库号" labelCol="1" fieldCol="2" dictionary="lgnum"/>

topsun/src/main/java/com/huigou/topsun/controller/ResourceSearchController.java

@@ -13,6 +13,7 @@ import com.huigou.uasp.bmp.common.easysearch.domain.model.EasySearchParse;
 import com.huigou.uasp.bmp.common.easysearch.domain.model.QuerySchemeField;
 import com.huigou.uasp.bmp.opm.application.MemEasySearcher;
 import com.huigou.uasp.bmp.opm.application.impl.MemEasySearcherImpl;
+import com.huigou.util.JSONUtil;
 import com.huigou.util.SDO;
 import com.huigou.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -158,11 +159,14 @@ public class ResourceSearchController {
         List<QuerySchemeField> fields = new ArrayList<>();
         if (CollectionUtil.isNotEmpty(mapList)){
             if (StringUtil.isNotBlank(filterValue)){//固定条件过滤，比如选了工厂后，只能读取改工厂下的物料组
-                mapList = mapList
-                        .stream()
-                        .filter(map -> map.values().stream().anyMatch(value->value.contains(filterValue)))
-                        //.filter(map -> map.containsValue(filterValue))
-                        .collect(Collectors.toList());
+                String[] split = filterValue.split(",");
+                for (String s : split) {
+                    mapList = mapList
+                            .stream()
+                            .filter(map -> map.values().stream().anyMatch(value->value.contains(s)))
+                            //.filter(map -> map.containsValue(filterValue))
+                            .collect(Collectors.toList());
+                }
             }
             if (StringUtil.isNotBlank(param)){//输入查询条件过滤
                 mapList = mapList
@@ -173,11 +177,13 @@ public class ResourceSearchController {
             if (!CollectionUtils.isEmpty(mapList)){
                 Map<String, String> map = mapList.get(0);
                 map.keySet().forEach(key->{
-                    QuerySchemeField querySchemeField = new QuerySchemeField(key,key,"string",200L);
+                    QuerySchemeField querySchemeField = new QuerySchemeField(key,key,"string",300L);
                     fields.add(querySchemeField);
                 });
             }
         }
+        System.out.println("数据条数："+ mapList.size());
+        String string = JSONUtil.toString(mapList);
         Integer intPage = sdo.getInteger("intPage", 1);
         Integer pageSize = sdo.getInteger("pageSize",10);
         PageRequest pageRequest = new PageRequest(intPage - 1, pageSize);

topsun/src/main/java/com/huigou/topsun/sap/costCenter/application/impl/main.java

 package com.huigou.topsun.sap.costCenter.application.impl;
 
 import com.alibaba.fastjson.JSONArray;
+import com.huigou.topsun.util.PinyinHelperUtil;
 import com.huigou.util.DateUtil;
 import com.huigou.util.JSONUtil;
+import net.sourceforge.pinyin4j.PinyinHelper;
 
 import java.math.BigDecimal;
 import java.util.*;
@@ -15,14 +17,10 @@ import java.util.stream.Collectors;
  */
 public class main {
     public static void main(String[] args) {
-
-        String json ="[{\"WERKS\":\"1000\",\"NAME1\":\"广州市宝绅科技有限公司\",\"MATNR\":\"000000000001000144\",\"MAKTX\":\"高压料2426K（LDPE）\",\"LGFSB\":\"1002\",\"LGOBE\":\"原料二库\",\"MATKL\":\"11001\",\"WGBEZ\":\"RFID Inlay\",\"MEINS\":\"KG\",\"MSEHL\":\"千克\",\"EKGRP\":\"001\",\"EKNAM\":\"广州量产用生产类原辅材料采购组\",\"PEINH\":1 }," +
-                "{\"WERKS\":\"1000\",\"NAME1\":\"广州市宝绅科技有限公司\",\"MATNR\":\"000000000005000024\",\"MAKTX\":\"BSN N42x-F（42*16mm）pitch21.59mm width57m\",\"LGFSB\":\"\",\"LGOBE\":\"\",\"MATKL\":\"18001\",\"WGBEZ\":\"扣子\",\"MEINS\":\"ST\",\"MSEHL\":\"片\",\"EKGRP\":\"\",\"EKNAM\":\"\",\"PEINH\":1 }]";
-        List<Map<String,String>> mapList = (List<Map<String,String>>) JSONArray.parse(json);
-        mapList = mapList
-                .stream()
-                .filter(map2 -> map2.values().stream().anyMatch(value-> value.contains("144")))
-                .collect(Collectors.toList());
-        System.out.println("过滤出数据："+mapList);
+        String bankn = "123456789HYU765R43W";
+        String substring = bankn.substring(0, 18);
+        String substring1 = bankn.substring(18, bankn.length());
+        System.out.println("过滤出数据："+substring);
+        System.out.println("过滤出数据："+substring1);
     }
 }

topsun/src/main/java/com/huigou/topsun/sap/fixedAssets/domain/SapFixedAssetsMove.java

@@ -26,7 +26,7 @@ public class SapFixedAssetsMove extends FlowBillAbstractEntity {
      * 原因
      */
     @Column(name = "reason")
-    private Integer reason;
+    private String reason;
 
 
     @Override

topsun/src/main/java/com/huigou/topsun/syncOrg/application/OrgSyncApplication.java

@@ -18,7 +18,7 @@ public interface OrgSyncApplication {
     /**
      * 查询文件配置地址
      */
-    static final String QUERY_XML_FILE_PATH = "config/uasp/query/bmp/opm.xml";
+    static final String QUERY_XML_FILE_PATH = "config/topsun/base/syncOrg.xml";
 
     /**
      * 构建机构、部门、岗位、人员VO类

topsun/src/main/java/com/huigou/uasp/bmp/opm/domain/model/org/Person.java

@@ -195,12 +195,24 @@ public class Person extends BaseInfoWithTenantAbstractEntity {
     @Column(name = "IS_SAP_PERSON")
     private String isSapPerson;
 
+    /**
+     * 语言
+     */
+    @Column(name = "LANGU")
+    private String langu;
+
     /**
      * 国家
      */
     @Column(name = "COUNTRY")
     private String country;
 
+    /**
+     * 地区
+     */
+    @Column(name = "REGION")
+    private String region;
+
     /**
      * 银行所属国家
      */
@@ -231,6 +243,22 @@ public class Person extends BaseInfoWithTenantAbstractEntity {
     @Column(name = "COMPANY_CODE")
     private String companyCode;
 
+    public String getLangu() {
+        return langu;
+    }
+
+    public void setLangu(String langu) {
+        this.langu = langu;
+    }
+
+    public String getRegion() {
+        return region;
+    }
+
+    public void setRegion(String region) {
+        this.region = region;
+    }
+
     public Boolean getOperator() {
         return isOperator;
     }