From b5749e71ad98172f5a128557ff20386cba2029db Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 28 二月 2024 16:21:59 +0800
Subject: [PATCH] 拣货单管理新增客户名称展示
---
src/main/java/com/zy/asrs/controller/PlaController.java | 4 +++-
src/main/resources/mapper/ManPakOutMapper.xml | 4 ++--
src/main/java/com/zy/asrs/entity/param/PakOutDTO.java | 1 +
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/PlaController.java b/src/main/java/com/zy/asrs/controller/PlaController.java
index e91e410..ba3b843 100644
--- a/src/main/java/com/zy/asrs/controller/PlaController.java
+++ b/src/main/java/com/zy/asrs/controller/PlaController.java
@@ -204,7 +204,8 @@
pla.setModifyTime(new Date());
pla.setWeightAnfme(0.0);
plaService.updateById(pla);
- SaasUtils.insertLog(1,pla.getLocNo(),pla.getBrand(),anfme,getUser().getUsername(),null,pla.getBatch(),pla.getPackageNo());
+ SaasUtils.insertLog(1,pla.getLocNo(),pla.getBrand(),anfme,getUser().getUsername(),
+ null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
});
return R.ok();
@@ -359,6 +360,7 @@
manPakOut.setStatus(0);
manPakOut.setDocId(plaQty.getOrderDetlId());
manPakOut.setNodeId(plaQty.getId());
+ manPakOut.setCustName(plaQty.getCustomer());
//manPakOut.setNodeId(plaQty.getOrderDetlId());
manPakOutService.insert(manPakOut);
return R.ok();
diff --git a/src/main/java/com/zy/asrs/entity/param/PakOutDTO.java b/src/main/java/com/zy/asrs/entity/param/PakOutDTO.java
index 43cb13d..c960b36 100644
--- a/src/main/java/com/zy/asrs/entity/param/PakOutDTO.java
+++ b/src/main/java/com/zy/asrs/entity/param/PakOutDTO.java
@@ -11,6 +11,7 @@
private String doc_num;
private Date create_time;
private Integer status;
+ private String custName;
public String getCreateTime$(){
if (Cools.isEmpty(this.create_time)){
diff --git a/src/main/resources/mapper/ManPakOutMapper.xml b/src/main/resources/mapper/ManPakOutMapper.xml
index 17daba0..7a819a9 100644
--- a/src/main/resources/mapper/ManPakOutMapper.xml
+++ b/src/main/resources/mapper/ManPakOutMapper.xml
@@ -12,10 +12,10 @@
<select id="selectPakOut" resultType="com.zy.asrs.entity.param.PakOutDTO">
select * from (
- SELECT ROW_NUMBER() over (order by doc_num) as row, doc_num,MAX(create_time) as create_time FROM man_pakout
+ SELECT ROW_NUMBER() over (order by doc_num) as row, doc_num,MAX(create_time) as create_time, cust_name as custName FROM man_pakout
where 1=1
<include refid="selectPakOutSql"></include>
- GROUP BY doc_num
+ GROUP BY doc_num,cust_name
) t where t.row BETWEEN ((#{curr}-1)*#{limit}+1) and (#{curr}*#{limit})
ORDER BY create_time DESC
--
Gitblit v1.9.1