物料主数据新增，修改，

物料类型：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-xt/src/main/webapp/template/print/topsun/processOuter.ftl

@@ -29,27 +29,14 @@
 </table>
 <table cellspacing="0px" cellpadding="0px" class="tablePrint">
     <colgroup>
-        <col width="40%"/>
-        <col width="10%"/>
-        <col width="40%"/>
-    </colgroup>
-    <tr>
-        <td class="right">传 真：020-36201902/020-36201962</td>
-        <td> </td>
-        <td class="left">E_Mail：gzbaoshen@gzbaoshen.com</td>
-    </tr>
-</table>
-<hr/>
-<table cellspacing="0px" cellpadding="0px" class="tablePrint">
-    <colgroup>
-        <col width='60%'/>
-        <col width="40%"/>
+        <col width='100%'/>
+        <#--        <col width="40%"/>-->
     </colgroup>
     <tr>
-        <td style="font-size: 20px;text-align: right;margin-top: 0.5cm">外发加工单</td>
-        <td class="right">
-            <img class="barcode" src="${barCode}" style="right: auto"></img>
-        </td>
+        <td style="font-size: 20px;text-align: center;margin-top: 0.5cm">外发单</td>
+        <#--        <td class="right">-->
+        <#--            <img class="barcode" src="${barCode}" style="right: auto"></img>-->
+        <#--        </td>-->
     </tr>
 </table>
 <table cellspacing="0px" cellpadding="0px" class="tableBorder">
@@ -57,163 +44,117 @@
         <col width='8%'/>
         <col width='42%'/>
         <col width="9%"/>
-        <col width="16%"/>
-        <col width="8%"/>
-        <col width="17%"/>
+        <col width="41%"/>
     </colgroup>
     <tr>
         <td class="left">加工商</td>
         <td class="left">${namel?default("")?html}</td>
-        <td class="left">外发日期</td>
-        <td class="left"><@formatDate date=fillinDate/></td>
-        <td class="left">外发单号</td>
-        <td class="left">${ebeln?default("")?html}</td>
+        <td class="left">加工商<br/>地址</td>
+        <td class="left">${address?default("")?html}</td>
     </tr>
 </table>
 <table cellspacing="0px" cellpadding="0px" class="tableBorder">
     <colgroup>
         <col width='8%'/>
-        <col width='42%'/>
+        <col width='34%'/>
+        <col width="8%"/>
+
         <col width="9%"/>
-        <col width="16%"/>
         <col width="8%"/>
-        <col width="17%"/>
+        <col width="9%"/>
+
+        <col width="9%"/>
+        <col width="15%"/>
     </colgroup>
     <tr>
-        <td class="left">加工商<br/>地址</td>
-        <td class="left">${address?default("")?html}</td>
+        <td class="left">外发单号</td>
+        <td class="left">${ebeln?default("")?html}</td>
+        <td class="left">外发日期</td>
+        <td class="left"><@formatDate date=fillinDate/></td>
         <td class="left">交货日期</td>
         <td class="left"><@formatDate date=eindt/></td>
-        <td class="left">仓库</td>
-        <td class="left">${lgobe?default("")?html}</td>
+        <td class="left">联系人电话</td>
+        <td class="left">${telf1?default("")?html}</td>
+
     </tr>
 </table>
 <table cellspacing="0px" cellpadding="0px" class="tableBorder">
     <colgroup>
         <col width='8%'/>
-        <col width='42%'/>
+        <col width='68%'/>
         <col width="9%"/>
-        <col width="16%"/>
-        <col width="8%"/>
-        <col width="17%"/>
+        <col width="15%"/>
     </colgroup>
     <tr>
         <td class="left">交货地点</td>
         <td class="left">${strSuppl?default("")?html}</td>
