采购换货订单修改待办任务标题

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

@@ -3,6 +3,13 @@ $(function () {
     $("#toolBar").toolBar("enable", "forceAbortTask");
     initItemGrid();
     bindEvent();
+    var retpo = $("#retpo").val();
+    if ("X" == retpo){
+        $("#billTitle .subject").html("采购订单退货")
+    }
+    if ("X0" == retpo){
+        $("#billTitle .subject").html("采购订单换货")
+    }
 });
 
 function bindEvent() {

topsun-xt/src/main/webapp/biz/topsun/sap/transfers/sapStockTransfersDetail.js

@@ -136,7 +136,7 @@ function loadGrid() {
             },
             {display: "物料名称", name: "matnrName", width: "200", align: "left", type: "string"},
             {display: "数量", name: "menge", width: 100, minWidth: 60, type: "string", align: "left",
-                editor: {  type: "text",mask: 'nnnnnn',required: true }
+                editor: {  type: "text",mask: 'nnnnnn.nnnn',required: true }
             },
             { display: "单位", name: "meinsName", width: 120, minWidth: 60, type: "string", align: "left",
                 editor: {

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

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

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

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

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

@@ -142,6 +142,12 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
         //查询 单据日期
         String fillinDateStr = DateUtil.getDateFormat("yyyy-MM-dd HH:mm:ss", sapPurchaseOrder.getFillinDate());
         //设置标题
+        if ("X".equals(sapPurchaseOrder.getRetpo())) {
+            return String.format("%s-%s(%s)", "采购订单退货", sapPurchaseOrder.getEbeln(), fillinDateStr);
+        }
+        if ("X0".equals(sapPurchaseOrder.getRetpo())) {
+            return String.format("%s-%s(%s)", "采购订单换货", sapPurchaseOrder.getEbeln(), fillinDateStr);
+        }
         return String.format("%s-%s(%s)", sapPurchaseOrder.getBatxt(), sapPurchaseOrder.getEbeln(), fillinDateStr);
     }
 
@@ -318,16 +324,16 @@ public class SapPurchaseOrderApplicationImpl extends FlowBroker implements SapPu
 
         List<SapPurchaseOrderItemVo> ltItems = sapPurchaseOrderDto.getLtItems();
         List<SapPurchaseOrderItem> purchaseOrderItems = new ArrayList<>();
-        String retpo = "";
+        String retpo = "E";//审批要素不能为空，赋值E
         for (SapPurchaseOrderItemVo approvalItemVo : ltItems) {
             SapPurchaseOrderItem sapPurchaseApprovalItem = new SapPurchaseOrderItem();
             BeanUtil.copyProperties(approvalItemVo, sapPurchaseApprovalItem);
             purchaseOrderItems.add(sapPurchaseApprovalItem);
             if ("X".equals(approvalItemVo.getRetpo())){
-                retpo = "X";
-            }else {
-                //审批要素不能为空，赋值E
-                retpo = "E";
+                retpo = "X";//退货
+            }
+            if ("X".equals(retpo) && "".equals(approvalItemVo.getRetpo())){
+                retpo = "X0";//换货
             }
             sapPurchaseOrder.setKnttp(approvalItemVo.getKnttp());
         }

topsun/src/main/java/com/huigou/topsun/sap/transfers/application/impl/SapStockTransfersApplicationImpl.java

@@ -301,7 +301,7 @@ public class SapStockTransfersApplicationImpl extends FlowBroker implements SapS
             sapStockTransfersItem.setEpstp("U");//项目类别
             sapStockTransfersItem.setEbelp(Integer.parseInt(sapPurchaseItem.getBnfpo()));//项目编号
             sapStockTransfersItem.setMatnr(sapPurchaseItem.getMatnr());
-            sapStockTransfersItem.setMenge(sapPurchaseItem.getMenge().intValue());
+            sapStockTransfersItem.setMenge(sapPurchaseItem.getMenge());
             sapStockTransfersItem.setMeins(sapPurchaseItem.getMeins());
             sapStockTransfersItem.setEeind(sapPurchaseItem.getLfdat());//交货日期
             sapStockTransfersItem.setLgort(sapPurchaseItem.getLgort());

topsun/src/main/java/com/huigou/topsun/sap/transfers/domain/SapStockTransfersItem.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -44,7 +45,7 @@ public class SapStockTransfersItem extends AbstractEntity {
     private String  matnr;
     //数量
     @Column(name = "menge")
-    private Integer menge;
+    private BigDecimal menge;
 
     /**
      * 单位