工序外协订单审批时，带出组件信息；异常报告扣除应付款增加工厂和订单号；领料单选择物料时，带出物料组信息

topsun-xt/src/main/webapp/biz/topsun/sap/exceptionReport/exceptionReportDetailSupplier.js

@@ -327,6 +327,7 @@ columns1 = [
                 MATNR: "productCode",
                 TXZ01: "productName",
                 BPMNG: "number",
+                BPMNG: "bpmng",
                 MEINS: "unit",
                 MSEHL: "unitName",
                 MWSKZ: "mwskz",

topsun-xt/src/main/webapp/biz/topsun/sap/nonProducePick/nonProducePickDetail.js

@@ -140,6 +140,8 @@ function loadGrid() {
                             MEINS: "meins",
                             MSEHL: "msehl",
                             MATXT: "matxt",
+                            MATKL: "matkl",
+                            WGBEZ: "wgbez",
                         }
                     },
                 }

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

 var itemGridManager = null;
+var materialGridManager = null;
 $(function () {
     $("#toolBar").toolBar("enable", "forceAbortTask");
     revoke();
@@ -11,6 +12,15 @@ $(function () {
     if ("X0" == retpo){
         $("#billTitle .subject").html("采购订单换货")
     }
+
+    //工序外协订单显示组件信息
+    var bsart = $("#bsart").val();
+    if ("ZNB3"==bsart){
+        $("#outId").show();
+        loadMaterialGrid();
+    }else {
+        $("#outId").hide();
+    }
 });
 
 function bindEvent() {
@@ -131,5 +141,43 @@ function setId(value) {
     $("#id").val(value);
 }
 
+// 加载组件信息表格
+function loadMaterialGrid() {
+    var toolbarOptions = null;
+    toolbarOptions = UICtrl.getDefaultToolbarOptions({
+    });
+    // 表格
+    materialGridManager = UICtrl.grid("#materialGrid", {
+        columns: [
+            {
+                display: "供给物品名称", name: "materialName", width: 500, minWidth: 60, type: "String", align: "left",
+            },
+            {
+                display: "数量", name: "num", width: 150, minWidth: 60, type: "String", align: "left",
+            },
+            {
+                display: "计量单位", name: "unitName", width: 100, minWidth: 60, type: "String", align: "left",
+            },
+            {
+                display: "运输方式", name: "deliveryMethodOutTextView", width: 200, minWidth: 60, type: "String", align: "left",
+            },
+        ],
+        dataAction: "server",
+        url: web_app.name + '/processOutsource/queryProcessOutsourceMaterials.ajax',
+        parms: {processOutsourceId: $("#processOutsourceId").val()},
+        pageSize: 20,
+        usePager: true,
+        toolbar: toolbarOptions,
+        enabledEdit: false,
+        width: "98%",
+        height: "300px",
+        heightDiff: -8,
+        checkbox: true,
+        fixedCellHeight: true,
+        selectRowButtonOnly: true,
+    });
+    UICtrl.setSearchAreaToggle(materialGridManager);
+}
+
 
 

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

@@ -27,6 +27,7 @@
         <x:hidden name="statusId"/>
         <x:hidden name="retpo"/>
         <x:hidden name="lifnr"/>
+        <x:hidden name="processOutsourceId"/>
         <div class="hg-form-cols">
             <div class="hg-form-row">
                 <x:inputC name="ebeln" label="采购订单号码" readonly="true" labelCol="1" fieldCol="2" required="false"/>
@@ -62,6 +63,12 @@
             </div>
         </div>
         <div id="maingrid"></div>
+        <div class="blank_div clearfix"></div>
+        <div id="outId">
+            <x:title title="工序外协组件"/>
+            <div id="materialGrid" style="margin: 2px;"></div>
+        </div>
+
     </form>
 </div>
 </body>
\ No newline at end of file

topsun/src/main/java/com/huigou/topsun/sap/exceptionReport/application/impl/ExceptionReportApplicationImpl.java

@@ -507,6 +507,8 @@ public class ExceptionReportApplicationImpl extends FlowBroker implements Except
                     payable -> {
                         ExceptionReportPayableVo payableVo = new ExceptionReportPayableVo();
                         BeanUtil.copyProperties(payable, payableVo);
+                        payableVo.setWerks(exceptionReport.getWerks());
+                        payableVo.setZebeln(exceptionReport.getCustomerOrderNo());
                         payableVoList.add(payableVo);
                     }
             );

topsun/src/main/java/com/huigou/topsun/sap/exceptionReport/domain/vo/ExceptionReportPayableVo.java

@@ -13,6 +13,13 @@ import java.math.BigDecimal;
  */
 @Data
 public class ExceptionReportPayableVo implements Serializable {
+
+    @JsonProperty("ZEBELN")
+    private String zebeln;//订单号
+
+    @JsonProperty("WERKS")
+    private String werks;  // 公厂代码 CHAR(4)
+
     @JsonProperty("BUKRS")
     private String bukrs;  // 公司代码 CHAR(4)
 

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

 package com.huigou.topsun.sap.purchaseOrder.controller;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.huigou.topsun.common.BillStatus;
+import com.huigou.topsun.sap.processOutsource.domain.ProcessOutsourceOrderItem;
+import com.huigou.topsun.sap.processOutsource.repository.ProcessOutsourceOrderItemRepository;
 import com.huigou.topsun.sap.purchaseOrder.application.SapPurchaseOrderApplication;
 import com.huigou.topsun.sap.purchaseOrder.application.SapPurchaseOrderItemApplication;
 import com.huigou.topsun.sap.purchaseOrder.domain.SapPurchaseOrder;
@@ -23,6 +26,7 @@ import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Auther: xin.lu
@@ -37,6 +41,9 @@ public class SapPurchaseOrderController extends CommonController {
     private SapPurchaseOrderItemApplication sapPurchaseOrderItemApplication;
     @Resource
     private SapPurchaseOrderApplication sapPurchaseOrderApplication;
+    @Resource
+    private ProcessOutsourceOrderItemRepository processOutsourceOrderItemRepository;
+
     @Override
     protected String getPagePath() {
         return "/biz/topsun/sap/purchaseOrder/";
@@ -80,6 +87,18 @@ public class SapPurchaseOrderController extends CommonController {
         SDO sdo = this.getSDO();
         String id = sdo.getBizId();
         SapPurchaseOrder sapPurchaseOrder = sapPurchaseOrderApplication.loadSapPurchaseOrder(id);
+
+        //根据采购订单号，查询工序外协组件信息
+        String ebeln = sapPurchaseOrder.getEbeln();
+        List<ProcessOutsourceOrderItem> orderItemList = processOutsourceOrderItemRepository.findByEbeln(ebeln);
+        if (CollectionUtil.isNotEmpty(orderItemList)){
+            String processOutsourceId = orderItemList
+                    .stream()
+                    .map(ProcessOutsourceOrderItem::getProcessOutsourceId)
+                    .findFirst()
+                    .get();
+            this.putAttribute("processOutsourceId",processOutsourceId);
+        }
         return forward("sapPurchaseOrderDetail",sapPurchaseOrder);
     }