1、在创建采购信息处增加两个字段：UNTTO（交货不足容差），UEBTO（过量交货容差），初始默认赋值：10，单位固定%

2、在临时工序外协，增加一个字段：UEBTK（未限制的过量收货），默认赋值：X=是，（值范围：X=是，空=否）

topsun-xt/src/main/webapp/biz/topsun/sap/processOutsource/processOutsourceDetail.js

@@ -70,7 +70,9 @@ function loadOrderItemGrid() {
                             sequence: (orderItemGridManager.getData().length + 1),
                             kpein: 1,
                             waersTextView: "人民币",
-                            waers: "CNY"
+                            waers: "CNY",
+                            uebtkTextView: "是",
+                            uebtk: "X"
                         });
                     }
                     _self.close();
@@ -428,6 +430,19 @@ function getOrderColumns(){
             //     }
             // },
         });
+        columns.push({
+            display: "未限制的过量收货", name: "uebtkTextView", width: 140, minWidth: 60, type: "string", align: "left",
+            editor: {
+                type: 'dictionary',
+                data: {name: 'uebtk'},
+                textField: 'uebtkTextView',
+                valueField: 'uebtk',
+                required: true,
+                render: function (item) {
+                    return item.uebtkTextView;
+                }
+            },
+        });
         columns.push({
             display: "备注", name: "remark", width: 200, minWidth: 60, type: "string", align: "left",
             editor: {
@@ -456,6 +471,9 @@ function getOrderColumns(){
         columns.push({
             display: "税码", name: "purchaseMwskzTextView", width: 140, minWidth: 60, type: "string", align: "left",
         });
+        columns.push({
+            display: "未限制的过量收货", name: "uebtkTextView", width: 140, minWidth: 60, type: "string", align: "left",
+        });
         columns.push({
             display: "备注", name: "remark", width: 200, minWidth: 60, type: "string", align: "left",
         });

topsun-xt/src/main/webapp/biz/topsun/sap/processOutsource/processOutsourceList.js

@@ -38,6 +38,7 @@ function loadProcessOutsourceOrderListGrid() {
             {display: "定价基数", name: "kpein", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "币别", name: "waersTextView", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "税码", name: "purchaseMwskzTextView", width: 140, minWidth: 60, type: "string", align: "left"},
+            {display: "未限制的过量收货", name: "uebtkTextView", width: 140, minWidth: 60, type: "string", align: "left"},
             {display: "交货日期", name: "eeind", width: 140, minWidth: 60, type: "date", align: "left"},
             {display: "供应商", name: "lifnrName", width: 200, minWidth: 60, type: "string", align: "left"},
             {display: "申请人", name: "personMemberName", width: 120, minWidth: 60, type: "string", align: "left"},

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

@@ -35,6 +35,15 @@ function initialize(){
     }
     $('#webre').val("X");
 
+    //初始值默认10
+    var untto = $("#untto").val();
+    if (Public.isBlank(untto)){
+        $("#untto").val(10)
+    }
+    var uebto = $("#uebto").val();
+    if (Public.isBlank(uebto)){
+        $("#uebto").val(10);
+    }
 }
 
 

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

@@ -100,6 +100,10 @@
                 <x:inputC name="kbetr4" label="等级金额4" labelCol="1" fieldCol="1" required="false" mask="9999999.99"/>
                 <x:inputC name="kbetr5" label="等级金额5" labelCol="1" fieldCol="1" required="false" mask="9999999.99"/>
            </div>
+            <div class="hg-form-row">
+                <x:inputC name="untto" label="交货不足容差(%)" labelCol="1" fieldCol="1" required="false" mask="9999999.99"/>
+                <x:inputC name="uebto" label="过量交货容差(%)" labelCol="1" fieldCol="1" required="false" mask="9999999.99"/>
+            </div>
         <div class="hg-form-row">
             <x:textareaC name="remark" rows="3" label="备注" labelCol="1" fieldCol="9" />
         </div>

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

@@ -114,6 +114,8 @@ function getGridColumns() {
         {display: "等级金额4", name: "kbetr4", width: "100", align: "left", type: "string"},
         {display: "等级数量5", name: "kstbm5", width: "100", align: "left", type: "string"},
         {display: "等级金额5", name: "kbetr5", width: "100", align: "left", type: "string"},
+        {display: "交货不足容差(%)", name: "untto", width: "100", align: "left", type: "string"},
+        {display: "过量交货容差(%)", name: "uebto", width: "100", align: "left", type: "string"},
         {display: "备注", name: "remark", width: "300", align: "left", type: "string",}
     ]
     return columns;
@@ -307,6 +309,8 @@ function  doSaveDefine() {
             kbetr4: $("#kbetr4").val(),
             kstbm5: $("#kstbm5").val(),
             kbetr5: $("#kbetr5").val(),
+            untto: $("#untto").val(),
+            uebto: $("#uebto").val(),
             remark: $("#remark").val(),
             knumh: $("#knumh").val(),
         });

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

@@ -122,6 +122,10 @@
             <x:inputC name="kbetr5" label="等级金额5" labelCol="1" fieldCol="1" required="false" mask="9999999.99"
                       readonly="true"/>
         </div>
+        <div class="hg-form-row">
+            <x:inputC name="untto" label="交货不足容差(%)" labelCol="1" fieldCol="1" required="false" mask="9999999.99" readonly="true"/>
+            <x:inputC name="uebto" label="过量交货容差(%)" labelCol="1" fieldCol="1" required="false" mask="9999999.99" readonly="true"/>
+        </div>
         <div class="hg-form-row">
             <x:textareaC name="remark" rows="3" label="备注" labelCol="1" fieldCol="9"/>
         </div>

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

@@ -482,6 +482,9 @@ function getGridColumns() {
         },
         {display: "等级金额5", name: "kbetr5", width: "100", align: "left", type: "string"
         },
+        {display: "交货不足容差(%)", name: "untto", width: "100", align: "left", type: "string"},
+        {display: "过量交货容差(%)", name: "uebto", width: "100", align: "left", type: "string"},
+
         {
             display: "备注", name: "remark", width: "300", align: "left", type: "string",
         }
@@ -681,6 +684,8 @@ function  doSaveDefine() {
             kbetr4: $("#kbetr4").val(),
             kstbm5: $("#kstbm5").val(),
             kbetr5: $("#kbetr5").val(),
+            untto: $("#untto").val(),
+            uebto: $("#uebto").val(),
             remark: $("#remark").val(),
             knumh: $("#knumh").val(),
         });

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

@@ -109,6 +109,8 @@ function initPurchaseListGrid() {
                 {display: "等级金额2", name: "kbetr2", width: "100", align: "left", type: "string"},
                 {display: "等级数量3", name: "kstbm3", width: "100", align: "left", type: "string"},
                 {display: "等级金额3", name: "kbetr3", width: "100", align: "left", type: "string"},
+                {display: "交货不足容差(%)", name: "untto", width: "100", align: "left", type: "string"},
+                {display: "过量交货容差(%)", name: "uebto", width: "100", align: "left", type: "string"},
                 {display: "申请人", name: "personMemberName", width: 150, minWidth: 60, type: "string", align: "center"},
                 {display: "申请部门", name: "deptName", width: 150, minWidth: 60, type: "string", align: "center"},
                 {display: "申请日期", name: "fillinDate", width: 150, minWidth: 60, type: "date", align: "center"}

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

@@ -114,6 +114,8 @@ function getGridColumns() {
         {display: "等级金额4", name: "kbetr4", width: "100", align: "left", type: "string"},
         {display: "等级数量5", name: "kstbm5", width: "100", align: "left", type: "string"},
         {display: "等级金额5", name: "kbetr5", width: "100", align: "left", type: "string"},
+        {display: "交货不足容差(%)", name: "untto", width: "100", align: "left", type: "string"},
+        {display: "过量交货容差(%)", name: "uebto", width: "100", align: "left", type: "string"},
         {display: "备注", name: "remark", width: "300", align: "left", type: "string",}
     ]
     return columns;
@@ -307,6 +309,8 @@ function  doSaveDefine() {
             kbetr4: $("#kbetr4").val(),
             kstbm5: $("#kstbm5").val(),
             kbetr5: $("#kbetr5").val(),
+            untto: $("#untto").val(),
+            uebto: $("#uebto").val(),
             remark: $("#remark").val(),
             knumh: $("#knumh").val(),
         });

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

@@ -100,6 +100,10 @@
                 <x:inputC name="kbetr4" label="等级金额4" labelCol="1" fieldCol="1" required="false" mask="9999999.99"/>
                 <x:inputC name="kbetr5" label="等级金额5" labelCol="1" fieldCol="1" required="false" mask="9999999.99"/>
            </div>
+        <div class="hg-form-row">
+            <x:inputC name="untto" label="交货不足容差(%)" labelCol="1" fieldCol="1" required="false" mask="9999999.99"/>
+            <x:inputC name="uebto" label="过量交货容差(%)" labelCol="1" fieldCol="1" required="false" mask="9999999.99"/>
+        </div>
         <div class="hg-form-row">
             <x:textareaC name="remark" rows="3" label="备注" labelCol="1" fieldCol="9" />
         </div>

topsun/src/main/java/com/huigou/topsun/sap/processOutsource/application/impl/ProcessOutsourceApplicationImpl.java

@@ -254,6 +254,12 @@ public class ProcessOutsourceApplicationImpl extends FlowBroker implements Proce
 
                     processOutsourceItemVo.setAfnam(processOutsource.getPersonMemberName());
                     processOutsourceOrderItem.setEbelp(String.valueOf(i));
+                    //默认赋值：X=是，（值范围：X=是，空=否）
+                    //数据字典值为X=是，0=否
+                    String uebtk = processOutsourceItemVo.getUebtk();
+                    if ("0".equals(uebtk)){
+                        processOutsourceItemVo.setUebtk("");
+                    }
                     itemVos.add(processOutsourceItemVo);
                     i = i + 10;
                 }

topsun/src/main/java/com/huigou/topsun/sap/processOutsource/domain/ProcessOutsourceOrderItem.java

@@ -191,4 +191,8 @@ public class ProcessOutsourceOrderItem extends AbstractEntity {
     @Column(name = "remark")
     private String remark;
 
+    //UEBTK（未限制的过量收货），默认赋值：X=是，（值范围：X=是，空=否）
+    @Column(name = "UEBTK")
+    private String uebtk;
+
 }

topsun/src/main/java/com/huigou/topsun/sap/processOutsource/domain/vo/ProcessOutsourceItemVo.java

@@ -142,4 +142,8 @@ public class ProcessOutsourceItemVo implements Serializable {
     @JsonProperty("AFNAM")
     private String afnam;
 
+    ////UEBTK（未限制的过量收货），默认赋值：X=是，（值范围：X=是，空=否）
+    @JsonProperty("UEBTK")
+    private String uebtk;
+
 }

topsun/src/main/java/com/huigou/topsun/sap/purchaseInfoRecord/domain/SapPurchaseInfoRecordItem.java

@@ -392,5 +392,11 @@ public class SapPurchaseInfoRecordItem extends AbstractEntity {
     @Column(name = "KNUMH")
     private String knumh;
 
+    //UNTTO（交货不足容差），UEBTO（过量交货容差），初始默认赋值：10，单位固定%
 
+    @Column(name = "UNTTO")
+    private BigDecimal untto;
+
+    @Column(name = "UEBTO")
+    private BigDecimal uebto;
 }

topsun/src/main/java/com/huigou/topsun/sap/purchaseInfoRecord/domain/vo/SapPurchaseInfoRecordItemVo.java

@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.persistence.Column;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -280,4 +281,10 @@ public class SapPurchaseInfoRecordItemVo implements Serializable {
     @JsonProperty("ZZF")
     private String zzf;
 
+    @JsonProperty("UNTTO")
+    private BigDecimal untto;
+
+    @JsonProperty("UEBTO")
+    private BigDecimal uebto;
+
 }