-        <td class="left">联系人电话</td>
-        <td class="left">${telf1?default("")?html}</td>
-        <td class="left">是否半成品</td>
-        <td class="left"></td>
-    </tr>
-</table>
-<table cellspacing="0px" cellpadding="0px" class="tableBorder">
-    <colgroup>
-        <col width='8%'/>
-        <col width='10%'/>
-        <col width='8%'/>
-        <col width='33%'/>
-        <col width='8%'/>
-        <col width='8%'/>
-        <col width='8%'/>
-        <col width='8%'/>
-        <col width='4%'/>
-        <col width='5%'/>
-    </colgroup>
-    <tr>
-        <td class="center">产品编码</td>
-        <td class="center">${matnr2?default("")?html}</td>
-        <td class="center">产品名称</td>
-        <td class="left">${maktx?default("")?html}</td>
-        <td class="center">成品数量</td>
-        <td class="center">${number?default("")?html}</td>
-        <td class="center">LOSS数</td>
-        <td class="center">${loss?default("")?html}</td>
-        <td class="center">单位</td>
-        <td class="center">${msehl?default("")?html}</td>
-    </tr>
-</table>
-<table cellspacing="0px" cellpadding="0px" class="tableBorder">
-    <colgroup>
-        <col width='8%'/>
-        <col width='10%'/>
-        <col width='8%'/>
-        <col width='15%'/>
-        <col width='8%'/>
-        <col width='10%'/>
-        <col width='8%'/>
-        <col width='8%'/>
-        <col width='8%'/>
-        <col width='8%'/>
-        <col width='4%'/>
-        <col width='5%'/>
-    </colgroup>
-    <tr>
-        <td class="center">排版数量</td>
-        <td class="center">${model?default("")?html}</td>
-        <td class="center">印张规格</td>
-        <td class="center">${sheetSpecifications?default("")?html}</td>
-        <td class="center">印刷色数</td>
-        <td class="center">${printColor?default("")?html}</td>
-        <td class="center">印张量</td>
-        <td class="center">${printNumber?default("")?html}</td>
-        <td class="center">印张LOSS</td>
-        <td class="center">${printLoss?default("")?html}</td>
-        <td class="center">单位</td>
-        <td class="center">${msehl?default("")?html}</td>
-    </tr>
-</table>
-<table cellspacing="0px" cellpadding="0px" class="tableBorder">
-    <colgroup>
-        <col width='8%'/>
-        <col width='33%'/>
-        <col width='8%'/>
-        <col width='10%'/>
-        <col width='8%'/>
-        <col width='8%'/>
-        <col width='8%'/>
-        <col width='8%'/>
-        <col width='4%'/>
-        <col width='5%'/>
-    </colgroup>
-    <tr>
-        <td class="center">外发工序</td>
-        <td class="left">${outProcess01?default("")?html}</td>
-        <td class="center">下道工序</td>
-        <td class="center">${outProcess02?default("")?html}</td>
-        <td class="center">应回厂数量</td>
-        <td class="center">${backNumber?default("")?html}</td>
-        <td class="center">实际送货数量</td>
-        <td class="center">${realNumber?default("")?html}</td>
-        <td class="center">单位</td>
-        <td class="center">${msehl?default("")?html}</td>
+        <td class="left">仓库</td>
+        <td class="left">${lgobe?default("")?html}</td>
     </tr>
 </table>
 <table cellspacing="0px" cellpadding="0px" class="tableBorder">
     <colgroup>
         <col width='8%'/>
-        <col width='10%'/>
-        <col width='8%'/>
-        <col width='6%'/>
-        <col width='9%'/>
-        <col width='8%'/>
-        <col width='10%'/>
-        <col width='8%'/>
-        <col width='8%'/>
-        <col width='25%'/>
+        <col width="92%"/>
     </colgroup>
     <tr>
-        <td class="center">单价</td>
-        <td class="center">${netpr?default("")?html}</td>
-        <td class="center">运输费用</td>
-        <td class="center">${kbetr2?default("")?html}</td>
-        <td class="center">包装费用</td>
-        <td class="center">${kbetr3?default("")?html}</td>
-        <td class="center">合计单价</td>
-        <td class="center">${priceAmount?default("")?html}</td>
-        <td class="center">总额</td>
-        <td class="center">${amount?default("")?html}</td>
+        <td class="center">备注1</td>
+        <td class="left" style="height: 80px">${headText1?default("")?html}</td>
     </tr>
 </table>
