物料主数据新增，修改，

物料类型：ZBCP（半成品）ZSHB（机械设备产品）ZZCP（产成品）
字段：UEETK，默认选上，“是”；

采购订单打印增加生产单号

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

@@ -23,6 +23,8 @@ function initializate() {
     //页面控制
     UICtrl.enable($("#businessUsage"));
     UICtrl.enable($("#matklName"));
+
+    initbstmi($("#mtart").val());
     //物品类型 控制存储的序列号参数
     $("#mtart").combox({onChange:function(data) {
 
@@ -174,6 +176,15 @@ function initializate() {
     });
 }
 
+function initbstmi(mtart){
+    if (mtart == "ZFBL" || mtart == "ZMYP" || mtart == "ZYCL"){
+        //物料主数据的创建，修改：当物料类型等于，ZMYP(贸易品），ZFBL（辅料与包材），ZYCL（原材料）时：BSTMI（最小批量），BSTRF（舍入值）设置为必输
+        bstmiChange(true);
+    }else {
+        bstmiChange(false);
+    }
+}
+
 function bstmiChange(flag){
     UICtrl.setElRequiredFlag("#bstmi", flag);
     UICtrl.setElRequiredFlag("#bstrf", flag);

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

@@ -21,6 +21,7 @@ function initializate() {
     initKlart($("#mtart").val());
     initRaube($("#mtart").val());
     initbstmi($("#mtart").val());
+    initueetk($("#mtart").val());
     //页面控制
     UICtrl.enable($("#businessUsage"));
     UICtrl.enable($("#matklName"));
@@ -34,6 +35,7 @@ function initializate() {
          initSale(data.value);
          initMRP(data.value);
          initbstmi(data.value);
+         initueetk(data.value);
          //物料主数据的创建，修改 物料类型为：ZGKL（客供料），字段mrp控制者（DISPO），改为默认并且只能是105
          if (data.value == "ZKGL"){
              $("#dispo").val("105");//MRP控制者
@@ -42,13 +44,7 @@ function initializate() {
              $("#dispo").val("");//MRP控制者
              $("#dispo_text").val("");//MRP控制者
          }
-         if (data.value == "ZBCP" || data.value == "ZZCP" ){
-             $("#ueetk").val("X");//允许未限制的过量交货
-             $("#ueetk_text").val("是");//允许未限制的过量交货
-         }else {
-             $("#ueetk").val("0");//允许未限制的过量交货
-             $("#ueetk_text").val("否");//允许未限制的过量交货
-         }
+
       }
     });
     //价格控制  控制财务核算的 不参与成本核算
@@ -211,6 +207,16 @@ function initbstmi(mtart){
     }
 }
 
+function initueetk(mtart){
+    if (mtart == "ZBCP" || mtart == "ZZCP" || mtart == "ZSHB"){
+        $("#ueetk").val("X");//允许未限制的过量交货
+        $("#ueetk_text").val("是");//允许未限制的过量交货
+    }else {
+        $("#ueetk").val("0");//允许未限制的过量交货
+        $("#ueetk_text").val("否");//允许未限制的过量交货
+    }
+}
+
 function bstmiChange(flag){
     UICtrl.setElRequiredFlag("#bstmi", flag);
     UICtrl.setElRequiredFlag("#bstrf", flag);

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseOrder/sapPurchaseOrderList.js

@@ -11,8 +11,13 @@ function initUI() {
 
 function loadGrid() {
     var toolbarOptions = UICtrl.getDefaultToolbarOptions({
+        sapPrintProduceNoHandler: {
+            id: 'sapPrintProduceNoHandler', text: 'SAP外协单打印', img:'fa-print', click: function(){
+                sapPrintProduceNoHandler();
+            }
+        },
         sapPrintHandler: {
-            id: 'sapPrintHandler', text: 'SAP外协单打印', img:'fa-clipboard', click: function(){
+            id: 'sapPrintHandler', text: 'SAP外协单打印(无生产单号)', img:'fa-print', click: function(){
                 printHandler();
             }
         },
@@ -131,6 +136,15 @@ function printHandler(){
     Public.openPostWindow(web_app.name+url,{id: row.id});
 }
 
+function sapPrintProduceNoHandler(){
+    var row = DataUtil.getUpdateRow(purchaseOrderGridManager);
+    if (!row) {
+        return;
+    }
+    var url='/sapPurchaseOrder/printProduceNo.load';
+    Public.openPostWindow(web_app.name+url,{id: row.id});
+}
+
 function sendOutHandler(){
     var rows = purchaseOrderGridManager.getSelectedRows();
     if (rows.length == 0) {

topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/application/impl/SapPurchaseOrderApplicationImpl.java

@@ -479,7 +479,6 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
             //获取订单信息
             map = this.getSaleOrderInfo(map,purchaseOrderItems);
         }
-        map.put("page","/print/topsun/processOuter2.ftl");
         return map;
     }
 
@@ -552,6 +551,11 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
                     detailMap.put("kbetr3",kbetr3);
                     detailMap.put("priceAmount",netpr.add(kbetr2).add(kbetr3));//合计单价
                     detailMap.put("loss","1%");//LOSS数，默认1%
+                    String vbeln = purchaseOrderItem.getVbeln();
+                    if (StringUtil.isNotBlank(vbeln)){
+                        vbeln = vbeln.replaceFirst("^0*", "");
+                    }
+                    detailMap.put("vbeln",vbeln);//生产单号
                 }
             }
             detailMap.put("number",number);
@@ -637,6 +641,11 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
                     }
                     detailMap.put("priceAmount",priceAmount);//合计单价
                     amount = amount.add(priceAmount.multiply(outsourceOrderItem.getMenge()));//合计金额
+                    String aufnr = outsourceOrderItem.getAufnr();
+                    if (StringUtil.isNotBlank(aufnr)){
+                        aufnr = aufnr.replaceFirst("^0*", "");
+                    }
+                    detailMap.put("vbeln",aufnr);//生产单号
                 }
             }
             detailMap.put("number",number);

topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/controller/SapPurchaseOrderController.java

@@ -105,7 +105,19 @@ public class SapPurchaseOrderController extends CommonController {
         SDO sdo = this.getSDO();
         String id = sdo.getId();
         Map<String,Object> map = this.sapPurchaseOrderApplication.print(id);
-        String pintPage = String.format((String) map.get("page"));
+        String pintPage = "/print/topsun/processOuter2.ftl";
+        return outputAndProcUnitHandlerPDF(pintPage, id, map);
+    }
+
+    /**
+     * 打印带生产单号
+     * @return
+     */
+    public String printProduceNo() {
+        SDO sdo = this.getSDO();
+        String id = sdo.getId();
+        Map<String,Object> map = this.sapPurchaseOrderApplication.print(id);
+        String pintPage = "/print/topsun/processOuter.ftl";
         return outputAndProcUnitHandlerPDF(pintPage, id, map);
     }