From 410ae0faceda3c5f0dd3593f6c781e79f4714849 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 04 九月 2023 19:06:26 +0800
Subject: [PATCH] 电视机显示
---
src/main/java/com/zy/asrs/service/PackQualifiedService.java | 2 +-
src/main/java/com/zy/asrs/task/handler/FireOutHandler.java | 2 +-
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 12 ++++++------
src/main/resources/mapper/PackQualifiedMapper.xml | 8 ++++----
src/main/java/com/zy/asrs/service/impl/PackQualifiedServiceImpl.java | 8 +++++---
src/main/java/com/zy/asrs/mapper/PackQualifiedMapper.java | 4 ++--
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 3 ++-
7 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/PackQualifiedMapper.java b/src/main/java/com/zy/asrs/mapper/PackQualifiedMapper.java
index 889ac25..c5628a2 100644
--- a/src/main/java/com/zy/asrs/mapper/PackQualifiedMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/PackQualifiedMapper.java
@@ -20,7 +20,7 @@
Integer selectCurrentQuantity1(@Param("data1") Date data1,@Param("data2") Date data2);
Integer selectCurrentQuantity21(@Param("data1") Date data1,@Param("data2") Date data2);
- void insertPackQualified(@Param("now")Date now);
- void insertUnPackQualified(@Param("now")Date now);
+ void insertPackQualified(@Param("now")Date now,@Param("Pack")String Pack);
+ void insertUnPackQualified(@Param("now")Date now,@Param("Pack")String Pack);
}
diff --git a/src/main/java/com/zy/asrs/service/PackQualifiedService.java b/src/main/java/com/zy/asrs/service/PackQualifiedService.java
index 2b00a1e..804a832 100644
--- a/src/main/java/com/zy/asrs/service/PackQualifiedService.java
+++ b/src/main/java/com/zy/asrs/service/PackQualifiedService.java
@@ -12,5 +12,5 @@
Integer selectTotal1(Date data1,Date data2);
Integer selectCurrentQuantity1(Boolean sign,Date data1,Date data2);
- public void insertPackQualified(boolean qualified, Date now);
+ public void insertPackQualified(boolean qualified, Date now,String Pack);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 687ec72..4f095f5 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -817,7 +817,8 @@
@Override
@Transactional
public List<LocMast> packTestBasicInformation() {
- List<LocMast> locMasts=locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_type1", 1).and().ne("loc_sts","O"));
+ List<LocMast> locMasts=locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_type1", 1).and().ne("loc_sts","O")
+ .and().ne("loc_sts","X"));
for (LocMast locMast:locMasts) {
LocDetl locDetl=locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no",locMast.getLocNo()));
if(Cools.isEmpty(locDetl)){
diff --git a/src/main/java/com/zy/asrs/service/impl/PackQualifiedServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/PackQualifiedServiceImpl.java
index 2177f62..731221c 100644
--- a/src/main/java/com/zy/asrs/service/impl/PackQualifiedServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/PackQualifiedServiceImpl.java
@@ -37,11 +37,13 @@
}
@Override
- public void insertPackQualified(boolean qualified, Date now){
+ public void insertPackQualified(boolean qualified, Date now,String Pack){
if (qualified){
- this.baseMapper.insertPackQualified(now);
+ this.baseMapper.insertPackQualified(now,Pack);
+ }else{
+ this.baseMapper.insertUnPackQualified(now,Pack);
}
- this.baseMapper.insertUnPackQualified(now);
+
};
diff --git a/src/main/java/com/zy/asrs/task/handler/FireOutHandler.java b/src/main/java/com/zy/asrs/task/handler/FireOutHandler.java
index 1290b9d..05efc88 100644
--- a/src/main/java/com/zy/asrs/task/handler/FireOutHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/FireOutHandler.java
@@ -44,7 +44,7 @@
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("fire_status", 1)
.eq("loc_sts", "F"));
- Integer ioType = 101; //绉诲簱
+ Integer ioType = 101; //鍑哄簱
Date now = new Date();
//浼樺厛绾�99锛岀Щ搴撳埌0102501
for(LocMast locMast : locMasts){
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index e53dfcc..f2f97af 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -180,7 +180,7 @@
}
}
//鍏ュ簱鏍囪
- packQualifiedService.insertPackQualified(true,new Date());
+ packQualifiedService.insertPackQualified(true,new Date(),wrkDetls.get(0).getMatnr());
//2.鍏ュ簱瀹屾垚涓婃姤
CombParam combParam = new CombParam();
combParam.setPackNo(wrkDetls.get(0).getMatnr());
@@ -389,15 +389,15 @@
if (locMast.getLocType1().equals((short)4)){
locMast.setPackStatus(4); //4:NG
//鍏ュ簱鏍囪
- packQualifiedService.insertPackQualified(true,new Date());
+ packQualifiedService.insertPackQualified(true,new Date(),locDetl.getMatnr());
//鍑哄簱鏍囪
- packQualifiedService.insertPackQualified(false,new Date());
+ packQualifiedService.insertPackQualified(false,new Date(),locDetl.getMatnr());
}else {
locMast.setPackStatus(5); //5:闈欑疆涓�
//鍏ュ簱鏍囪
- packQualifiedService.insertPackQualified(true,new Date());
+ packQualifiedService.insertPackQualified(true,new Date(),locDetl.getMatnr());
//鍑哄簱鏍囪
- packQualifiedService.insertPackQualified(false,new Date());
+ packQualifiedService.insertPackQualified(false,new Date(),locDetl.getMatnr());
}
sign=true;
TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
@@ -517,7 +517,7 @@
return FAIL.setMsg("鍏ㄦ澘鍑哄簱 ===>> 淇敼婧愬簱浣嶇姸鎬佸け璐�; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
}else{
//鍑哄簱鏍囪
- packQualifiedService.insertPackQualified(false,new Date());
+ packQualifiedService.insertPackQualified(false,new Date(),wrkDetls101.get(0).getMatnr());
//2.鍑哄簱瀹屾垚涓婃姤
CombParam combParam = new CombParam();
combParam.setPackNo(wrkDetls101.get(0).getMatnr());
diff --git a/src/main/resources/mapper/PackQualifiedMapper.xml b/src/main/resources/mapper/PackQualifiedMapper.xml
index c43f974..b3985a8 100644
--- a/src/main/resources/mapper/PackQualifiedMapper.xml
+++ b/src/main/resources/mapper/PackQualifiedMapper.xml
@@ -62,12 +62,12 @@
</select>
<insert id="insertPackQualified">
- insert into man_pack_qualified(qualified,unqualified,create_time,status)
- values(1,0,#{now},2)
+ insert into man_pack_qualified(qualified,unqualified,create_time,status,total)
+ values(1,0,#{now},2,#{Pack})
</insert>
<insert id="insertUnPackQualified">
- insert into man_pack_qualified(qualified,unqualified,create_time,status)
- values(0,1,#{now},2)
+ insert into man_pack_qualified(qualified,unqualified,create_time,status,total)
+ values(0,1,#{now},2,#{Pack})
</insert>
</mapper>
--
Gitblit v1.9.1