质量异常评审表增加采购单号字段

topsun-xt/src/main/webapp/biz/topsun/mes/unqualifiedMaterials/unqualifiedMaterialsDetail.jsp

@@ -37,19 +37,20 @@
             <x:inputC name="batchNo" required="false" readonly="true" label="生产批次" labelCol="2" fieldCol="2"/>
         </div>
         <div class="hg-form-row">
+            <x:inputC name="purchaseOrderNo" required="false" readonly="true" label="采购单号" labelCol="2" fieldCol="2"/>
             <x:inputC name="pd" required="false" readonly="true" label="PD/YL编码" labelCol="2" fieldCol="2"/>
-            <x:inputC name="process" required="false" readonly="true" label="部门/工序" labelCol="2" maxLength="64" fieldCol="2"/>
             <x:inputC name="exceptionNum" required="false" readonly="true" label="异常数量" labelCol="2" maxLength="64" fieldCol="2"/>
         </div>
-        <div class="hg-form-row">
-            <x:textareaC name="exceptionDesc" required="false" label="异常描述" labelCol="2" fieldCol="10" rows="3" readonly="true"/>
-        </div>
         <div class="hg-form-row">
             <x:hidden name="dutyDept"/>
+            <x:inputC name="process" required="false" readonly="true" label="部门/工序" labelCol="2" maxLength="64" fieldCol="2"/>
             <x:inputC name="dutyDeptName" required="false" readonly="true" label="责任部门" labelCol="2" fieldCol="2" />
             <x:hidden name="submitter"/>
             <x:inputC name="submitterName" required="false" readonly="true" label="提报人" labelCol="2" fieldCol="2" />
         </div>
+        <div class="hg-form-row">
+            <x:textareaC name="exceptionDesc" required="false" label="异常描述" labelCol="2" fieldCol="10" rows="3" readonly="true"/>
+        </div>
         <div class="hg-form-row">
             <x:selectC name="result" required="false" label="评审结果" labelCol="2" fieldCol="2" dictionary="result"/>
         </div>

topsun-xt/src/main/webapp/biz/topsun/mes/unqualifiedMaterials/unqualifiedMaterialsList.js

@@ -33,6 +33,7 @@ function loadGrid() {
             {display: "凭证年份", name: "mjahr", width: 200, minWidth: 60, type: "string", align: "left"},
             {display: "产品名称", name: "productName", width: 200, minWidth: 60, type: "string", align: "left"},
             {display: "类别", name: "type", width: 200, minWidth: 60, type: "string", align: "left"},
+            {display: "采购单号", name: "purchaseOrderNo", width: 200, minWidth: 60, type: "string", align: "left"},
             {display: "生产批次", name: "batchNo", width: 200, minWidth: 60, type: "string", align: "left"},
             {display: "PD/YL编码", name: "pd", width: 200, minWidth: 60, type: "string", align: "left"},
             {display: "部门/工序", name: "process", width: 200, minWidth: 60, type: "string", align: "left"},

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

@@ -56,8 +56,8 @@
                 <x:hidden name="meins"/>
              <x:inputC name="norbm" label="标准采购订单数量" labelCol="2" fieldCol="1" required="true" mask="99999999.99"/>
 
-            <x:inputC name="umren" label="单位转换分母" labelCol="1" fieldCol="2" required="true" mask="99999999.99"/>
-            <x:inputC name="umrez" label="单位转换分子" labelCol="1" fieldCol="2" required="true" mask="99999999.99"/>
+            <x:inputC name="umren" label="订单单位转换分母" labelCol="1" fieldCol="2" required="true" mask="99999999.99"/>
+            <x:inputC name="umrez" label="订单单位转换分子" labelCol="1" fieldCol="2" required="true" mask="99999999.99"/>
 
 
 

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

@@ -306,10 +306,10 @@ function getGridColumns() {
         {display: "基本计量单位", name: "meinsName", width: "100", align: "left", type: "string"  },
         {display: "基本计量单位", name: "meins", width: "40", align: "left", type: "string",hide:"true" },
 
-        {display: "单位转换分母", name: "umren", width: "100", align: "left", type: "string"
+        {display: "订单单位转换分母", name: "umren", width: "100", align: "left", type: "string"
            // ,editor: {type: 'text', mask: '9999999.99'}
         },
-        {display: "单位转换分子", name: "umrez", width: "100", align: "left", type: "string"
+        {display: "订单单位转换分子", name: "umrez", width: "100", align: "left", type: "string"
             //,editor: {type: 'text', mask: '9999999.99'}
         },
 

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

@@ -69,8 +69,8 @@ function initPurchaseListGrid() {
                 {display: "订单价格单位(采购)", name: "bprmeName", width: "90", align: "left", type: "string"},
                 {display: "标准采购订单数量", name: "norbm", width: "120", align: "left", type: "string"},
                 {display: "基本计量单位", name: "meinsName", width: "100", align: "left", type: "string"},
-                {display: "单位转换分母", name: "umren", width: "100", align: "left", type: "string"},
-                {display: "单位转换分子", name: "umrez", width: "100", align: "left", type: "string"},
+                {display: "订单单位转换分母", name: "umren", width: "100", align: "left", type: "string"},
+                {display: "订单单位转换分子", name: "umrez", width: "100", align: "left", type: "string"},
                 {display: "销售/购买税代码", name: "mwskzTextView", width: "100", align: "left", type: "string"},
                 {display: "开始生效日期", name: "datab", width: "100", align: "left", type: "string"},
                 {display: "有效期至日期", name: "datbi", width: "100", align: "left", type: "string"},

topsun/src/main/java/com/huigou/topsun/mes/unqualifiedMaterials/domain/UnqualifiedMaterials.java

@@ -7,7 +7,6 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * @Auther: xin.lu
@@ -132,6 +131,12 @@ public class UnqualifiedMaterials extends FlowBillAbstractEntity {
      */
     @Column(name = "msg")
     private String msg;
+
+    /**
+     * 采购单号
+     */
+    @Column(name = "purchase_order_no")
+    private String purchaseOrderNo;
     @Override
     protected String getCodeRuleId() {
         return "unqualifiedMaterials";

topsun/src/main/java/com/huigou/topsun/mes/unqualifiedMaterials/domain/vo/UnqualifiedMaterialsVo.java

@@ -100,4 +100,10 @@ public class UnqualifiedMaterialsVo implements Serializable {
      */
     @JsonProperty("submitterName")
     private String submitterName;
+
+    /**
+     * 采购单号
+     */
+    @JsonProperty("purchaseOrderNo")
+    private String purchaseOrderNo;
 }