组件补充发料修改

topsun-xt/src/main/webapp/biz/topsun/sap/componentSupply/componentSupplyDetail.js

@@ -65,15 +65,29 @@ function bindEvent(){
         }
     });
 
-    //工厂
+    //供应商
     $('#suppliersName').searchbox({
+        type: "system", name: "selectSuppliersDatas",
+        getParam: function (item) {
+            return {
+                ///  fieldName: "sapMaterialSelect",
+                //filterValue: $('#werks').val()
+            }
+        },
+        onChange: function (value, data) {
+            $('#suppliers').val(data.partner);
+            $('#suppliersName').val(data.nameOrg1);
+        }
+    });
+    //工厂
+    $('#werksName').searchbox({
         type: "system", name: "dictionary",
         getParam: function (item) {
             return {fieldName: "WERKS"}
         },
         onChange: function (value, data) {
-            $('#suppliers').val(data.WERKS);
-            $('#suppliersName').val(data.NAME1);
+            $('#werks').val(data.WERKS);
+            $('#werksName').val(data.NAME1);
         }
     });
 }
@@ -148,11 +162,23 @@ function loadGrid() {
             },
             {display: "供给物料名称", name: "supplyMaterialName", width: "200", align: "left", type: "string"},
 
-            { display: "补发数量", name: "quantity", width: 140, minWidth: 60, type: "string", align: "left",
+            { display: "补发数量", name: "quantity", width: 100, minWidth: 60, type: "string", align: "left",
                 editor: {  type: "text",mask: 'nnnnnn.nn',required: true }
             },
+            { display: "提货方式", name: "deliveryMethodTextView", width: 120, minWidth: 60, type: "string", align: "left",
+                editor: {
+                    type: 'dictionary',
+                    data: {name: 'deliveryMethod'},
+                    textField: 'deliveryMethodTextView',
+                    valueField: 'deliveryMethod',
+                    required: true,
+                    render: function (item) {
+                        return item.deliveryMethodTextView;
+                    }
+                }
+            },
             {
-                display: "说明", name: "remark", width: 400, minWidth: 60, type: "string", align: "left",
+                display: "说明", name: "remark", width: 300, minWidth: 60, type: "string", align: "left",
                 editor: {required: false, type: "text"}
             }
         ],

topsun-xt/src/main/webapp/biz/topsun/sap/componentSupply/componentSupplyDetail.jsp

@@ -33,9 +33,13 @@
             <x:inputC name="departName" required="true" label="部门" labelCol="2" fieldCol="2" wrapper="tree"/>
             <x:hidden name="applyPerson"/>
             <x:inputC name="applyPersonName" required="true" label="人员" labelCol="2" fieldCol="2" wrapper="tree"/>
+            <x:hidden name="werks"/>
+            <x:inputC name="werksName" required="false" label="工厂" labelCol="2" wrapper="select" fieldCol="2"/>
             <x:hidden name="suppliers"/>
             <x:inputC name="suppliersName" required="false" label="供应商" labelCol="2" wrapper="select" fieldCol="2"/>
 
+
+            <x:inputC name="needDate" label="需求日期" readonly="false" wrapper="date" labelCol="2" fieldCol="2"/>
         </div>
     </div>
     <div class="blank_div clearfix"></div>

topsun-xt/src/main/webapp/biz/topsun/sap/componentSupply/componentSupplyList.js

@@ -20,14 +20,16 @@ function loadGrid() {
     });
     gridManager = UICtrl.grid("#maingrid", {
         columns: [
-            {display: "单据编号", name: "billCode", width: 150, minWidth: 60, type: "string", align: "left"},
+            {display: "单据编号", name: "billCode", width: 120, minWidth: 60, type: "string", align: "left"},
             {display: "创建日期", name: "fillinDate", width: 120, minWidth: 60, type: "string", align: "left"},
             {display: "申请状态", name: "statusTextView", width: 60, minWidth: 60, type: "string", align: "left"},
             {display: "创建人", name: "personMemberName", width: 120, minWidth: 60, type: "string", align: "left"},
             {display: "申请部门", name: "deptName", width: 120, minWidth: 60, type: "string", align: "left"},
-            {display: "部门", name: "departName", width: 200, minWidth: 60, type: "string", align: "left"},
+            {display: "部门", name: "departName", width: 180, minWidth: 60, type: "string", align: "left"},
             {display: "人员", name: "applyPersonName", width: 120, minWidth: 60, type: "string", align: "left"},
+            {display: "工厂", name: "werksName", width: 200, minWidth: 60, type: "string", align: "left"},
             {display: "供应商", name: "suppliersName", width: 200, minWidth: 60, type: "string", align: "left"},
+            {display: "需求日期", name: "needDate", width: 130, minWidth: 60, type: "string", align: "left"},
         ],
         dataAction: "server",
         url: web_app.name + '/componentSupply/slicedComponentSupplyList.ajax',

topsun/src/main/java/com/huigou/topsun/sap/componentSupply/domain/ComponentSupply.java

@@ -52,6 +52,22 @@ public class ComponentSupply extends FlowBillAbstractEntity {
     private String suppliersName;
 
 
+    /*
+     * 工厂名称
+     */
+    @Column(name = "werks_name")
+    private String werksName;
+
+    /*
+     * 工厂
+     */
+    @Column(name = "werks")
+    private String werks;
+
+    @Column(name = "need_date")
+    private Date needDate;
+
+
     @Column(name = "attbiz_id")
     private String attbizId;
 

topsun/src/main/java/com/huigou/topsun/sap/componentSupply/domain/ComponentSupplyItem.java

@@ -54,6 +54,12 @@ public class ComponentSupplyItem extends AbstractEntity {
     @Column(name = "quantity")
     private BigDecimal quantity;
 
+    /**
+     * 提货方式
+     */
+    @Column(name = "delivery_method")
+    private String deliveryMethod;
+
 
     /**
      * 备注