From 404fa9ff4331d6bb5037dbec466022fade5e82bc Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 18 十二月 2024 18:11:46 +0800
Subject: [PATCH] zjh202412018
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index 8027547..dc4ea1c 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -471,7 +471,7 @@
order.setZt("鍦ㄦ");
orders.add(order);
}
- if (zt==2 && sfwc == 0) {
+ if (zt==2 && sfwc == 0 && order.getCheckStatus()==0 && order.getCheckTime()==null && order.getHeshouStatus()==0 && order.getPrintLastTime()==null) {
//宸插畬鎴�2
order.setZt("宸插畬鎴�");
orders.add(order);
@@ -520,15 +520,29 @@
if(null !=zt){
if(zt==3){
+ //宸插鏍�
wq.isNotNull(TjOrder::getCheckTime);
+ wq.eq(TjOrder::getCheckStatus,1);
+ wq.isNull(TjOrder::getHeshouTime);
+ wq.isNull(TjOrder::getPrintLastTime);
+ wq.eq(TjOrder::getHeshouStatus,0);
}
if(zt==4){
+ //鐢熸垚鎶ュ憡
wq.isNotNull(TjOrder::getReportTime);
+ wq.isNull(TjOrder::getHeshouTime);
+ wq.isNull(TjOrder::getPrintLastTime);
+ wq.eq(TjOrder::getHeshouStatus,0);
}
if(zt==5){
+ //鎶ュ憡鏍告敹
wq.eq(TjOrder::getHeshouStatus,1);
+ wq.isNull(TjOrder::getPrintLastTime);
}
if(zt==6){
+ //宸插嚭鎶ュ憡
+ wq.isNotNull(TjOrder::getPrintLastTime);
+ wq.eq(TjOrder::getHeshouStatus,1);
wq.isNotNull(TjOrder::getPrintLastTime);
}
}
@@ -3216,7 +3230,7 @@
wq.eq(TjOrderRemark::getTjNumber, tjNUm);
wq.eq(TjOrderRemark::getProId, proId);
TjOrderRemark remark = remarkService.getOne(wq);
- remark.setType(1);
+ remark.setType(2);
remarkService.updateById(remark);
return AjaxResult.success("鎿嶄綔鎴愬姛!");
}
@@ -3260,7 +3274,7 @@
//鐢熸垚鎶ュ憡
a=4;
}
- if (null != heshouStatus) {
+ if (heshouStatus==1) {
//鎶ュ憡鏍告敹
a=5;
}
--
Gitblit v1.8.0