From 6c91a2e9e71f6e77d1448b66c98020525efde128 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 21 Jul 2023 09:37:47 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E8=B5=84=E8=B4=A8=E8=AF=81=E4=B9=A6?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E9=97=AE=E9=A2=98=E7=9B=B8=E5=85=B3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/UdiContrastController.java | 2 - .../inout/IoCodeTempController.java | 9 ++++- .../inout/IoOrderDetailBizController.java | 2 +- .../purchase/SupProductController.java | 38 +++++++++---------- .../thrsys/ThrProductsController.java | 5 ++- .../glxp/api/dao/purchase/SupProductDao.java | 2 + .../service/purchase/SupProductService.java | 4 +- .../purchase/impl/SupProductServiceImpl.java | 5 +++ .../mybatis/mapper/purchase/SupProductDao.xml | 18 ++++++--- src/main/resources/schemas/schema_v2.1.sql | 4 +- 10 files changed, 56 insertions(+), 33 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java index 62a87bcf..fa461f01 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java @@ -199,8 +199,6 @@ public class UdiContrastController { } else { return ResultVOUtils.error(500, "更新失败！"); } - - } 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 0c739ee6..9b4b0178 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -763,7 +763,7 @@ public class IoCodeTempController extends BaseController { BaseResponse baseResponse = checkRelId(codeEnttity, unitFk); if (bussinessTypeEntity.getCheckCertExpire() == 2 && udiRelevanceResponse.isNeedCert()) { - SupProductEntity supProductEntity = supProductService.findByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory(), ""); + SupProductEntity supProductEntity = supProductService.findExitByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory()); if (supProductEntity != null && (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS || supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS)) { List supCertEntities = supCertService.findByProductId(supProductEntity.getProductId()); if (CollUtil.isNotEmpty(supCertEntities)) { @@ -775,7 +775,12 @@ public class IoCodeTempController extends BaseController { } } } else { - return ResultVOUtils.error(500, "产品资质证书未通过审核！"); + if (supProductEntity == null) { + return ResultVOUtils.error(500, "产品资质证书未维护！"); + } else { + return ResultVOUtils.error(500, "产品资质证书未通过审核！"); + } + } } diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index f836dc91..d163c5a8 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -167,7 +167,7 @@ public class IoOrderDetailBizController extends BaseController { UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectSupGroupById(item.getRelId(), addBizProductReqeust.getSupId()); BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction()); if (bussinessTypeEntity.getCheckCertExpire() == 2 && udiRelevanceResponse.isNeedCert()) { - SupProductEntity supProductEntity = supProductService.findByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory(), ""); + SupProductEntity supProductEntity = supProductService.findExitByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory()); if (supProductEntity != null && (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS || supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS)) { List supCertEntities = supCertService.findByProductId(supProductEntity.getProductId()); diff --git a/src/main/java/com/glxp/api/controller/purchase/SupProductController.java b/src/main/java/com/glxp/api/controller/purchase/SupProductController.java index f590d5eb..7ed9805c 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupProductController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupProductController.java @@ -157,27 +157,27 @@ public class SupProductController { public BaseResponse selectBind(@RequestBody SelectProductBindRequest selectProductBindRequest) { UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectUdiId(Long.valueOf(selectProductBindRequest.getRelIdFk())); - SupProductEntity supProductEntity = supProductService.findByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory(),selectProductBindRequest.getManufacturerId()); + SupProductEntity supProductEntity = supProductService.findByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory(), selectProductBindRequest.getManufacturerId()); if (supProductEntity != null) { return ResultVOUtils.error(500, "该产品资质已存在，请勿重复添加！"); - }else{ - supProductEntity = new SupProductEntity(); - BeanUtils.copyProperties(udiRelevanceResponse, supProductEntity); - supProductEntity.setProductId(selectProductBindRequest.getProductId()); - supProductEntity.setRecordCode(udiRelevanceResponse.getZczbhhzbapzbh()); - supProductEntity.setRelIdFk(udiRelevanceResponse.getId() + ""); - supProductEntity.setRecordProductName(udiRelevanceResponse.getCpmctymc()); - supProductEntity.setProductType(udiRelevanceResponse.getQxlb()); - supProductEntity.setProductDirectoryCode(udiRelevanceResponse.getFlbm()); - supProductEntity.setRecordPeopleName(udiRelevanceResponse.getYlqxzcrbarmc()); - supProductEntity.setSpecification(udiRelevanceResponse.getGgxh()); - supProductEntity.setCreateTime(new Date()); - supProductEntity.setUpdateTime(new Date()); - supProductEntity.setManufacturerIdFk(selectProductBindRequest.getManufacturerId()); - supProductEntity.setCustomerId(selectProductBindRequest.getCustomerId()); - supProductEntity.setHchzsb(udiRelevanceResponse.getCplb()); - supProductEntity.setCompanyName(selectProductBindRequest.getCompanyName()); - supProductEntity.setAuditStatus(selectProductBindRequest.getAuditStatus()); + } else { + supProductEntity = new SupProductEntity(); + BeanUtils.copyProperties(udiRelevanceResponse, supProductEntity); + supProductEntity.setProductId(selectProductBindRequest.getProductId()); + supProductEntity.setRecordCode(udiRelevanceResponse.getZczbhhzbapzbh()); + supProductEntity.setRelIdFk(udiRelevanceResponse.getId() + ""); + supProductEntity.setRecordProductName(udiRelevanceResponse.getCpmctymc()); + supProductEntity.setProductType(udiRelevanceResponse.getQxlb()); + supProductEntity.setProductDirectoryCode(udiRelevanceResponse.getFlbm()); + supProductEntity.setRecordPeopleName(udiRelevanceResponse.getYlqxzcrbarmc()); + supProductEntity.setSpecification(udiRelevanceResponse.getGgxh()); + supProductEntity.setCreateTime(new Date()); + supProductEntity.setUpdateTime(new Date()); + supProductEntity.setManufacturerIdFk(selectProductBindRequest.getManufacturerId()); + supProductEntity.setCustomerId(selectProductBindRequest.getCustomerId()); + supProductEntity.setHchzsb(udiRelevanceResponse.getCplb()); + supProductEntity.setCompanyName(selectProductBindRequest.getCompanyName()); + supProductEntity.setAuditStatus(selectProductBindRequest.getAuditStatus()); } diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java index 147c4b09..234742ef 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java @@ -215,8 +215,11 @@ public class ThrProductsController { // udiProductEntity.setGgxh(thrProductsEntity.getStandard()); udiProductService.updateUdiInfo(udiProductEntity); } - } + + + //todo 若产品信息 + return ResultVOUtils.success("修改成功！"); } diff --git a/src/main/java/com/glxp/api/dao/purchase/SupProductDao.java b/src/main/java/com/glxp/api/dao/purchase/SupProductDao.java index 1d32a67a..d62b9cfc 100644 --- a/src/main/java/com/glxp/api/dao/purchase/SupProductDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/SupProductDao.java @@ -30,4 +30,6 @@ public interface SupProductDao extends BaseMapperPlus { SupProductEntity findByRelIdFk(String relIdFk); - SupProductEntity findByManufactury(String cpmctymc, String manufactory,String manufacturerIdFk); + SupProductEntity findByManufactury(String cpmctymc, String manufactory, String manufacturerIdFk); + + SupProductEntity findExitByManufactury(String cpmctymc, String manufactory); SupProductResponse findByPassByReCert(String registerCert); diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java index c1fac32a..e16d2736 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java @@ -102,6 +102,11 @@ public class SupProductServiceImpl extends ServiceImpl @@ -389,4 +389,12 @@ FROM sup_product WHERE enterpriseId = #{enterpriseId} + diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index 69eadbd0..ad3479f4 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -438,6 +438,6 @@ CALL Pro_Temp_ColumnWork('io_order', 'rmDeptCode', 'varchar(255)', 1); CALL Pro_Temp_ColumnWork('io_order', 'rmInvCode', 'varchar(255)', 1); CALL Pro_Temp_ColumnWork('io_order', 'outSickInfo', 'varchar(255)', 1); - +CALL Pro_Temp_ColumnWork('inv_inner_order_detail', 'nameCode', 'varchar(255)', 1); CALL Pro_Temp_ColumnWork('inv_inner_order_detail', 'nameCode', - 'varchar(255) ', 1); \ No newline at end of file + 'varchar(255) ', 1); 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 02/11] =?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') + ORDER BY inv_inner_order.createTime DESC Date: Fri, 21 Jul 2023 11:37:14 +0800 Subject: [PATCH 03/11] =?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 04/11] =?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()); From 1f28b106a4c647d41f42042ac79bdd30666e060e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Fri, 21 Jul 2023 18:04:01 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml b/src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml index 15220eab..a29cf9eb 100644 --- a/src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml +++ b/src/main/resources/mybatis/mapper/auth/WarehouseBussinessTypeDao.xml @@ -193,7 +193,7 @@ b1.`name` FROM auth_warehouse_bustype a1 INNER JOIN basic_bussiness_type b1 ON a1.action = b1.action - where b1.spUse = 1 + where (b1.spUse = 1 or b1.spUse = 2) and a1.code = #{code} group by b1.id From 1e839762b09abc4f6dbd3af2076a2c08098e659f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E8=85=BE?= <1178634255@qq.com> Date: Mon, 24 Jul 2023 18:09:00 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/req/thrsys/ThrUnitMaintainFilterRequest.java | 2 +- .../java/com/glxp/api/res/thrsys/ThrUnitMaintainResponse.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/req/thrsys/ThrUnitMaintainFilterRequest.java b/src/main/java/com/glxp/api/req/thrsys/ThrUnitMaintainFilterRequest.java index 7c950df7..44c52ecf 100644 --- a/src/main/java/com/glxp/api/req/thrsys/ThrUnitMaintainFilterRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/ThrUnitMaintainFilterRequest.java @@ -10,7 +10,7 @@ import java.util.List; @Data public class ThrUnitMaintainFilterRequest extends ListPageRequest { - private Integer id; + private Long id; private String key; private String unitId; private String name; diff --git a/src/main/java/com/glxp/api/res/thrsys/ThrUnitMaintainResponse.java b/src/main/java/com/glxp/api/res/thrsys/ThrUnitMaintainResponse.java index 92a74d7f..dfdfd6dd 100644 --- a/src/main/java/com/glxp/api/res/thrsys/ThrUnitMaintainResponse.java +++ b/src/main/java/com/glxp/api/res/thrsys/ThrUnitMaintainResponse.java @@ -8,7 +8,7 @@ import java.util.Date; @Data public class ThrUnitMaintainResponse { - private Integer id; + private Long id; private String erpId; @NotBlank(message = "往来单位名称不能为空！") From e1a160380ee8f41ceb9f3646ac48009bea027683 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Tue, 25 Jul 2023 17:15:45 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E8=B4=A8?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/controller/system/SysPdfTemplateController.java | 5 ++++- src/main/java/com/glxp/api/upload/uploadController.java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java b/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java index 78a3bf67..2f1f1fb1 100644 --- a/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java +++ b/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java @@ -18,6 +18,7 @@ import com.glxp.api.service.system.SystemPDFTemplateService; import com.glxp.api.util.JasperUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Value; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; @@ -36,6 +37,8 @@ public class SysPdfTemplateController { @Resource private SystemPDFTemplateService systemPDFTemplateService; + @Value("${file_path}") + private String filePath; @AuthRuleAnnotation("system/pdf/template/list") @GetMapping("/system/pdf/template/list") @@ -84,7 +87,7 @@ public class SysPdfTemplateController { "[{\"area\":\"福建省厦门市湖里区\",\"vaiDate\":\"2023-03-15\",\"code\":\"1113\",\"companyName\":\"盛夏科技\",\"classes\":\"经营企业\",\"mobile\":\"18575144832\",\"index\":\"1\",\"remark\":\"12\",\"detailAddr\":\"湖里\",\"name\":\"业务许可证\",\"creditNum\":\"6464684643\",\"auditStatus\":\"审核通过\",\"expireDate\":\"2023-03-16\",\"contacts\":\"东\",\"email\":\"46456@qq.com\",\"status\":\"有效\"}]"; } - JasperUtils.jasperReport(request, response, data, systemPDFTemplateEntity.getPath(), "pdf"); + JasperUtils.jasperReport(request, response, data, filePath + "/pdf/template/"+systemPDFTemplateEntity.getPath(), "pdf"); diff --git a/src/main/java/com/glxp/api/upload/uploadController.java b/src/main/java/com/glxp/api/upload/uploadController.java index c006b3da..861b61ea 100644 --- a/src/main/java/com/glxp/api/upload/uploadController.java +++ b/src/main/java/com/glxp/api/upload/uploadController.java @@ -54,7 +54,7 @@ public class uploadController { file.transferTo(file1); Map rMap = new HashMap<>(); rMap.put("msg", "上传成功"); - rMap.put("path", savePath + "/" + newName); + rMap.put("path", newName); return ResultVOUtils.success(rMap); } catch (IOException e) { e.printStackTrace(); From cba234ce106792be5fd1482b84be03e4ea6100f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=9B=E5=AE=87?= <2433098676@qq.com> Date: Tue, 25 Jul 2023 17:26:51 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=89=AB=E7=A0=81?= =?UTF-8?q?=E5=8D=95=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/controller/inout/IoOrderController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index dec6b676..72514068 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -226,6 +226,9 @@ public class IoOrderController extends BaseController { @Log(title = "单据管理", businessType = BusinessType.UPDATE) public BaseResponse submitCodes(@RequestBody AddOrderRequest addOrderRequest) { IoOrderEntity orderEntity = orderService.findByBillNo(addOrderRequest.getBillNo()); + if (StringUtils.isNotBlank(addOrderRequest.getRemark())) { + orderEntity.setRemark(addOrderRequest.getRemark()); + } BaseResponse tempResponse = checkSubmitEnable(orderEntity); if (tempResponse != null) return tempResponse; From 3b819eab23d4a4d525b19c48ad6216bdb27e958f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=9B=E5=AE=87?= <2433098676@qq.com> Date: Tue, 25 Jul 2023 18:04:56 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=8D=95=E5=A4=87=E6=B3=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/controller/inout/IoOrderController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index 72514068..76869205 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -185,6 +185,9 @@ public class IoOrderController extends BaseController { public BaseResponse submitBiz(@RequestBody AddOrderRequest addOrderRequest) { IoOrderEntity orderEntity = orderService.findByBillNo(addOrderRequest.getBillNo()); + if (StringUtils.isNotBlank(addOrderRequest.getRemark())) { + orderEntity.setRemark(addOrderRequest.getRemark()); + } BaseResponse tempResponse = checkSubmitEnable(orderEntity); if (tempResponse != null) return tempResponse; From d19f96d2cae36f7f08e73a9cd529238f34bbe0f7 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 26 Jul 2023 09:11:42 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E6=AF=94=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoCodeTempController.java | 17 +++- .../api/controller/inv/VailInvController.java | 89 +++++++++++++++++++ .../com/glxp/api/req/inv/ErrorMsgRequest.java | 8 ++ .../java/com/glxp/api/util/FileUtils.java | 22 +++++ src/main/resources/application-dev.yml | 3 +- src/main/resources/application-ljy.yml | 1 + src/main/resources/application-pro.yml | 1 + src/main/resources/application-test.yml | 1 + src/main/resources/application-wmd.yml | 1 + src/main/resources/application-wqq.yml | 1 + 10 files changed, 140 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/glxp/api/controller/inv/VailInvController.java create mode 100644 src/main/java/com/glxp/api/req/inv/ErrorMsgRequest.java 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 15d370b6..e90e4507 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -397,7 +397,6 @@ public class IoCodeTempController extends BaseController { //三期校验 if (bussinessTypeEntity.isCodeFillCheck()) { - BaseResponse checkOriginCodeRes = checkOriginCode(udiEntity); if (checkOriginCodeRes != null) { IoCodeLostEntity codeLostEntity = codeLostService.findByCode(code); @@ -415,7 +414,6 @@ public class IoCodeTempController extends BaseController { udiEntity.setExpireDate(codeLostEntity.getExpireDate()); udiEntity.setProduceDate(codeLostEntity.getProduceDate()); } - if (StrUtil.isNotEmpty(orderId)) { List ioCodeEnttities = codeTempService.findByOrderId(orderId); IoCodeTempEntity ioCodeEnttity = isExitLocal(code, ioCodeEnttities); @@ -425,6 +423,20 @@ public class IoCodeTempController extends BaseController { } else return checkOriginCodeRes; } + } else { + BaseResponse checkOriginCodeRes = checkOriginCode(udiEntity); + if (checkOriginCodeRes != null) { + IoCodeLostEntity codeLostEntity = codeLostService.findByCode(code); + if (codeLostEntity != null) { + udiEntity.setBatchNo(codeLostEntity.getBatchNo()); + udiEntity.setExpireDate(codeLostEntity.getExpireDate()); + udiEntity.setProduceDate(codeLostEntity.getProduceDate()); + checkOriginCodeRes = checkOriginCode(udiEntity); + if (checkOriginCodeRes != null) + return checkOriginCodeRes; + } else + return checkOriginCodeRes; + } } @@ -759,7 +771,6 @@ public class IoCodeTempController extends BaseController { } } - BaseResponse baseResponse = checkRelId(codeEnttity, unitFk); if (bussinessTypeEntity.getCheckCertExpire() == 2 && udiRelevanceResponse.isNeedCert()) { diff --git a/src/main/java/com/glxp/api/controller/inv/VailInvController.java b/src/main/java/com/glxp/api/controller/inv/VailInvController.java new file mode 100644 index 00000000..853e0be7 --- /dev/null +++ b/src/main/java/com/glxp/api/controller/inv/VailInvController.java @@ -0,0 +1,89 @@ +package com.glxp.api.controller.inv; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.req.inv.ErrorMsgRequest; +import com.glxp.api.req.inv.FilterInvPreProductRequest; +import com.glxp.api.req.inv.FilterInvPreinProductRequest; +import com.glxp.api.req.inv.FilterInvProductRequest; +import com.glxp.api.res.inv.InvPreProductResponse; +import com.glxp.api.res.inv.InvPreinProductResponse; +import com.glxp.api.res.inv.InvProductPageResponse; +import com.glxp.api.res.inv.InvProductResponse; +import com.glxp.api.service.inv.InvPreProductService; +import com.glxp.api.service.inv.InvPreinProductService; +import com.glxp.api.service.inv.InvProductService; +import com.glxp.api.util.FileUtils; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.io.IOException; +import java.util.List; + +/** + * 校验内外网库存接口 + */ +@RestController +public class VailInvController { + @Resource + private InvProductService invProductService; + @Resource + private InvPreinProductService invPreinProductService; + @Resource + private InvPreProductService invPreProductService; + + @Value("${err_path}") + String errPath; + + @AuthRuleAnnotation("") + @GetMapping("/spms/inv/product/vail") + public BaseResponse invProductVail(FilterInvProductRequest filterInvProductRequest) { + + List list = invProductService.filterListProduct(filterInvProductRequest); + PageInfo pageInfo = new PageInfo<>(list); + InvProductPageResponse pageResponse = new InvProductPageResponse(); + pageResponse.setList(pageInfo.getList()); + pageResponse.setTotal(pageInfo.getTotal()); + return ResultVOUtils.success(pageResponse); + } + + @AuthRuleAnnotation("") + @GetMapping("/spms/inv/pre/product/vail") + public BaseResponse invPreProductVail(FilterInvPreProductRequest filterInvProductRequest) { + + List list = invPreProductService.filterList(filterInvProductRequest); + PageInfo pageInfo = new PageInfo<>(list); + InvProductPageResponse pageResponse = new InvProductPageResponse(); + pageResponse.setList(pageInfo.getList()); + pageResponse.setTotal(pageInfo.getTotal()); + return ResultVOUtils.success(pageResponse); + } + + @AuthRuleAnnotation("") + @GetMapping("/spms/inv/preIn/product/vail") + public BaseResponse invPreInProductVail(FilterInvPreinProductRequest filterInvProductRequest) { + List list = invPreinProductService.filterList(filterInvProductRequest); + PageInfo pageInfo = new PageInfo<>(list); + InvProductPageResponse pageResponse = new InvProductPageResponse(); + pageResponse.setList(pageInfo.getList()); + pageResponse.setTotal(pageInfo.getTotal()); + return ResultVOUtils.success(pageResponse); + } + + @PostMapping("/spms/inv/vail/errMsg") + public void genErrorLog(@RequestBody ErrorMsgRequest errorMsgRequest) { + try { + FileUtils.writeFile(errPath, "库存校验-", errorMsgRequest.getErrMsg()); + } catch (IOException e) { + e.printStackTrace(); + } + } + + +} diff --git a/src/main/java/com/glxp/api/req/inv/ErrorMsgRequest.java b/src/main/java/com/glxp/api/req/inv/ErrorMsgRequest.java new file mode 100644 index 00000000..24f990dc --- /dev/null +++ b/src/main/java/com/glxp/api/req/inv/ErrorMsgRequest.java @@ -0,0 +1,8 @@ +package com.glxp.api.req.inv; + +import lombok.Data; + +@Data +public class ErrorMsgRequest { + String errMsg; +} diff --git a/src/main/java/com/glxp/api/util/FileUtils.java b/src/main/java/com/glxp/api/util/FileUtils.java index 42a57a17..dc27bf73 100644 --- a/src/main/java/com/glxp/api/util/FileUtils.java +++ b/src/main/java/com/glxp/api/util/FileUtils.java @@ -1,6 +1,8 @@ package com.glxp.api.util; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; +import org.apache.commons.beanutils.PropertyUtilsBean; import java.io.BufferedReader; import java.io.ByteArrayOutputStream; @@ -949,4 +951,24 @@ public class FileUtils { e.printStackTrace(); } } + + public static String writeFile(String filePath, String fileDesc, String content) throws IOException { + filePath = String.format("%s/%s", filePath, DateUtil.getDate()); + String fileFullPath = String.format("%s/%s-%s.udi", filePath, fileDesc, IdUtil.fastSimpleUUID()); + File file = new File(filePath); + if (!file.exists()) { + file.mkdirs(); + } + file = new File(fileFullPath); + while (!file.createNewFile()) { + fileFullPath = String.format("%s/%s/%s-%s.udi", filePath, DateUtil.getDate(), fileDesc, IdUtil.fastSimpleUUID()); + file = new File(fileFullPath); + } + + FileWriter fileWriter = new FileWriter(file); + fileWriter.write(content); + fileWriter.flush(); + fileWriter.close(); + return fileFullPath; + } } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 58b5a4cc..83193ca0 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -3,7 +3,7 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_spms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_spms_pt?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root password: 123456 hikari: @@ -45,6 +45,7 @@ logging: file_path: d:/udi/udiwms/udiwmsfile/ back_file_path: d:/share/udisps/back/ +err_path: d:/udi/udiwms/err/ UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs diff --git a/src/main/resources/application-ljy.yml b/src/main/resources/application-ljy.yml index 979afc6e..9b10f65b 100644 --- a/src/main/resources/application-ljy.yml +++ b/src/main/resources/application-ljy.yml @@ -45,6 +45,7 @@ logging: file_path: /udi/udiwms/udiwmsfile/ back_file_path: /share/udisps/back/ +err_path: d:/udi/udiwms/err/ UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml index ec925f6b..fbed1b88 100644 --- a/src/main/resources/application-pro.yml +++ b/src/main/resources/application-pro.yml @@ -45,6 +45,7 @@ logging: file_path: /udi/udiwms/udiwmsfile/ back_file_path: /share/udisps/back/ +err_path: /udi/udiwms/err/ UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index e8f08708..49c5d368 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -51,6 +51,7 @@ knife4j: file_path: /udi/udiwms/udiwmsfile/ back_file_path: /share/udisps/back/ +err_path: /udi/udiwms/err/ UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs diff --git a/src/main/resources/application-wmd.yml b/src/main/resources/application-wmd.yml index 979afc6e..99476e40 100644 --- a/src/main/resources/application-wmd.yml +++ b/src/main/resources/application-wmd.yml @@ -45,6 +45,7 @@ logging: file_path: /udi/udiwms/udiwmsfile/ back_file_path: /share/udisps/back/ +err_path: /udi/udiwms/err/ UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs diff --git a/src/main/resources/application-wqq.yml b/src/main/resources/application-wqq.yml index 75155880..cfc36f0e 100644 --- a/src/main/resources/application-wqq.yml +++ b/src/main/resources/application-wqq.yml @@ -45,6 +45,7 @@ logging: file_path: /udi/udiwms/udiwmsfile/ back_file_path: /share/udisps/back/ +err_path: /udi/udiwms/err/ UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs From b23d7397bbedb83c6012fe52d19a299a74e9829c Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 26 Jul 2023 09:32:13 +0800 Subject: [PATCH 11/11] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicBussinessTypeEntity.java | 18 +++++++++++++++- .../res/basic/BasicBussinessTypeResponse.java | 14 +++++++++++-- .../service/inout/IoCheckInoutService.java | 21 +++++++++++++++++++ src/main/resources/schemas/schema_v2.1.sql | 4 ++++ 4 files changed, 54 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java index 351bbc66..b30a6678 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java @@ -184,7 +184,6 @@ public class BasicBussinessTypeEntity { private String supplementOrderType; - /** * 平衡补单是否二次验收 */ @@ -280,6 +279,21 @@ public class BasicBussinessTypeEntity { */ @TableField(value = "checkCopy") private int checkCopy; + /** + * 单据验收补单 + */ + @TableField(value = "checkReview") + private int checkReview; + /** + * 是否二次校验单据验收补单 + */ + @TableField(value = "secCheckReview") + private boolean seccheckReview; + /** + * 是否核对单据验收补单 + */ + @TableField(value = "thrCheckReview") + private boolean thrCheckReview; /** * 是否二次校验复制单据 @@ -414,4 +428,6 @@ public class BasicBussinessTypeEntity { //是否按货位出库 0：不按货位出库，1:按货位出库 @TableField(value = "spaceOut") private int spaceOut; + + } diff --git a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java index ee21da29..30bcfb37 100644 --- a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java @@ -152,7 +152,17 @@ public class BasicBussinessTypeResponse { private String checkPreInOrders; private Boolean advancePreIn; private Integer sortNum; - - private int spaceOut; + /** + * 单据验收补单 + */ + private int checkReview; + /** + * 是否二次校验单据验收补单 + */ + private boolean seccheckReview; + /** + * 是否核对单据验收补单 + */ + private boolean thrCheckReview; } 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 6ef4c434..a2bb00fd 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -126,6 +126,10 @@ public class IoCheckInoutService { if (bussinessTypeEntity.getCheckCopy() == 0) { return false; } + } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_REVIEW) { + if (bussinessTypeEntity.getCheckReview() == 0) { + return false; + } } return true; } @@ -196,6 +200,11 @@ public class IoCheckInoutService { unCheckFirstFinish(orderEntity); return; } + } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_REVIEW) { + if (bussinessTypeEntity.getCheckReview() == 0) { + unCheckFirstFinish(orderEntity); + return; + } } checkFirstFinish(orderEntity); } @@ -218,6 +227,10 @@ public class IoCheckInoutService { codeLostEntity.setId(IdUtil.getSnowflakeNextId()); codeLostEntity.setNameCode(udiEntity.getUdi()); codeLostEntity.setCode(codeEntity.getCode()); + codeLostEntity.setBatchNo(codeEntity.getBatchNo()); + codeLostEntity.setProduceDate(codeEntity.getProduceDate()); + codeLostEntity.setExpireDate(codeEntity.getExpireDate()); + codeLostEntity.setSerialNo(codeEntity.getSerialNo()); } //校验是否写入缺失表 boolean isTrue = false; @@ -773,6 +786,10 @@ public class IoCheckInoutService { if (!bussinessTypeEntity.isThrCheckSp()) { orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_REW); } + } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_REVIEW) { + if (!bussinessTypeEntity.isThrCheckReview()) { + orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_REW); + } } } else { orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_REW); @@ -833,6 +850,10 @@ public class IoCheckInoutService { if (!bussinessTypeEntity.isSecCheckSp()) { orderEntity.setStatus(ConstantStatus.ORDER_STATUS_AUDITED); } + } else if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_REVIEW) { + if (!bussinessTypeEntity.isSeccheckReview()) { + orderEntity.setStatus(ConstantStatus.ORDER_STATUS_AUDITED); + } } } else { orderEntity.setStatus(ConstantStatus.ORDER_STATUS_AUDITED); diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql index ad3479f4..99b010f8 100644 --- a/src/main/resources/schemas/schema_v2.1.sql +++ b/src/main/resources/schemas/schema_v2.1.sql @@ -441,3 +441,7 @@ CALL Pro_Temp_ColumnWork('io_order', 'outSickInfo', 'varchar(255)', 1); CALL Pro_Temp_ColumnWork('inv_inner_order_detail', 'nameCode', 'varchar(255)', 1); CALL Pro_Temp_ColumnWork('inv_inner_order_detail', 'nameCode', 'varchar(255) ', 1); + +CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'checkReview', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'secCheckReview', 'tinyint', 1); +CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'thrCheckReview', 'tinyint', 1);