+<#if materialList?? && materialList?size gt 0>
+    <table cellspacing="0px" cellpadding="0px" class="tableBorder">
+        <colgroup>
+            <col width='4%' />
+            <col width='10%' />
+            <col width='8%' />
+            <col width='25%' />
+            <col width='4%' />
+            <col width='7%' />
+            <col width='6%' />
+            <col width='6%' />
+            <col width='5%' />
+            <col width='5%' />
+            <col width='8%' />
+            <col width='5%' />
+            <col width='7%' />
+        </colgroup>
+        <tr>
+            <td class="center" >项次</td>
+            <td class="center" >生产单号</td>
+            <td class="center" >产品编码</td>
+            <td class="center" >产品名称</td>
+            <td class="center" >单位</td>
+            <td class="center" >数量</td>
+            <td class="center" >LOSS数</td>
+            <td class="center" >单价</td>
+            <td class="center" >运输费用</td>
+            <td class="center" >包装费用</td>
+            <td class="center" >总金额</td>
+            <td class="center" >外发工序</td>
+            <td class="center" >备注</td>
+        </tr>
+        <#list materialList as detail>
+            <tr>
+                <td class="center">${detail.no?default("")?html}</td>
+                <td class="center">${detail.vbeln?default("")?html}</td>
+                <td class="center">${detail.matnr2?default("")?html}</td>
+                <td class="center">${detail.maktx?default("")?html}</td>
+                <td class="center">${detail.msehl?default("")?html}</td>
+                <td class="center">${detail.number?default("")?html}</td>
+                <td class="center">${detail.loss?default("")?html}</td>
+                <td class="center">${detail.netpr?default("")?html}</td>
+                <td class="center">${detail.kbetr2?default("")?html}</td>
+                <td class="center">${detail.kbetr3?default("")?html}</td>
+                <td class="center">${detail.amount?default("")?html}</td>
+                <td class="center">${detail.outProcess01?default("")?html}</td>
+                <td class="center">${detail.remark?default("")?html}</td>
+            </tr>
+        </#list>
+    </table>
+<#else >
+</#if>
+
 <table cellspacing="0px" cellpadding="0px" class="tableBorder">
     <colgroup>
         <col width='8%'/>
@@ -230,74 +171,35 @@
         <col width="92%"/>
     </colgroup>
     <tr>
-        <td class="center">备注</td>
+        <td class="center">备注2</td>
         <td class="left" style="height: 80px">${headText?default("")?html}</td>
     </tr>
 </table>
-<table cellspacing="0px" cellpadding="0px" class="tableBorder">
-    <colgroup>
-        <col width='20%' />
-    </colgroup>
-    <tr>
-        <td class="center" >生产单号</td>
-
-
-    </tr>
-    <#if saleOrderVos?? && saleOrderVos?size gt 0>
-        <#list saleOrderVos as detail>
-            <tr>
-                <td class="center">${detail.vbeln?default("")?html}</td>
-            </tr>
-        </#list>
-    <#else>
-        <tr>
-            <td class="center">&nbsp;</td>
-        </tr>
-    </#if>
-</table>
-<table cellspacing="0px" cellpadding="0px" class="tableBorder">
-    <colgroup>
-        <col width='33%'/>
-        <col width="33%"/>
-        <col width="33%"/>
-    </colgroup>
-    <tr>
-        <td class="left">产品正面图片：
-            <br/>
-            <img src='${frontImg?default("")?html}' width="230px"/>
-        </td>
-        <td class="left">产品背面图片：
-            <br/>
-            <img src='${backImg?default("")?html}' width="230px"/>
-        </td>
-        <td class="left">排版图片：</td>
-    </tr>
-</table>
-<#if materialList?? && materialList?size gt 0>
+<#if productInfoVoList?? && productInfoVoList?size gt 0>
     <table cellspacing="0px" cellpadding="0px" class="tableBorder">
         <colgroup>
-            <col width='25%' />
-            <col width='25%' />
-            <col width='25%' />
-            <col width='25%' />
+            <col width='50%' />
+            <col width='50%' />
+
         </colgroup>
         <tr>
-            <td class="center" >供给物料名称</td>
-            <td class="center" >数量</td>
-            <td class="center" >计量单位</td>
-            <td class="center" >运输方式</td>
+            <td class="left">产品正面图片：</td>
+            <td class="left">产品背面图片：</td>
         </tr>
-        <#list materialList as detail>
+        <#list productInfoVoList as detail>
             <tr>
-                <td class="center">${detail.materialName?default("")?html}</td>
-                <td class="center">${detail.num?default("")?html}</td>
-                <td class="center">${detail.unitName?default("")?html}</td>
-                <td class="center">${detail.deliveryMethodOut?default("")?html}</td>
+                <td class="center">
+                    <img src='${detail.frontImg?default("")?html}' width="230px"/>
+                </td>
+                <td class="center">
+                    <img src='${detail.backImg?default("")?html}' width="230px"/>
+                </td>
             </tr>
         </#list>
     </table>
 <#else >
 </#if>
+
 <table cellspacing="0px" cellpadding="0px" class="tableBorder">
     <colgroup>
         <col width='100%' />

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);
     }