优化提交

.vscode/settings.json

@@ -1,3 +1,4 @@
 {
-    "java.compile.nullAnalysis.mode": "automatic"
+    "java.compile.nullAnalysis.mode": "automatic",
+    "java.configuration.updateBuildConfiguration": "interactive"
 }

common-ruoyi/ruoyi-common/src/main/java/com/ruoyi/common/k3cloud/constants/fileds/K3ProdField.java

@@ -15,6 +15,7 @@ public class K3ProdField {
     public static final String F_IS_REWORK = "FIsRework"; // 是否返工
     public static final String F_MATERIAL_ID = "FMaterialId"; // 物料ID
     public static final String FMTONO = "FMTONO"; // 计划跟踪号
+    public static final String FAUXPROPID = "FAuxPropId"; // 辅助属性
     public static final String F_ROW_ID = "FRowId"; // 明细.行标识
     public static final String F_MEMO_ITEM = "FMemoItem"; // 明细.备注
     public static final String F_CONVEY_DATE = "FConveyDate"; // 明细.下达日期

ruoyi-service/src/main/java/com/ruoyi/yh/price/mapper/PriceMapper.xml

@@ -67,10 +67,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="query.deleted == null "> and bp.deleted = false</if>
         <if test="query.code != null and query.code!= ''"> and bp.code like concat('%', #{query.code}, '%')</if>
         <if test="query.surface != null and query.surface!= ''"> and bp.surface like concat('%', #{query.surface}, '%')</if>
+        <if test="query.eqName != null and query.eqName != ''"> and bp.name = #{query.eqName}</if>
         <if test="query.eqCategory != null and query.eqCategory != ''"> and bp.category = #{query.eqCategory}</if>
         <if test="query.eqSize != null and query.eqSize != ''"> and bp.size = #{query.eqSize}</if>
         <if test="query.eqPattern != null and query.eqPattern != ''"> and bp.pattern = #{query.eqPattern}</if>
-        <if test="query.eqName != null and query.eqName != ''"> and bp.name = #{query.eqName}</if>
         <if test="query.needAllMatch != null and query.needAllMatch == true">
             <if test="query.eqName == null or query.eqName == ''">
                 and (bp.name is null or bp.name = '')

ruoyi-service/src/main/java/com/ruoyi/yh/prodOrder/domain/ProdOrder.java

@@ -146,4 +146,7 @@ public class ProdOrder extends BaseEntity
 
     @ApiModelProperty("计划跟踪号")
     private String erpMtoNo;
+
+    @ApiModelProperty("ERP辅助属性")
+    private String fauxPropId;
 }

ruoyi-service/src/main/java/com/ruoyi/yh/prodOrder/mapper/ProdOrderMapper.xml

@@ -46,6 +46,7 @@
             bpo.unit_name,
             bpo.base_unit_name,
             bpo.erp_mto_no,
+            bpo.faux_prop_id,
             sd.dept_name as work_shop_name
         from bst_prod_order bpo
             left join sys_dept sd on sd.dept_id = bpo.dept_id
@@ -70,6 +71,7 @@
         <if test="query.erpMaterialId != null and query.erpMaterialId != ''"> and bpo.erp_material_id = #{query.erpMaterialId}</if>
         <if test="query.erpBaseUnitId != null  and query.erpBaseUnitId != ''"> and bpo.erp_base_unit_id = #{query.erpBaseUnitId}</if>
         <if test="query.erpMtoNo != null  and query.erpMtoNo != ''"> and bpo.erp_mto_no = #{query.erpMtoNo}</if>
+        <if test="query.fauxPropId != null and query.fauxPropId != ''"> and bpo.faux_prop_id like concat('%', #{query.fauxPropId}, '%')</if>
         <if test="query.materialNumber != null and query.materialNumber != ''">
             and bpo.material_number like concat('%',#{query.materialNumber},'%')
         </if>
@@ -191,6 +193,7 @@
             <if test="unitName != null">unit_name,</if>
             <if test="baseUnitName != null">base_unit_name,</if>
             <if test="erpMtoNo != null">erp_mto_no,</if>
+            <if test="fauxPropId != null">faux_prop_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="erpId != null and erpId != ''">#{erpId},</if>
@@ -228,6 +231,7 @@
             <if test="unitName != null">#{unitName},</if>
             <if test="baseUnitName != null">#{baseUnitName},</if>
             <if test="erpMtoNo != null">#{erpMtoNo},</if>
+            <if test="fauxPropId != null">#{fauxPropId},</if>
         </trim>
     </insert>
 
@@ -281,6 +285,7 @@
         <if test="data.unitName != null">unit_name = #{data.unitName},</if>
         <if test="data.baseUnitName != null">base_unit_name = #{data.baseUnitName},</if>
         <if test="data.erpMtoNo != null">erp_mto_no = #{data.erpMtoNo},</if>
+        <if test="data.fauxPropId != null">faux_prop_id = #{data.fauxPropId},</if>
     </sql>
 
     <delete id="deleteProdOrderById" parameterType="Long">

ruoyi-service/src/main/java/com/ruoyi/yh/prodOrder/service/impl/ProdOrderConverterImpl.java

@@ -1,5 +1,16 @@
 package com.ruoyi.yh.prodOrder.service.impl;
 
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 import com.alibaba.fastjson2.JSONArray;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.k3cloud.constants.fileds.K3ProdField;
@@ -12,11 +23,6 @@ import com.ruoyi.yh.prodOrder.domain.ProdOrder;
 import com.ruoyi.yh.prodOrder.service.ProdOrderConverter;
 import com.ruoyi.yh.unit.domain.UnitVO;
 import com.ruoyi.yh.unit.service.UnitService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.time.LocalDateTime;
-import java.util.*;
 
 /**
  * @author wjh
@@ -135,6 +141,9 @@ public class ProdOrderConverterImpl implements ProdOrderConverter {
                     case K3ProdField.FMTONO:    
                         po.setErpMtoNo(row.getString(i));
                         break;
+                    case K3ProdField.FAUXPROPID:
+                        po.setFauxPropId(row.getString(i));
+                        break;
                     default: break;
                 }
             }

ruoyi-service/src/main/java/com/ruoyi/yh/prodOrder/service/impl/ProdOrderServiceImpl.java

@@ -1,5 +1,17 @@
 package com.ruoyi.yh.prodOrder.service.impl;
 
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.support.TransactionTemplate;
+
 import com.alibaba.fastjson2.JSONArray;
 import com.github.pagehelper.PageHelper;
 import com.ruoyi.common.annotation.DataScope;
@@ -27,18 +39,8 @@ import com.ruoyi.yh.prodOrder.domain.dto.ProdOrderSyncQuery;
 import com.ruoyi.yh.prodOrder.mapper.ProdOrderMapper;
 import com.ruoyi.yh.prodOrder.service.ProdOrderConverter;
 import com.ruoyi.yh.prodOrder.service.ProdOrderService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.support.TransactionTemplate;
 
-import java.math.BigDecimal;
+import lombok.extern.slf4j.Slf4j;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 
 /**
  * 生产订单Service业务层处理
@@ -182,7 +184,8 @@ public class ProdOrderServiceImpl implements ProdOrderService
                     K3ProdField.F_MATERIAL_ID,
                     K3ProdField.F_NO_STOCK_IN_QTY,
                     K3ProdField.F_BASE_NO_STOCK_IN_QTY,
-                    K3ProdField.FMTONO
+                    K3ProdField.FMTONO,
+                    K3ProdField.FAUXPROPID
             );
             int startRow = 0;
             int limit = 10000;