采购信息记录增加运输费

topsun-xt/src/main/resources/数据库变更记录

@@ -147,3 +147,10 @@ ADD COLUMN `LIFNR` varchar(32) NULL COMMENT '供应商编码' AFTER `NAMEL`;
 
 --2024-10-25  品质异常单增加产品类别名称
 ALTER TABLE topsun_dev.sap_exception_report ADD product_type_name varchar(100) NULL;
+
+--2024-10-28  外协工序
+ALTER TABLE `topsun_dev`.`sap_process_outsource_order_item`
+ADD COLUMN `PRODUCT_CODE` varchar(32) NULL COMMENT '产品编码' AFTER `PRINT_LOSS`,
+ADD COLUMN `PRODUCT_NAME` varchar(255) NULL COMMENT '产品名称' AFTER `PRODUCT_CODE`,
+ADD COLUMN `PRODUCT_TYPE` varchar(32) NULL COMMENT '产品类别' AFTER `PRODUCT_NAME`,
+ADD COLUMN `PRODUCT_TYPE_NAME` varchar(32) NULL COMMENT '产品类别描述' AFTER `PRODUCT_TYPE`;

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

@@ -587,6 +587,7 @@ function  doSaveDefine() {
             ekgrp: $("#ekgrp").val(),
             ekgrpName: $("#ekgrpName").val(),
             netpr: $("#netpr").val(),
+            freight: $("#freight").val(),
             waers: $("#waers").val(),
             waersTextView: $("#waers").find("option:selected").text(),
             peinh: $("#peinh").val(),

topsun/src/main/java/com/huigou/topsun/controller/ResourceSearchController.java

@@ -293,14 +293,14 @@ public class ResourceSearchController {
         SapDialogOrderQuery queryRequest = sdo.toObject(SapDialogOrderQuery.class);
         List  <Map<String,String>>mapList = sapMaterialApplication.getSapCustomerOrder(queryRequest);
 
-        if (CollectionUtil.isNotEmpty(mapList)){
-            if (StringUtil.isNotBlank(param)){//固定条件过滤，
-                mapList = mapList
-                        .stream()
-                        .filter(map -> map.values().stream().anyMatch(value->value.contains(param)))
-                        .collect(Collectors.toList());
-            }
-        }
+//        if (CollectionUtil.isNotEmpty(mapList)){
+//            if (StringUtil.isNotBlank(param)){//固定条件过滤，
+//                mapList = mapList
+//                        .stream()
+//                        .filter(map -> map.values().stream().anyMatch(value->value.contains(param)))
+//                        .collect(Collectors.toList());
+//            }
+//        }
 
          Integer intPage = sdo.getInteger("intPage", 1);
          Integer pageSize = sdo.getInteger("pageSize",10);

topsun/src/main/java/com/huigou/topsun/sap/purchaseInfoRecord/domain/vo/SapPurchaseInfoRecordItemVo.java

@@ -239,7 +239,7 @@ public class SapPurchaseInfoRecordItemVo implements Serializable {
     /**
      * 运输费
      */
-    @JsonProperty("KBETR2")
+    @JsonProperty("KBETR")
     private BigDecimal freight;
 
 }