物料主数据修改

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

@@ -103,7 +103,7 @@ function getId() {
 }
 
 function bindEvent(){
-    $('#baseUnit').searchbox({
+    $('#baseUnitName').searchbox({
         type: "system", name: "dictionary",
         getParam: function (item) {
             return {
@@ -112,6 +112,7 @@ function bindEvent(){
         },
         onChange: function (value, data) {
             $('#baseUnit').val(data.MSEH3);
+            $('#baseUnitName').val(data.MSEHL);
         }
     });
 }
\ No newline at end of file

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

@@ -44,7 +44,7 @@
             <x:inputC name="billCode" label="申请单编号" labelCol="1" readonly="true" fieldCol="2"/>
             <x:inputC name="personMemberName" label="申请人" readonly="true" labelCol="1" fieldCol="2"/>
             <x:inputC name="deptName" label="申请部门" readonly="true" labelCol="1" fieldCol="2"/>
-            <x:inputC name="fillinDate" label="申请日期" readonly="true" wrapper="date" labelCol="1" fieldCol="2"/>
+            <x:inputC name="createdDate" label="申请日期" readonly="true" wrapper="dateTime"  labelCol="1" fieldCol="2"/>
         </div>
         <div class="hg-form-row">
 
@@ -59,7 +59,8 @@
         <div class="hg-form-row">
             <x:inputC name="genericName" label="通用品名" labelCol="1" fieldCol="5"/>
             <x:inputC name="applicableStandard" label="适用标准" labelCol="1" fieldCol="5"/>
-            <x:inputC name="baseUnit" label="基本计量单位" labelCol="1" fieldCol="2" wrapper="select"/>
+            <x:hidden name="baseUnit"/>
+            <x:inputC name="baseUnitName" label="基本计量单位" labelCol="1" fieldCol="2" wrapper="select"/>
             <x:inputC name="specifications" label="规格" labelCol="1" fieldCol="2"/>
             <x:inputC name="material" label="材质" labelCol="1" fieldCol="2"/>
             <x:inputC name="design" label="版式" labelCol="1" fieldCol="2"/>

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

@@ -82,7 +82,7 @@ function loadNonProdApplyListGrid() {
         columns: [
             {display: "申请单编号", name: "billCode", width: 150, minWidth: 60, type: "string", align: "left"},
             {display: "申请状态", name: "statusTextView", width: 60, minWidth: 60, type: "string", align: "left"},
-            {display: "申请日期", name: "fillinDate", width: 120, minWidth: 60, type: "date", align: "left"},
+            {display: "申请日期", name: "createdDate", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "类型", name: "kind", width: 80, minWidth: 60, type: "string", align: "left",
                 render:function(item){
                     var type = "物料";

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

@@ -357,7 +357,7 @@ function bindEvent() {
         },
         onChange: function (value, data) {
             $('#meins').val(data.MSEH3);
-            $('#meinsName').val(data.MSEH3);
+            $('#meinsName').val(data.MSEHL);
         }
     });
 

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

@@ -71,7 +71,7 @@
                 <x:selectC name="statusId" label="批准状态" dictionary="bizBillStatus" disabled="true" labelCol="1"
                            fieldCol="2"/>
                 <x:inputC name="personMemberName" label="填写人" readonly="true" labelCol="1" fieldCol="2"/>
-                <x:inputC name="fillinDate" label="填写日期" readonly="true" wrapper="date" labelCol="1" fieldCol="2"/>
+                <x:inputC name="createdDate" label="填写日期" readonly="true" wrapper="dateTime" labelCol="1" fieldCol="2"/>
             </div>
             <div class="hg-form-row">
                 <x:radioC name="maintenanceType" label="维护类型" labelCol="1" fieldCol="11" dictionary="maintainType" disabled="true"/>
@@ -201,8 +201,8 @@
                         <x:inputC name="vrkmeName" label="销售计量单位" labelCol="1" fieldCol="2"/>
                         <x:inputC name="umrenSale" label="转换分母" labelCol="1" fieldCol="2"/>
                         <x:inputC name="umrezSale" label="转换分子" labelCol="1" fieldCol="2"/>
-                        <x:inputC name="dwerk" label="交货工厂" labelCol="1" fieldCol="2"/>
-                        <x:inputC name="aland" label="税收发运国" labelCol="1" fieldCol="2"/>
+                        <x:inputC name="dwerkName" label="交货工厂" labelCol="1" fieldCol="2"/>
+                        <x:inputC name="alandName" label="税收发运国" labelCol="1" fieldCol="2"/>
                         <x:selectC name="taxkm" label="税分类" labelCol="1" fieldCol="2" required="false" dictionary="taxkm"/>
                         <x:selectC name="versg" label="统计组" labelCol="1" fieldCol="2" dictionary="versg"/>
                         <x:selectC name="kondm" label="物料定价组" labelCol="1" fieldCol="2" dictionary="kondm"/>
@@ -223,7 +223,8 @@
                 <x:title title="采购" name="group"/>
                 <div class="hg-form-cols">
                     <div class="hg-form-row">
-                        <x:inputC name="bstme" label="采购计量单位" labelCol="1" fieldCol="2"/>
+                        <x:inputC name="bstmeName" label="采购计量单位" labelCol="1" fieldCol="2"/>
+                        <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"/>
@@ -296,10 +297,13 @@
                         <x:hidden name="lgortProfit"/>
                         <x:selectC name="lgnum" label="仓库号" labelCol="1" fieldCol="2" dictionary="lgnum"/>
                         <x:inputC name="lgtypName" label="存储类型" labelCol="1" fieldCol="2"/>
-                        <x:inputC name="lgbkz" label="存储分区标识" labelCol="1" fieldCol="2"/>
-                        <x:inputC name="ltkza" label="存货下架存储类型" labelCol="2" fieldCol="2"/>
-                        <x:inputC name="ltkze" label="存货上架存储类型" labelCol="2" fieldCol="2"/>
-
+                        <x:hidden name="lgtyp"/>
+                        <x:inputC name="lgbkzName" label="存储分区标识" labelCol="1" fieldCol="2"/>
+                        <x:hidden name="lgbkz"/>
+                        <x:inputC name="ltkzaName" label="存货下架存储类型" labelCol="2" fieldCol="2"/>
+                        <x:hidden name="ltkza"/>
+                        <x:inputC name="ltkzeName" label="存货上架存储类型" labelCol="2" fieldCol="2"/>
+                        <x:hidden name="ltkze"/>
                         <x:inputC name="lhmg1" label="仓库设施1存储数量" labelCol="2" fieldCol="2"/>
                         <x:inputC name="lhme1Name" label="仓库设施1存储单位" labelCol="2" fieldCol="2" wrapper="select"/>
                         <x:hidden name="lhme1"/>

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

@@ -421,6 +421,45 @@ function bindEvent(){
             $('#ladgrName').val(data.LADGRTEXT);
         }
     });
+
+
+    $('#vrkmeName').searchbox({
+        type: "system", name: "dictionary",
+        getParam: function (item) {
+            return {
+                fieldName:"MEINS"
+            }
+        },
+        onChange: function (value, data) {
+            $('#vrkme').val(data.MSEH3);
+            $('#vrkmeName').val(data.MSEHL);
+        }
+    });
+
+    //交货工厂
+    $('#dwerkName').searchbox({
+        type: "system", name: "dictionary",
+        getParam: function (item) {
+            return {fieldName: "WERKS"}
+        },
+        onChange: function (value, data) {
+            $('#dwerk').val(data.WERKS);
+            $('#dwerkName').val(data.NAME1);
+        }
+    });
+
+    $('#alandName').searchbox({
+        type: "system", name: "dictionary",
+        getParam: function (item) {
+            return {fieldName: "LAND1"}
+        },
+        onChange: function (value, data) {
+            $('#aland').val(data.LAND1);
+            $('#alandName').val(data.LANDX);
+        }
+    });
+
+
     /*$('#vtwegName').searchbox({
         type: "system", name: "dictionary",
         getParam: function (item) {

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

@@ -81,11 +81,16 @@
 
                 <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="vrkmeName" label="销售计量单位" labelCol="1" fieldCol="2" wrapper="select"/>
+                <x:hidden name="vrkme"/>
                 <x:inputC name="umrenSale" label="转换分母" labelCol="1" fieldCol="2"/>
                 <x:inputC name="umrezSale" label="转换分子" labelCol="1" fieldCol="2"/>
-                <x:inputC name="dwerk" label="交货工厂" labelCol="1" fieldCol="2"/>
-                <x:inputC name="aland" label="税收发运国" labelCol="1" fieldCol="2" required="true"/>
+                <x:inputC name="dwerkName" label="交货工厂" labelCol="1" fieldCol="2" wrapper="select"/>
+                <x:hidden name="dwerk"/>
+
+                <x:inputC name="alandName" label="税收发运国" labelCol="1" fieldCol="2" required="true" wrapper="select"/>
+                <x:hidden name="aland"/>
+
                 <x:selectC name="taxkm" label="税分类" labelCol="1" fieldCol="2" required="true" dictionary="taxkm"/>
                 <x:selectC name="versg" label="统计组" labelCol="1" fieldCol="2" dictionary="versg"/>
                 <x:selectC name="kondm" label="物料定价组" labelCol="1" fieldCol="2" dictionary="kondm"/>

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

@@ -178,7 +178,7 @@ function bindEvent(){
             $('#werksName').val(data.NAME1);
         }
     });
-    $('#lgortName').searchbox({
+    $('#lgortQmName').searchbox({
         type: "system", name: "dictionary",
         getParam: function (item) {
             return {
@@ -187,8 +187,8 @@ function bindEvent(){
             }
         },
         onChange: function (value, data) {
-            $('#lgort').val(data.LGORT);
-            $('#lgortName').val(data.LGOBE);
+            $('#lgortQm').val(data.LGORT);
+            $('#lgortQmName').val(data.LGOBE);
         }
     });
 }

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

@@ -77,8 +77,8 @@
             <div class="hg-form-row">
                 <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="lgortQmName" label="库存地点" labelCol="1" fieldCol="2" wrapper="select"/>
+                <x:hidden name="lgortQm"/>
                 <x:inputC name="sernp" label="序列号参数" labelCol="1" fieldCol="2"/>
                 <x:inputC name="serlv" label="序列号水平" labelCol="1" fieldCol="2"/>
                 <x:selectC name="prctr" label="利润中心" labelCol="1" fieldCol="2" dictionary="PRCTR" required="true"/>

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

@@ -214,14 +214,14 @@ function bindEvent(){
         }
     });
     //库存地点
-    $('#lgortName').searchbox({
+    $('#lgortProfitName').searchbox({
         type: "system", name: "dictionary",
         getParam: function (item) {
             return {fieldName: "LGORT"}
         },
         onChange: function (value, data) {
-            $('#lgort').val(data.LGORT);
-            $('#lgortName').val(data.LGOBE);
+            $('#lgortProfit').val(data.LGORT);
+            $('#lgortProfitName').val(data.LGOBE);
           //  $('#ltkza').val("001");
          //   $('#ltkzaName').val("高架仓库");
         }

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

@@ -77,8 +77,8 @@
             <div class="hg-form-row">
                 <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="lgortProfitName" label="库存地点" labelCol="1" fieldCol="2" wrapper="select"/>
+                <x:hidden name="lgortProfit"/>
                 <x:selectC name="lgnum" label="仓库号" labelCol="1" fieldCol="2" dictionary="lgnum"/>
                 <x:inputC name="lgtypName" label="存储类型" labelCol="1" fieldCol="2" wrapper="select"/>
                 <x:hidden name="lgtyp"/>
@@ -88,7 +88,7 @@
                 <x:hidden name="ltkze"/>
                 <x:inputC name="lgbkzName" label="存储分区标识" labelCol="1" fieldCol="2" required="true" wrapper="select"/>
                 <x:hidden name="lgbkz"/>
-                <x:inputC name="lhmg1" label="仓库设施1存储数量" labelCol="2" fieldCol="2" required="false"/>
+                <x:inputC name="lhmg1" label="仓库设施1存储数量" labelCol="2" fieldCol="2" required="false" mask="99999999"/>
                 <x:inputC name="lhme1Name" label="仓库设施1存储单位" labelCol="2" fieldCol="2" required="false" wrapper="select"/>
                 <x:hidden name="lhme1"/>
                 <x:inputC name="lety1" label="仓库设施1类型" labelCol="1" fieldCol="2" required="false" readonly="true"/>

topsun-xt/src/main/webapp/biz/topsun/sap/suppliers/suppliersDataDetail.js

@@ -70,7 +70,7 @@ function loadSuppliersPayListGrid() {
             UICtrl.addGridRow(sapSuppliersPayGridManager,
                 {
                     // 行号加一
-                    sequence: sapSuppliersPayGridManager.getData().length + 1,reprf:"X"
+                    sequence: (sapSuppliersPayGridManager.getData().length + 1)*10,reprf:"X"
                 }
             );
         },
@@ -219,7 +219,7 @@ function loadSuppliersBuyerListGrid() {
             UICtrl.addGridRow(sapSuppliersBuyerGridManager,
                 {
                     // 行号加一
-                    sequence: sapSuppliersBuyerGridManager.getData().length + 1,
+                    sequence: (sapSuppliersBuyerGridManager.getData().length + 1)*10,
                     webre:"X",
                     kalsk:"Z1"
 
@@ -365,7 +365,7 @@ function loadSuppliersBankListGrid() {
             UICtrl.addGridRow(sapSuppliersBankGridManager,
                 {
                     // 行号加一
-                    sequence: sapSuppliersBankGridManager.getData().length + 1
+                    sequence: (sapSuppliersBankGridManager.getData().length + 1)*10
                 }
             );
         },

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

@@ -82,12 +82,15 @@ public class NonProdApplyApplicationImpl  extends FlowBroker implements NonProdA
         if (nonProdApplyBaseInfo.isNew()) {
             nonProdApplyBaseInfo.setStatusId(BizBillStatus.APPLYING.getId());
             nonProdApplyBaseInfo.setDistribute(0);
-            if (StringUtil.isNotBlank(nonProdApplyBaseInfo.getSourceId())){ //有数据来源ID的 表示是变更或扩展的
+           if (StringUtil.isNotBlank(nonProdApplyBaseInfo.getSourceId())){ //有数据来源ID的 表示是变更或扩展的
                 sapNonProdApplyDept=nonProdApplyDeptApplication.getNonProdApplyDeptByBaseInfoId(nonProdApplyBaseInfo.getSourceId());
             }
         } else {
             nonProdApplyBaseInfo = (NonProdApplyBaseInfo) commonDomainService.loadAndFillinProperties(nonProdApplyBaseInfo);
         }
+        if (nonProdApplyBaseInfo.getCreatedDate()==null){
+            nonProdApplyBaseInfo.setCreatedDate(new Date());
+        }
         if (StringUtil.isBlank(nonProdApplyBaseInfo.getKind())) {
            nonProdApplyBaseInfo.setKind("materiel");
         }

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

@@ -62,6 +62,7 @@ public class NonProdApplyController extends CommonController {
         nonProdApplyBaseInfo.setMaintenanceType("new");
         nonProdApplyBaseInfo.setApplyType("0");
         nonProdApplyBaseInfo.setKind("materiel");
+        nonProdApplyBaseInfo.setCreatedDate(new Date());
           if (StringUtil.isNotBlank(extended)) { //扩展流程
                 nonProdApplyBaseInfo = nonProdApplyApplication.loadNonProdApplyBaseInfoById(bizId);
                 if (!isLastedData(nonProdApplyBaseInfo.getBillCode(), nonProdApplyBaseInfo.getMatnr())) {

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

@@ -334,6 +334,7 @@ public void getBaseInfoAttrs(NonProdApplyBaseInfo baseInfo,SapNonProdApplyDept n
         nonProdApplyDept.setItemAttributes(baseInfo.getItemAttributes());
          nonProdApplyDept.setDistribute(baseInfo.getDistribute());
          nonProdApplyDept.setKind(baseInfo.getKind());
+        nonProdApplyDept.setCreatedDate(baseInfo.getCreatedDate());
     }
 
 //    @EasySearch(queryName = "userNameSelect")

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/NonProdApplyBaseInfo.java

 package com.huigou.topsun.sap.nonProdApply.domain;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.huigou.data.domain.model.FlowBillAbstractEntity;
 import lombok.Data;
+import org.springframework.data.annotation.CreatedDate;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.persistence.*;
@@ -106,6 +108,11 @@ public class NonProdApplyBaseInfo extends FlowBillAbstractEntity {
     @Column(name = "text_description")
     private String textDescription;
 
+    @Column(name ="created_date")
+    @CreatedDate
+    @JSONField(format="yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createdDate;
 
     @Override
     protected String getCodeRuleId() {
@@ -126,9 +133,13 @@ public class NonProdApplyBaseInfo extends FlowBillAbstractEntity {
     private Integer distribute;
 
 
+
     @Column(name = "attbiz_id")
     private String attbizId;
 
+    @Column(name = "base_unit_name")
+    private String baseUnitName;
+
     @Transient
     private String applyType;
 

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/SapNonProdApplyDept.java

@@ -3,6 +3,7 @@ package com.huigou.topsun.sap.nonProdApply.domain;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 import org.hibernate.annotations.GenericGenerator;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.persistence.*;
 import java.io.Serializable;
@@ -237,12 +238,16 @@ public class SapNonProdApplyDept implements Serializable {
     @Column(name = "DWERK")
     private String dwerk;
 
+    @Column(name = "DWERK_NAME")
+    private String dwerkName;
     /**
      * 税收发运国
      */
     @Column(name = "ALAND")
     private String aland;
 
+    @Column(name = "ALAND_NAME")
+    private String alandName;
     /**
      * 税分类
      */
@@ -578,11 +583,13 @@ public class SapNonProdApplyDept implements Serializable {
     private String werksQm;
 
     /**
-     * 库存地点（质检）
+     * 库存地点（存储）
      */
     @Column(name = "LGORT_QM")
     private String lgortQm;
 
+    @Column(name = "LGORT_QM_NAME")
+    private String lgortQmName;
     /**
      * 序列号参数
      */
@@ -608,11 +615,13 @@ public class SapNonProdApplyDept implements Serializable {
     private String werksProfit;
 
     /**
-     * 库存地点（利润中心）
+     * 库存地点（仓库）
      */
     @Column(name = "LGORT_PROFIT")
     private String lgortProfit;
 
+    @Column(name = "LGORT_PROFIT_NAME")
+    private String lgortProfitName;
     /**
      * 仓库号
      */
@@ -838,6 +847,9 @@ public class SapNonProdApplyDept implements Serializable {
     @Column(name = "ladgr_name")
     private String ladgrName;
 
+    @Column(name = "vrkme_name")
+    private String vrkmeName;
+
     @Transient
     private String billCode;
     @Transient
@@ -881,5 +893,8 @@ public class SapNonProdApplyDept implements Serializable {
     @Transient
     private String kind;
 
+    @Transient
+    private Date createdDate;
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/vo/NonProdApplySaleVo.java

@@ -122,4 +122,9 @@ public class NonProdApplySaleVo extends NonProdApplyDeptVo {
      */
      private String ladgr;
 
+    private String dwerkName;
+
+    private String alandName;
+
+    private String vrkmeName;
 }

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/vo/NonProdApplyStoreVo.java

@@ -15,9 +15,11 @@ public class NonProdApplyStoreVo extends NonProdApplyDeptVo {
     /**
      * 库存地点（质检）
      */
-    private String lgort;
-    private String lgortName;
 
+
+    private String lgortQm;
+
+    private String lgortQmName;
     /**
      * 序列号参数
      */

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/vo/NonProdApplyWarehouseVo.java

@@ -15,9 +15,12 @@ public class NonProdApplyWarehouseVo extends NonProdApplyDeptVo {
     /**
      * 库存地点
      */
-      private String lgort;
-      private String lgortName;
+     // private String lgort;
+     // private String lgortName;
 
+    private String lgortProfit;
+
+    private String lgortProfitName;
     /**
      * 仓库号
      */

topsun/src/main/java/com/huigou/topsun/sap/sapApplication/application/impl/SapBankInfoApplicationImpl.java

@@ -41,7 +41,6 @@ public class SapBankInfoApplicationImpl implements SapBankInfoApplication {
             if ("S".equals(sapResultList.get(0).getTYPE())) {
                 ObjectMapper objectMapper = SAPUtils.objectMapper();
                 mapList = objectMapper.readValue(com.huigou.util.JSONUtil.toString(map.get("RDATA")), new TypeReference<List<Map<String, String>>>() {});
-
             }
         } catch (IOException e) {
             throw new RuntimeException("根据银行国家代码查询银行信息出错。");