客供料删除标识改为完成；物品类型:ZSHB，存储条件默认为S1；工序外协工单带出数量和loss数；

topsun-xt/src/main/webapp/biz/topsun/sap/clientMaterials/clientMaterialsList.js

@@ -13,7 +13,7 @@ function initUI() {
 function loadGrid() {
     var toolbarOptions = UICtrl.getDefaultToolbarOptions({
        // exportExcelHandler:exportExcelHandler,
-       deleteHandler:{id:'deleteHandler',img:'fa-cloud-delete',text:'删除订单',click:deleteHandler},
+       deleteHandler:{id:'deleteHandler',img:'fa-cloud-delete',text:'完成订单',click:deleteHandler},
 
     });
     gridManager = UICtrl.grid("#maingrid", {
@@ -29,7 +29,7 @@ function loadGrid() {
             {display: "销售订单", name: "kdauf", width: 120, minWidth: 60, type: "string", align: "left"},
             {display: "行项次", name: "kdpos", width: 120, minWidth: 60, type: "string", align: "left"},
             {display: "生产订单", name: "aufnr", width: 200, minWidth: 60, type: "string", align: "left"},
-            {display: "是否删除", name: "closedTextView", width: 100, minWidth: 60, type: "string", align: "left"},
+            {display: "是否完成", name: "closedTextView", width: 100, minWidth: 60, type: "string", align: "left"},
         ],
         dataAction: "server",
         url: web_app.name + '/clientMaterials/slicedClientMaterialsList.ajax',
@@ -67,7 +67,7 @@ function deleteHandler(){
         return;
     }
     if (row.closed == '1') {
-        Public.tip('订单已删除！');
+        Public.tip('订单已完成！');
         return;
     }
     Public.ajax(web_app.name + '/clientMaterials/deleteClientMaterials.ajax', {row:$.toJSON(row)}, function () {

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

@@ -19,18 +19,19 @@ function initializate() {
     UICtrl.setDisable("#totalContentDiv");
     coRowNum= $("#busiLens").val();
     initKlart($("#mtart").val());
+    initRaube($("#mtart").val());
     //页面控制
     UICtrl.enable($("#businessUsage"));
     UICtrl.enable($("#matklName"));
     //物品类型 控制存储的序列号参数
     $("#mtart").combox({onChange:function(data) {
          initKlart(data.value);
+         initRaube(data.value);
          storeDisplaySer(data.value);
          getBklas(data.value);
          getAwsls(data.value);
          initSale(data.value);
          initMRP(data.value);
-
          //物料主数据的创建，修改 物料类型为：ZGKL（客供料），字段mrp控制者（DISPO），改为默认并且只能是105
          if (data.value == "ZKGL"){
              $("#dispo").val("105");//MRP控制者
@@ -168,6 +169,14 @@ function initKlart(mtart) {
     }
 }
 
+function initRaube(mtart) {
+    if (mtart == "ZSHB"){
+        //物品类型ZSHB，默认为S1
+        $("#raube").val("S1");
+        $("#raube_text").val("S1-小塘工厂五金库拣配_3000");
+    }
+}
+
 function initSale(mtart){
     if (mtart == "ZZCP" && $("#businessUsageV").prop("checked")){
         saleAndMtartRequired(true);

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

@@ -131,6 +131,8 @@ function getOrderColumns(){
                     MTBEZ: "productTypeName",
                     MSEH3: "meins",
                     MSEHL: "meinsName",
+                    GAMNG: "menge",
+                    ZLOSSC: "printLoss",
                 }
             }
         }

topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapPurchaseList.js

@@ -49,7 +49,7 @@ function initPurchaseListGrid() {
                 {display: "采购申请编号", name: "banfn", width: 150, minWidth: 60, type: "string", align: "center"},
                 //{display: "批准时间", name: "frgdt", width: 200, minWidth: 60, type: "date", align: "center"},
                 //{display: "申请日期", name: "fillinDate", width: 120, minWidth: 60, type: "string", align: "left"},
-                {display: "申请人", name: "personMemberName", width: 120, minWidth: 60, type: "string", align: "left"},
+                {display: "录入人", name: "personMemberName", width: 120, minWidth: 60, type: "string", align: "left"},
                 {display: "申购项次号", name: "bnfpo", width: "80", align: "left", type: "string",},
                 {display: "工厂", name: "werks", width: "100", align: "left", type: "string"},
                 {display: "工厂名称", name: "name1", width: "200", align: "left", type: "string",},