From 9d492aac78c25d03a54d1979f4b251513ed2c196 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E8=85=BE?= <1178634255@qq.com>
Date: Fri, 21 Jul 2023 11:18:21 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?=E2=80=94=E2=80=94=E5=86=85=E9=83=A8=E7=A0=81=E6=89=93=E5=8D=B0?=
=?UTF-8?q?=EF=BC=8C=E6=9C=AA=E6=8C=89=E7=85=A7=E6=9C=80=E6=96=B0=E5=88=9B?=
=?UTF-8?q?=E5=BB=BA=E6=97=B6=E9=97=B4=E8=BF=9B=E8=A1=8C=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../inv/impl/InvInnerOrderPrintServiceImpl.java | 10 ++++++++--
.../resources/mybatis/mapper/inv/InnerOrderDao.xml | 1 +
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java
index 7fc5421d..6f604570 100644
--- a/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java
@@ -112,9 +112,15 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService
filterUdiRelRequest.setId(Long.valueOf(obj.getProductId()));
filterUdiRelRequest.setPackLevel(udiRelevanceDao.selectPackLevel(obj.getNameCode()));
System.out.println(filterUdiRelRequest.getPackLevel());
+ int a=0;
+ if (filterUdiRelRequest.getPackLevel()==null){
+ a=0;
+ }else {
+ a=Integer.parseInt(filterUdiRelRequest.getPackLevel())-1;
+ }
//查询耗材字典信息
- // UdiRelevanceResponse filterUdiRelevance = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest).get(0);
- UdiRelevanceResponse filterUdiRelevance = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest).get(Integer.parseInt(filterUdiRelRequest.getPackLevel())-1);
+ //UdiRelevanceResponse filterUdiRelevance = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest).get(0);
+ UdiRelevanceResponse filterUdiRelevance = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest).get(a);
//查询产品信息
UdiProductEntity udiProductEntity = udiProductService.findByNameCode(filterUdiRelevance.getNameCode());
diff --git a/src/main/resources/mybatis/mapper/inv/InnerOrderDao.xml b/src/main/resources/mybatis/mapper/inv/InnerOrderDao.xml
index 7149391f..5bd0e447 100644
--- a/src/main/resources/mybatis/mapper/inv/InnerOrderDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/InnerOrderDao.xml
@@ -17,6 +17,7 @@
'%Y-%m-%d') and date_format(#{endDate}, '%Y-%m-%d')
</if>
</where>
+ ORDER BY inv_inner_order.createTime DESC
</select>
<insert id="insert" keyProperty="id"
From 9955a21ec12981becef3edb1bab0f194ed64dcd2 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Fri, 21 Jul 2023 11:37:14 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=8D=95=E6=8D=AE?=
=?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=97=B6=E9=97=B4=E4=B8=8D=E4=B8=80=E8=87=B4?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/glxp/api/service/inout/IoCheckInoutService.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
index 64efb7a9..6ef4c434 100644
--- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
@@ -80,6 +80,7 @@ public class IoCheckInoutService {
/**
* 判断是否需要手动校验
+ *
* @param billNo
* @return
*/
@@ -132,6 +133,7 @@ public class IoCheckInoutService {
/**
* 校验流程 | 一次校验
+ *
* @param orderId
*/
public void check(String orderId) {
@@ -782,7 +784,8 @@ public class IoCheckInoutService {
if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_REW) {
orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_REW);
orderEntity.setUpdateTime(new Date());
- orderEntity.setCheckTime(new Date());
+ if (IntUtil.value(orderEntity.getFromType()) != ConstantStatus.FROM_UDISP)
+ orderEntity.setCheckTime(new Date());
orderService.update(orderEntity);
checkSecond(orderEntity);
}
@@ -839,7 +842,8 @@ public class IoCheckInoutService {
if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_AUDITED) {
orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_CHECK);
orderEntity.setUpdateTime(new Date());
- orderEntity.setAuditTime(new Date());
+ if (IntUtil.value(orderEntity.getFromType()) != ConstantStatus.FROM_UDISP)
+ orderEntity.setAuditTime(new Date());
if (StrUtil.isEmpty(orderEntity.getReviewUser())) {
orderEntity.setReviewUser(orderEntity.getReviewUser());
}
From 10293c4e9917aa81eef95bcdecb749c8f46145b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E8=85=BE?= <1178634255@qq.com>
Date: Fri, 21 Jul 2023 17:28:42 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=A4=9A=E7=BA=A7=E7=A0=81=E7=BB=91?=
=?UTF-8?q?=E5=AE=9A=E4=BA=A7=E5=93=81=E5=90=8E=EF=BC=8C=E6=95=B0=E9=87=8F?=
=?UTF-8?q?=E4=BC=9A=E5=8F=98=E6=88=901?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/glxp/api/controller/inout/IoCodeTempController.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
index 9b4b0178..15d370b6 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
@@ -1067,7 +1067,7 @@ public class IoCodeTempController extends BaseController {
codeTempEntity.setRelId(codeSaveRequest.getRelId());
int reCount = udiCalCountUtil.getActCount(codeTempEntity);
- codeTempEntity.setReCount(reCount);
+// codeTempEntity.setReCount(reCount);
}
IoOrderEntity orderEntity = orderService.findByBillNo(codeTempEntity.getOrderId());
BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());