ECN变更页面调整

topsun-xt/src/main/webapp/biz/topsun/ep/change/epChangeFormDetail.js

@@ -232,9 +232,9 @@ function loadGrid() {
                 },
             },
             {
-                display: "日期", name: "date", width: 200, minWidth: 60, type: "date", align: "left",
+                display: "日期", name: "date", width: 200, minWidth: 60, type: "dateTime", align: "left",
                 editor: {
-                    type: "text"
+                    type: "dateTime"
                 }
             }
         ],
@@ -312,8 +312,8 @@ function loadStockGrid() {
                         }
                     },
                     back: {
-                        // deptName:'deptName',
-                        // deptId:'deptId',
+                        deptName:'deptName',
+                        deptId:'deptId',
                         name: 'executor',
                         id: 'executorId'
                     },

topsun-xt/src/main/webapp/biz/topsun/ep/change/epChangeFormList.js

@@ -33,7 +33,8 @@ function loadGrid() {
             {display: "产品代号", name: "pd", width: 200, minWidth: 60, type: "string", align: "left"},
             {display: "产品名称", name: "productName", width: 200, minWidth: 60, type: "string", align: "left"},
             {display: "变更原因", name: "reasonForChangeTextView", width: 150, minWidth: 60, type: "string", align: "left"},
-            {display: "变更原因", name: "reasonDesc", width: 150, minWidth: 60, type: "string", align: "left"},
+            {display: "原材料变更原因", name: "materialReasonForChangeTextView", width: 150, minWidth: 60, type: "string", align: "left"},
+            {display: "原因描述", name: "reasonDesc", width: 150, minWidth: 60, type: "string", align: "left"},
             {display: "审批状态", name: "statusTextView", width: 100, minWidth: 60, type: "string", align: "left"},
             {display: "创建日期", name: "fillinDate", width: 120, minWidth: 60, type: "date", align: "left"},
             {display: "申请人", name: "personMemberName", width: 120, minWidth: 60, type: "string", align: "left"},

topsun-xt/src/main/webapp/biz/topsun/ep/change/epMaterialChangeFormDetail.js

@@ -123,9 +123,9 @@ function loadGrid() {
                 },
             },
             {
-                display: "日期", name: "date", width: 200, minWidth: 60, type: "date", align: "left",
+                display: "日期", name: "date", width: 200, minWidth: 60, type: "dateTime", align: "left",
                 editor: {
-                    type: "text"
+                    type: "dateTime"
                 }
             }
         ],
@@ -203,8 +203,8 @@ function loadStockGrid() {
                         }
                     },
                     back: {
-                        // deptName:'deptName',
-                        // deptId:'deptId',
+                        deptName:'deptName',
+                        deptId:'deptId',
                         name: 'executor',
                         id: 'executorId'
                     },

topsun-xt/src/main/webapp/biz/topsun/ep/change/epMaterialChangeFormDetail.jsp

@@ -23,6 +23,7 @@
     <x:hidden name="personMemberId"/>
     <x:hidden name="personMemberName"/>
     <x:hidden name="statusId"/>
+        <x:hidden name="reasonForChange"/>
     <div class="hg-form-cols">
         <div class="hg-form-row">
             <x:inputC name="changeNo" required="true" label="变更序号" labelCol="2" maxLength="64" fieldCol="2" />
@@ -30,7 +31,7 @@
             <x:inputC name="changePerson" required="false" label="变更申请部门/姓名" labelCol="2" fieldCol="2" wrapper="select"/>
         </div>
         <div class="hg-form-row">
-            <x:checkboxListC name="reasonForChange" list="reasonForChangeList" required="true" label="变更原因" labelCol="2" fieldCol="6"/>
+            <x:checkboxListC name="materialReasonForChange" dictionary="materialReasonForChange" required="true" label="变更原因" labelCol="2" fieldCol="6"/>
             <x:inputC name="otherReasonDesc" required="false" label="其他原因描述" labelCol="2" fieldCol="2"/>
         </div>
         <div class="hg-form-row">
@@ -58,6 +59,9 @@
         <div class="hg-form-row">
             <x:inputC name="othersMaterialStore" required="false" label="涉及原材料成品库存" labelCol="2" fieldCol="10"/>
         </div>
+        <div class="hg-form-row">
+            <x:inputC name="others" required="true" label="其他" labelCol="2" fieldCol="10"/>
+        </div>
         <x:title title="REVISED SPEC 变更后产品信息" name="group"/>
         <div class="hg-form-row">
             <x:inputC name="changedPd" required="true" label="产品代号" labelCol="2" maxLength="64" fieldCol="10"/>
@@ -65,6 +69,9 @@
         <div class="hg-form-row">
             <x:inputC name="changedProductName" required="true" label="产品名称" labelCol="2" fieldCol="10"/>
         </div>
+        <div class="hg-form-row">
+            <x:inputC name="changedOthers" required="true" label="其他" labelCol="2" fieldCol="10"/>
+        </div>
     </div>
         <div style="padding-top: 15px;">
             <x:fileList bizCode="change" bizId="id" id="changeList" title="附件" />

topsun/src/main/java/com/huigou/topsun/ep/change/controller/EpChangeFormController.java

@@ -87,8 +87,7 @@ public class EpChangeFormController extends CommonController {
             this.putAttribute("reasonForChangeList",reasonForChange);
             return forward("epChangeFormDetail",epChangeForm);
         }else {
-            reasonForChange.put("MATERIAL CHANGE","原材料变更");
-            this.putAttribute("reasonForChangeList",reasonForChange);
+            epChangeForm.setReasonForChange("MATERIAL CHANGE");
             return forward("epMaterialChangeFormDetail",epChangeForm);
         }
     }
@@ -99,8 +98,6 @@ public class EpChangeFormController extends CommonController {
         EpChangeForm epChangeForm = epChangeFormApplication.findEpChangeFormById(id);
         Map<String, String> reasonForChange = new HashMap<>();
         if ("MATERIAL CHANGE".equals(epChangeForm.getReasonForChange())){
-            reasonForChange.put("MATERIAL CHANGE","原材料变更");
-            this.putAttribute("reasonForChangeList",reasonForChange);
             return forward("epMaterialChangeFormDetail",epChangeForm);
         }
         reasonForChange = DictUtil.getDictionary("reasonForChange");

topsun/src/main/java/com/huigou/topsun/ep/change/domain/EpChangeForm.java

@@ -173,6 +173,17 @@ public class EpChangeForm extends FlowBillAbstractEntity {
      */
     @Column(name = "change_matter")
     private String changeMatter;
+
+    /**
+     * 原材料变更原因
+     * 0，材料性能不稳定
+     * 1，替换材料
+     * 2，供应商材料停产
+     * 3，供应商材料升级
+     * 4，其他
+     */
+    @Column(name = "material_reason_for_change")
+    private String materialReasonForChange;
     @Override
     protected String getCodeRuleId() {
         return "epChangeForm";