From 2c7e3fc6f16d42146618ea986e43d428be8a235b Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Mon, 8 Dec 2025 17:00:58 +0800 Subject: [PATCH] =?UTF-8?q?2025-12-05=20=E5=A2=9E=E5=8A=A0"=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E5=8F=98=E5=8A=A8=E8=AE=B0=E5=BD=95"=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=88WMS=20-=20=E4=BB=93=E5=BA=93=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E7=AE=A1=E7=90=86=20-=20=E6=A0=87=E7=AD=BE=E5=8F=98?= =?UTF-8?q?=E5=8A=A8=E8=AE=B0=E5=BD=95=EF=BC=89=20=20=20=20=20=201?= =?UTF-8?q?=E3=80=81=E6=98=8E=E7=BB=86=E8=A1=A8=E5=B1=95=E7=A4=BA=E6=89=80?= =?UTF-8?q?=E6=9C=89=E6=95=B0=E6=8D=AE=EF=BC=88=E9=BB=98=E8=AE=A4=E6=98=AF?= =?UTF-8?q?=E4=BB=8A=E5=A4=A9=E7=9A=84=EF=BC=89=20=20=20=20=20=202?= =?UTF-8?q?=E3=80=81=E5=85=B6=E4=BB=96=E9=A1=B5=E7=AD=BE=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?document=5Ftype=E5=8C=BA=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/pms/data/QcFAIRecordData.java | 1 + .../LabelTransactionLogController.java | 62 ++++++++++++ .../dao/LabelTransactionLogMapper.java | 25 +++++ .../service/LabelTransactionLogService.java | 21 ++++ .../impl/LabelTransactionLogServiceImpl.java | 30 ++++++ src/main/resources/application-dev.yml | 3 +- src/main/resources/mapper/pms/QcMapper.xml | 3 + .../warehouse/LabelTransactionLogMapper.xml | 97 +++++++++++++++++++ 8 files changed, 241 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/gaotao/modules/warehouse/controller/LabelTransactionLogController.java create mode 100644 src/main/java/com/gaotao/modules/warehouse/dao/LabelTransactionLogMapper.java create mode 100644 src/main/java/com/gaotao/modules/warehouse/service/LabelTransactionLogService.java create mode 100644 src/main/java/com/gaotao/modules/warehouse/service/impl/LabelTransactionLogServiceImpl.java create mode 100644 src/main/resources/mapper/warehouse/LabelTransactionLogMapper.xml diff --git a/src/main/java/com/gaotao/modules/pms/data/QcFAIRecordData.java b/src/main/java/com/gaotao/modules/pms/data/QcFAIRecordData.java index 171bc88..5df435b 100644 --- a/src/main/java/com/gaotao/modules/pms/data/QcFAIRecordData.java +++ b/src/main/java/com/gaotao/modules/pms/data/QcFAIRecordData.java @@ -290,4 +290,5 @@ public class QcFAIRecordData extends QueryPage { private String documentNo; private String customerNo; private String customerName; + private Integer detailImageNum; } diff --git a/src/main/java/com/gaotao/modules/warehouse/controller/LabelTransactionLogController.java b/src/main/java/com/gaotao/modules/warehouse/controller/LabelTransactionLogController.java new file mode 100644 index 0000000..198f8fc --- /dev/null +++ b/src/main/java/com/gaotao/modules/warehouse/controller/LabelTransactionLogController.java @@ -0,0 +1,62 @@ +package com.gaotao.modules.warehouse.controller; + +import com.gaotao.common.constant.SysMsgConstant; +import com.gaotao.common.utils.PageUtils; +import com.gaotao.common.utils.R; +import com.gaotao.modules.sys.controller.AbstractController; +import com.gaotao.modules.sys.entity.SysUserEntity; +import com.gaotao.modules.warehouse.service.LabelTransactionLogService; +import org.apache.shiro.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * 标签变动记录控制器 + */ +@RestController +@RequestMapping("warehouse/labelTransactionLog") +public class LabelTransactionLogController extends AbstractController { + + @Autowired + private LabelTransactionLogService labelTransactionLogService; + + /** + * 查询标签变动记录列表（带分页） + */ + @PostMapping("list") + public R list(@RequestBody Map params) { + try { + // 添加当前用户信息（根据userName查询用户有权访问的site和buNo） + params.put("userName", ((SysUserEntity) SecurityUtils.getSubject().getPrincipal()).getUsername()); + + // 获取分页参数 + int page = params.get("page") != null ? Integer.parseInt(params.get("page").toString()) : 1; + int limit = params.get("limit") != null ? Integer.parseInt(params.get("limit").toString()) : 20; + + // 计算偏移量 + int offset = (page - 1) * limit; + params.put("offset", offset); + + // 查询列表 + List> list = labelTransactionLogService.queryList(params); + + // 查询总数 + int total = labelTransactionLogService.queryTotal(params); + + // 封装分页数据 + PageUtils pageUtils = new PageUtils(list, total, limit, page); + + return R.ok() + .put("code", 0) + .put("msg", getLanguageMsg(SysMsgConstant.OBJECT_ID_200000)) + .put("page", pageUtils); + } catch (Exception e) { + logger.error("查询标签变动记录列表失败", e); + return R.error("查询标签变动记录列表失败: " + e.getMessage()); + } + } +} + diff --git a/src/main/java/com/gaotao/modules/warehouse/dao/LabelTransactionLogMapper.java b/src/main/java/com/gaotao/modules/warehouse/dao/LabelTransactionLogMapper.java new file mode 100644 index 0000000..57f85e4 --- /dev/null +++ b/src/main/java/com/gaotao/modules/warehouse/dao/LabelTransactionLogMapper.java @@ -0,0 +1,25 @@ +package com.gaotao.modules.warehouse.dao; + +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** + * 标签变动记录Mapper + */ +@Mapper +public interface LabelTransactionLogMapper { + + /** + * 查询标签变动记录列表 + */ + List> queryList(@Param("query") Map params); + + /** + * 查询标签变动记录总数 + */ + int queryTotal(@Param("query") Map params); +} + diff --git a/src/main/java/com/gaotao/modules/warehouse/service/LabelTransactionLogService.java b/src/main/java/com/gaotao/modules/warehouse/service/LabelTransactionLogService.java new file mode 100644 index 0000000..6874b0f --- /dev/null +++ b/src/main/java/com/gaotao/modules/warehouse/service/LabelTransactionLogService.java @@ -0,0 +1,21 @@ +package com.gaotao.modules.warehouse.service; + +import java.util.List; +import java.util.Map; + +/** + * 标签变动记录Service + */ +public interface LabelTransactionLogService { + + /** + * 查询标签变动记录列表 + */ + List> queryList(Map params); + + /** + * 查询标签变动记录总数 + */ + int queryTotal(Map params); +} + diff --git a/src/main/java/com/gaotao/modules/warehouse/service/impl/LabelTransactionLogServiceImpl.java b/src/main/java/com/gaotao/modules/warehouse/service/impl/LabelTransactionLogServiceImpl.java new file mode 100644 index 0000000..ff4ea32 --- /dev/null +++ b/src/main/java/com/gaotao/modules/warehouse/service/impl/LabelTransactionLogServiceImpl.java @@ -0,0 +1,30 @@ +package com.gaotao.modules.warehouse.service.impl; + +import com.gaotao.modules.warehouse.dao.LabelTransactionLogMapper; +import com.gaotao.modules.warehouse.service.LabelTransactionLogService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +/** + * 标签变动记录Service实现类 + */ +@Service +public class LabelTransactionLogServiceImpl implements LabelTransactionLogService { + + @Autowired + private LabelTransactionLogMapper labelTransactionLogMapper; + + @Override + public List> queryList(Map params) { + return labelTransactionLogMapper.queryList(params); + } + + @Override + public int queryTotal(Map params) { + return labelTransactionLogMapper.queryTotal(params); + } +} + diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index b963794..4427781 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -5,7 +5,8 @@ spring: driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver type: com.alibaba.druid.pool.DruidDataSource #url: jdbc:sqlserver://xujiesoft.vicp.net:11512;databaseName=XJMES - url: jdbc:sqlserver://xujiesoft.vicp.net:11515;databaseName=Boying_real + #url: jdbc:sqlserver://xujiesoft.vicp.net:11515;databaseName=Boying_real + url: jdbc:sqlserver://192.168.1.90:1433;databaseName=Boying_real username: sa password: XJsoft123 initial-size: 10 diff --git a/src/main/resources/mapper/pms/QcMapper.xml b/src/main/resources/mapper/pms/QcMapper.xml index 7f59ea6..a76ec6f 100644 --- a/src/main/resources/mapper/pms/QcMapper.xml +++ b/src/main/resources/mapper/pms/QcMapper.xml @@ -669,6 +669,7 @@ isnull(a.unqualified_quantity,0) as unqualifiedQuantity, a.sampling_qty, dbo.qc_get_ipqc_sub_record_num(a.site, a.bu_no, a.inspection_no, a.item_no) as subDetailRecordNum, + dbo.qc_get_record_image_num(a.site, a.bu_no, a.inspection_no, a.item_no) as detailImageNum, c.method_no, c.method_name, c.method_remark @@ -1069,6 +1070,7 @@ a.is_submit, isnull(a.unqualified_quantity,0) as unqualifiedQuantity, dbo.qc_get_iqc_sub_record_num(a.site, a.bu_no, a.inspection_no, a.item_no) as subDetailRecordNum, + dbo.qc_get_record_image_num(a.site, a.bu_no, a.inspection_no, a.item_no) as detailImageNum, c.method_no, c.method_name, c.method_remark, @@ -1470,6 +1472,7 @@ isnull(a.unqualified_quantity,0) as unqualifiedQuantity, a.sampling_qty, dbo.qc_get_fqc_sub_record_num(a.site, a.bu_no, a.inspection_no, a.item_no) as subDetailRecordNum, + dbo.qc_get_record_image_num(a.site, a.bu_no, a.inspection_no, a.item_no) as detailImageNum, c.method_no, c.method_name, c.method_remark diff --git a/src/main/resources/mapper/warehouse/LabelTransactionLogMapper.xml b/src/main/resources/mapper/warehouse/LabelTransactionLogMapper.xml new file mode 100644 index 0000000..40daa36 --- /dev/null +++ b/src/main/resources/mapper/warehouse/LabelTransactionLogMapper.xml @@ -0,0 +1,97 @@ + + + + + + + + + + + + +