From 0222b8573f16b8923814b9fcda553176f5b14288 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
<14103883+leaf-phos@user.noreply.gitee.com>
Date: Wed, 5 Mar 2025 18:03:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.vscode/settings.json | 3 ++-
.../k3cloud/constants/fileds/K3ProdField.java | 1 +
.../com/ruoyi/yh/price/mapper/PriceMapper.xml | 2 +-
.../ruoyi/yh/prodOrder/domain/ProdOrder.java | 3 +++
.../yh/prodOrder/mapper/ProdOrderMapper.xml | 5 ++++
.../service/impl/ProdOrderConverterImpl.java | 21 ++++++++++-----
.../service/impl/ProdOrderServiceImpl.java | 27 ++++++++++---------
7 files changed, 42 insertions(+), 20 deletions(-)
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 7b016a8..e012065 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,3 +1,4 @@
{
- "java.compile.nullAnalysis.mode": "automatic"
+ "java.compile.nullAnalysis.mode": "automatic",
+ "java.configuration.updateBuildConfiguration": "interactive"
}
\ No newline at end of file
diff --git a/common-ruoyi/ruoyi-common/src/main/java/com/ruoyi/common/k3cloud/constants/fileds/K3ProdField.java b/common-ruoyi/ruoyi-common/src/main/java/com/ruoyi/common/k3cloud/constants/fileds/K3ProdField.java
index 5216cf3..b0ab35f 100644
--- a/common-ruoyi/ruoyi-common/src/main/java/com/ruoyi/common/k3cloud/constants/fileds/K3ProdField.java
+++ b/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"; // 明细.下达日期
diff --git a/ruoyi-service/src/main/java/com/ruoyi/yh/price/mapper/PriceMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/yh/price/mapper/PriceMapper.xml
index f08f5c8..4f82a02 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/yh/price/mapper/PriceMapper.xml
+++ b/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 = '')
diff --git a/ruoyi-service/src/main/java/com/ruoyi/yh/prodOrder/domain/ProdOrder.java b/ruoyi-service/src/main/java/com/ruoyi/yh/prodOrder/domain/ProdOrder.java
index 31849e6..b46c352 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/yh/prodOrder/domain/ProdOrder.java
+++ b/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;
}
diff --git a/ruoyi-service/src/main/java/com/ruoyi/yh/prodOrder/mapper/ProdOrderMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/yh/prodOrder/mapper/ProdOrderMapper.xml
index f2a90ab..c3a1874 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/yh/prodOrder/mapper/ProdOrderMapper.xml
+++ b/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">
diff --git a/ruoyi-service/src/main/java/com/ruoyi/yh/prodOrder/service/impl/ProdOrderConverterImpl.java b/ruoyi-service/src/main/java/com/ruoyi/yh/prodOrder/service/impl/ProdOrderConverterImpl.java
index 3c61a92..d35b852 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/yh/prodOrder/service/impl/ProdOrderConverterImpl.java
+++ b/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
@@ -132,9 +138,12 @@ public class ProdOrderConverterImpl implements ProdOrderConverter {
case K3ProdField.F_BASE_NO_STOCK_IN_QTY:
po.setErpBaseNoStockInQty(row.getBigDecimal(i));
break;
- case K3ProdField.FMTONO:
+ case K3ProdField.FMTONO:
po.setErpMtoNo(row.getString(i));
break;
+ case K3ProdField.FAUXPROPID:
+ po.setFauxPropId(row.getString(i));
+ break;
default: break;
}
}
diff --git a/ruoyi-service/src/main/java/com/ruoyi/yh/prodOrder/service/impl/ProdOrderServiceImpl.java b/ruoyi-service/src/main/java/com/ruoyi/yh/prodOrder/service/impl/ProdOrderServiceImpl.java
index 2157599..06c67d9 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/yh/prodOrder/service/impl/ProdOrderServiceImpl.java
+++ b/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 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 lombok.extern.slf4j.Slf4j;
/**
* 生产订单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;