物料选择工厂和库存地点后，自动带出仓库

topsun-xt/src/main/resources/log4j.properties

@@ -11,8 +11,8 @@ log4j.appender.LogFileInfo.threshold=INFO
 
 log4j.appender.LogFileError = org.apache.log4j.DailyRollingFileAppender
 log4j.appender.LogFileError.file = /var/project/log/300/Error.log
-#log4j.appender.LogFileError.file = /var/project/log/310/Info.log
-#log4j.appender.LogFileError.file = /var/project/log/320/Info.log
+#log4j.appender.LogFileError.file = /var/project/log/310/Error.log
+#log4j.appender.LogFileError.file = /var/project/log/320/Error.log
 log4j.appender.LogFileError.DatePattern = '.'yyyy-MM-dd
 log4j.appender.LogFileError.layout = org.apache.log4j.PatternLayout
 log4j.appender.LogFileError.layout.ConversionPattern = [%p] <%d{yyyy-MM-dd HH:mm:ss:SSS}> %C{1}::%M: %m%n

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

@@ -344,6 +344,11 @@ function bindEvent() {
         onChange: function (value, data) {
             $('#werks').val(data.WERKS);
             $('#werksName').val(data.NAME1);
+            //选了工厂和库存地点，带出仓库
+            if (data.WERKS == "1000" && $('#lgort').val() != "1004"){
+                $("#lgnum").val("W00");
+                $("#lgnumName").val("广州宝绅印刷工厂仓库");
+            }
             //选择了工厂和库存地点后，带出存储条件
             bindEvent_raube(data.WERKS,$('#lgort').val());
 

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseApproval/sapPurchaseApprovalDetail.js

@@ -38,7 +38,7 @@ function initItemGrid() {
             heightDiff: -4,
             sortName: 'id',
             sortOrder: 'asc',
-            checkbox: true,
+            checkbox: false,
             usePager: true,
             rownumbers: true,
             enabledEdit: false,
@@ -55,82 +55,32 @@ function getGridColumns() {
     var columns = [];
     columns = [
         {display: "项目编号", name: "bnfpo", width: "80", align: "left", type: "string",
-            editor: { type: 'spinner', min: 10, max: 200, mask: 'nnn'}
         },
         {display: "项目类别", name: "pstyp", width: "100", align: "left", type: "string"},
         {display: "项目类别描述", name: "ptext", width: "100", align: "left", type: "string"},
-        {display: "科目分配类别", name: "knttp", width: "100", align: "left", type: "string",
-            editor: {
-                required: false, type: "select",
-                data: {
-                    type: 'system',
-                    name: "knttp",
-                    getParam: function (item) {
-                        return {paramValue: $("#bsart").val()}
-                    },
-                    back: {
-                        knttp: "knttp"
-                    }
-                },
-            }
-        },
+        {display: "科目分配类别", name: "knttp", width: "100", align: "left", type: "string",},
         {display: "科目分配类别描述", name: "knttx", width: "100", align: "left", type: "string"},
-        {display: "工厂", name: "werks", width: "200", align: "left", type: "string",
-            editor: {required: false, type: "text"}
-        },
-        {display: "工厂名称", name: "name1", width: "100", align: "left", type: "string"},
-        {display: "物料编号", name: "matnr", width: "100", align: "left", type: "string",},
-        {display: "物料描述", name: "txz01", width: "100", align: "left", type: "string",},
-        {display: "物料组", name: "matkl", width: "100", align: "left", type: "string",
-            editor: {required: false, type: "text"}
-        },
-        {display: "物料组描述", name: "wgbez", width: "100", align: "left", type: "string",
-            //editor: {required: false, type: "text"}
-        },
-        {display: "采购申请数量", name: "menge", width: 150, minWidth: 60, type: "string", align: "center",
-            editor: {required: false, type: "text",mask: '9999999.999'}
-        },
-        {display: "采购申请计量单位", name: "meins", width: 150, minWidth: 60, type: "string", align: "center",
-            editor: {required: false, type: "text"}
-        },
-        {display: "单位描述", name: "msehl", width: 150, minWidth: 60, type: "string", align: "center",
-            editor: {required: false, type: "text"}
-        },
-        {display: "要求交货日期", name: "lfdat", width: "100", align: "left", type: "string",
-            editor: {required: false, type: "date"}
-        },
+        {display: "工厂", name: "werks", width: "100", align: "left", type: "string",},
+        {display: "工厂名称", name: "name1", width: "200", align: "left", type: "string"},
+        {display: "物料编号", name: "matnr", width: "200", align: "left", type: "string",},
+        {display: "物料描述", name: "txz01", width: "300", align: "left", type: "string",},
+        {display: "物料组", name: "matkl", width: "100", align: "left", type: "string",},
+        {display: "物料组描述", name: "wgbez", width: "100", align: "left", type: "string",},
+        {display: "采购申请数量", name: "menge", width: 150, minWidth: 60, type: "string", align: "center",},
+        {display: "采购申请计量单位", name: "meins", width: 150, minWidth: 60, type: "string", align: "center",},
+        {display: "单位描述", name: "msehl", width: 150, minWidth: 60, type: "string", align: "center",},
+        {display: "要求交货日期", name: "lfdat", width: "100", align: "left", type: "string",},
         {display: "库存地点", name: "lgort", width: "100", align: "left", type: "string",},
         {display: "库存地点名称", name: "lgobe", width: "100", align: "left", type: "string"},
-        //{display: "短文本", name: "txz01", width: "100", align: "left", type: "string",
-        //   editor: {required: false, type: "text"}
-        //},
-        {display: "采购组", name: "ekgrp", width: 150, minWidth: 60, type: "string", align: "center",
-            editor: {required: false, type: "text"}
-        },
-        {display: "采购组描述", name: "eknam", width: 150, minWidth: 60, type: "string", align: "center",
-            //editor: {required: false, type: "text"}
-        },
-        {display: "评估价格", name: "preis", width: "100", align: "left", type: "string",
-            editor: {type: 'text', mask: '9999999.99',required: false}
-        },
-        {display: "价格单位", name: "meins", width: 150, minWidth: 60, type: "string", align: "center",
-            editor: {required: false, type: "text"}
-        },
-        {display: "币种", name: "waers", width: "100", align: "left", type: "string",
-            editor: {type: 'text'}
-        },
-        {display: "价格基数", name: "peinh", width: "100", align: "left", type: "string",
-            editor: {type: 'text', mask: '9999999',required: false}
-        },
-        {display: "需求(请求)日期", name: "badat", width: "100", align: "left", type: "string",
-            editor: {type: 'date'}
-        },
-        {display: "创建人", name: "ernam", width: "100", align: "left", type: "string",
-            editor: {type: 'text'}
-        },
-        {display: "申请人", name: "nameText", width: "100", align: "left", type: "string",
-            editor: {type: 'text'}
-        },
+        {display: "采购组", name: "ekgrp", width: 150, minWidth: 60, type: "string", align: "center",},
+        {display: "采购组描述", name: "eknam", width: 200, minWidth: 60, type: "string", align: "center",},
+        {display: "评估价格", name: "preis", width: "100", align: "left", type: "string",},
+        {display: "价格单位", name: "meins", width: 100, minWidth: 60, type: "string", align: "center",},
+        {display: "币种", name: "waers", width: "60", align: "left", type: "string",},
+        {display: "价格基数", name: "peinh", width: "100", align: "left", type: "string",},
+        {display: "需求(请求)日期", name: "badat", width: "100", align: "left", type: "string",},
+        {display: "创建人", name: "ernam", width: "100", align: "left", type: "string",},
+        {display: "申请人", name: "nameText", width: "100", align: "left", type: "string",},
     ]
     return columns;
 }

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseApproval/sapPurchaseApprovalList.js

@@ -77,7 +77,7 @@ function initPurchaseListGrid() {
             heightDiff: -4,
             sortName: 'fillinDate',
             sortOrder: 'desc',
-            checkbox: true,
+            checkbox: false,
             usePager: true,
             rownumbers: true,
             enabledEdit: false,