外发单打印销售单备注信息；采购信息记录必输验证

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/addPurchaseInfoRecordDetail.jsp

@@ -47,7 +47,7 @@
             <x:hidden name="waers"/>
             <x:hidden name="ltsnr"/>
             <x:hidden name="ltsbz"/>
-            <x:inputC name="peinh" label="价格单位" labelCol="1" fieldCol="2" required="true" mask="9999999"/>
+            <x:inputC name="peinh" label="价格单位" labelCol="1" fieldCol="2" required="true" mask="99999999.99"/>
             <x:inputC name="meinsName" label="基本计量单位" labelCol="1" fieldCol="2"  required="false"  readonly="true"/>
 
             <x:hidden name="bprme"/>

topsun-xt/src/main/webapp/biz/topsun/sap/purchaseInfoRecord/purchaseInfoRecordDetail.js

@@ -683,67 +683,79 @@ function  doSaveDefine() {
 }
 function  checkInput() {
     if ($("#werks").val()==""){
-      Public.errorTip("工厂必输！");
+      Public.tip("工厂必输！");
       return false;
     }
     if ($("#ekorg").val()==""){
-        Public.errorTip("采购组织必输！");
+        Public.tip("采购组织必输！");
         return false;
     }
     if ($("#lifnr").val()==""){
-        Public.errorTip("供应商必输！");
+        Public.tip("供应商必输！");
         return false;
     }
    /* if ($("#matnr").val()==""){
-        Public.errorTip("物料编码必输！");
+        Public.tip("物料编码必输！");
         return false;
     }*/
     if ($("#esokz").val()==""){
-        Public.errorTip("记录分类必输！");
+        Public.tip("记录分类必输！");
         return false;
     }
     if ($("#ekgrp").val()==""){
-        Public.errorTip("采购组必输！");
+        Public.tip("采购组必输！");
         return false;
     }
     if ($("#netpr").val()==""){
-        Public.errorTip("净价必输！");
+        Public.tip("净价必输！");
         return false;
     }
     if ($("#waers").val()==""){
-        Public.errorTip("货币码必输！");
+        Public.tip("货币码必输！");
         return false;
     }
     if ($("#mwskz").val()==""){
-        Public.errorTip("销售/购买税代码必输！");
+        Public.tip("销售/购买税代码必输！");
         return false;
     }
     if ($("#datab").val()==""){
-        Public.errorTip("生效日期起必输！");
+        Public.tip("生效日期起必输！");
         return false;
     }
     if ($("#datbi").val()==""){
-        Public.errorTip("生效日期止必输！");
+        Public.tip("生效日期止必输！");
+        return false;
+    }
+    if ($("#peinh").val()==""){
+        Public.tip("价格单位必输！");
+        return false;
+    }
+    if ($("#bprmeName").val()==""){
+        Public.tip("订单价格单位(采购)必输！");
+        return false;
+    }
+    if ($("#mwskz").val()==""){
+        Public.tip("销售/购买税代码必输！");
+        return false;
+    }
+    if ($("#umren").val()==""){
+        Public.tip("订单单位转换分母必输！");
+        return false;
+    }
+    if ($("#umrez").val()==""){
+        Public.tip("订单单位转换分子必输！");
         return false;
     }
-    // if ($("#norbm").val()==""){
-    //     Public.errorTip("标准采购订单数量必输！");
-    //     return false;
-    // }
-    // if ($("#minbm").val()==""){
-    //     Public.errorTip("最小采购订单数量必输！");
-    //     return false;
-    // }
     if ($("#aplfz").val()==""){
-        Public.errorTip("计划交货时间必输！");
+        Public.tip("计划交货时间(天)必输！");
         return false;
     }
     if ($("#webre").val()==""){
-        Public.errorTip("基于收货的发票验证必输！");
+        Public.tip("基于收货的发票验证必输！");
         return false;
     }
     if ($("#stfkz").val()==""){
-        Public.errorTip("等级类型必输！");
+        Public.tip("等级类型必输！");
         return false;
     }
 

topsun-xt/src/main/webapp/template/print/topsun/processOuter.ftl

@@ -172,7 +172,7 @@
     </colgroup>
     <tr>
         <td class="center">备注2</td>
-        <td class="left" style="height: 80px">${headText?default("")?html}</td>
+        <td class="left" style="height: 80px">${headText2?default("")?html}</td>
     </tr>
 </table>
 <#if productInfoVoList?? && productInfoVoList?size gt 0>

topsun-xt/src/main/webapp/template/print/topsun/processOuter2.ftl

@@ -169,7 +169,7 @@
     </colgroup>
     <tr>
         <td class="center">备注2</td>
-        <td class="left" style="height: 80px">${headText?default("")?html}</td>
+        <td class="left" style="height: 80px">${headText2?default("")?html}</td>
     </tr>
 </table>
 <#if productInfoVoList?? && productInfoVoList?size gt 0>

topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyDeptApplicationImpl.java

@@ -150,6 +150,7 @@ public class NonProdApplyDeptApplicationImpl extends BaseApplication implements
         ClassHelper.copyProperties(deptVo,nonProdApplyDept);
 
         nonProdApplyDept = this.save(nonProdApplyDept);
+        LOG.info("物料主数据视图实体:={}", JSON.toJSONString(nonProdApplyDept));
         map.put("applyDeptId",nonProdApplyDept.getApplyDeptId());
         map.put("type","S");
         //不是分发的  提交后产生领导的待办信息

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

@@ -473,7 +473,10 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
         map.put("eindt",purchaseOrderItems.get(0).getEindt());//交货时间
         map.put("telf1",purchaseOrderItems.get(0).getTelf1());//联系电话
         map.put("lgobe",purchaseOrderItems.get(0).getLgobe());//仓库
+        if (!"虚拟库".equals(purchaseOrderItems.get(0).getLgobe())){
             map.put("strSuppl",purchaseOrderItems.get(0).getStrSuppl());//交货地点
+        }
+
         //订单类型是ZNB3时对应工序外发（临时工序外协）
         if ("ZNB3".equals(sapPurchaseOrder.getBsart())){
             //工序外协
@@ -482,6 +485,33 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
             //成品外购
             //获取订单信息
             map = this.getSaleOrderInfo(map,purchaseOrderItems);
+
+            //销售单备注信息
+            String headText2 = "";
+            for (SapPurchaseOrderItem purchaseOrderItem : purchaseOrderItems) {
+                List<String> strList = new ArrayList<>();
+                String vbeln = purchaseOrderItem.getVbeln();
+                String zpackrequ = purchaseOrderItem.getZpackrequ();
+                String zpacknum = purchaseOrderItem.getZpackrequnum();
+                String zpackunit = purchaseOrderItem.getZpackunit();
+                String zlosspack = purchaseOrderItem.getZlosspack();
+                if (StringUtil.isNotBlank(zpackrequ)){
+                    strList.add(zpackrequ);
+                }
+                if (StringUtil.isNotBlank(zpacknum)){
+                    strList.add(zpacknum);
+                }
+                if (StringUtil.isNotBlank(zpackunit)){
+                    strList.add(zpackunit);
+                }
+                if (StringUtil.isNotBlank(zlosspack)){
+                    strList.add(zlosspack);
+                }
+                if (StringUtil.isNotBlank(vbeln)){
+                    headText2 = headText2 + vbeln + "："+ String.join(";", strList);
+                }
+            }
+            map.put("headText2",headText2);
         }
         return map;
     }

topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/domain/SapPurchaseOrderItem.java

@@ -256,4 +256,28 @@ public class SapPurchaseOrderItem extends AbstractEntity {
     @Column(name = "kbetr3")
     private BigDecimal kbetr3;
 
+    /**
+     * 包装要求
+     */
+    @Column(name="ZPACKREQU")
+    private String  zpackrequ;
+
+    /**
+     * 包装数量
+     */
+    @Column(name="ZPACKREQUNUM")
+    private String  zpackrequnum;
+
+    /**
+     * 包装单位
+     */
+    @Column(name="ZPACKUNIT")
+    private String  zpackunit;
+
+    /**
+     * 是否组合单包装
+     */
+    @Column(name="ZLOSSPACK")
+    private String  zlosspack;
+
 }
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/sap/purchaseOrder/domain/vo/SapPurchaseOrderItemVo.java

@@ -157,4 +157,28 @@ public class SapPurchaseOrderItemVo {
     @JsonProperty("KBETR3")
     private BigDecimal kbetr3;
 
+    /**
+     * 包装要求
+     */
+    @JsonProperty("ZPACKREQU")
+    private String  zpackrequ;
+
+    /**
+     * 包装数量
+     */
+    @JsonProperty("ZPACKREQUNUM")
+    private String  zpackrequnum;
+
+    /**
+     * 包装单位
+     */
+    @JsonProperty("ZPACKUNIT")
+    private String  zpackunit;
+
+    /**
+     * 是否组合单包装
+     */
+    @JsonProperty("ZLOSSPACK")
+    private String  zlosspack;
+
 }
\ No newline at end of file

topsun/src/main/resources/config/topsun/sap/sapPurchaseInfoRecord/sapPurchaseInfoRecordItem.xml

@@ -54,7 +54,6 @@
             t.MAKTX,
             t.MATKL,
             t.VERID,
-            t.SORTL,
             t.REGIO,
             t.STFKZ,
             t.IDNLF,