From f0788e40674ee3e1816e64c3521ac4362b6cbd6a Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 12 Jul 2023 16:28:07 +0800 Subject: [PATCH 1/2] =?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 --- .../controller/basic/UdiSyncController.java | 18 +++++++-------- .../inout/IoOrderReviewController.java | 23 +++++++++++++------ src/main/resources/application-dev.yml | 4 ++-- src/main/resources/application.yml | 2 +- 4 files changed, 27 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java b/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java index ea2531cc6..0f5f44180 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java @@ -56,7 +56,6 @@ public class UdiSyncController { BasicProductsDao basicProductsDao; - //获取同步库UDI信息 @AuthRuleAnnotation("") @GetMapping("udiwms/udiinfo/filterUdi") @@ -221,23 +220,22 @@ public class UdiSyncController { } - @GetMapping("udiwms/test") public void filterUdi() { - FilterUdiRelRequest filterUdiRelRequest=new FilterUdiRelRequest(); + FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); List data = basicProductsDao.selectList(); - int i=0; + int i = 0; try { for (BasicProductsEntity datum : data) { - if(StrUtil.isNotEmpty(datum.getCpmctymc()) && StrUtil.isEmpty(datum.getPinyinInitial()) && !datum.getCpmctymc().substring(0,1).equals("α")){ + if (StrUtil.isNotEmpty(datum.getCpmctymc()) && StrUtil.isEmpty(datum.getPinyinInitial()) && !datum.getCpmctymc().substring(0, 1).equals("α")) { i++; - String a=datum.getCpmctymc().substring(0,1); + String a = datum.getCpmctymc().substring(0, 1); datum.setPinyinInitial(converterToFirstSpell(datum.getCpmctymc())); - System.out.println("-----------------------------------------------------"+i); + System.out.println("-----------------------------------------------------" + i); } } - }catch (Exception e){ - System.out.println("|||||||||||||||||||||||"+e.getMessage()); + } catch (Exception e) { + System.out.println("|||||||||||||||||||||||" + e.getMessage()); } basicProductsDao.updateBatchById(data); } @@ -266,6 +264,7 @@ public class UdiSyncController { /** * 清理特殊字符以便得到 + * * @param chines * @return */ @@ -280,6 +279,5 @@ public class UdiSyncController { } - } diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java index d10621f7a..04bc9a923 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java @@ -39,6 +39,7 @@ import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.util.*; import com.glxp.api.util.udi.UdiCalCountUtil; import lombok.extern.slf4j.Slf4j; +import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -112,7 +113,6 @@ public class IoOrderReviewController extends BaseController { } - //前端二次审核 @AuthRuleAnnotation("") @PostMapping("/spms/inout/order/web/updateStatus") @@ -151,6 +151,7 @@ public class IoOrderReviewController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/spms/inout/order/third/updateStatus") @Log(title = "单据管理", businessType = BusinessType.UPDATE) + @Transactional(rollbackFor = Exception.class) public BaseResponse thirdUpdateStatus(@RequestBody ReviewFinishRequest updateExportStatusRequest, BindingResult bindingResult) { @@ -158,6 +159,12 @@ public class IoOrderReviewController extends BaseController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } IoOrderEntity orderEntity = orderService.findByBillNo(updateExportStatusRequest.getOrderId()); + if (updateExportStatusRequest.isEntrust()) { + EntrustReceEntity entrustReceEntity = entrustReceService.findByUnique(orderEntity.getAction(), getUserId()); + if (entrustReceEntity != null && StrUtil.isNotEmpty(entrustReceEntity.getEntrustAction())) { + transferOrder(orderEntity, entrustReceEntity); + } + } if (orderEntity == null) { return ResultVOUtils.error(500, "未找到该业务单据"); } @@ -444,6 +451,8 @@ public class IoOrderReviewController extends BaseController { redisUtil.del(ConstantStatus.REDIS_BILLNO_CODES + orderEntity.getBillNo()); //验收完成->进入流程 ioCheckInoutService.checkThird(orderEntity); + + return ResultVOUtils.success("更新成功"); } @@ -469,12 +478,12 @@ public class IoOrderReviewController extends BaseController { EntrustReceEntity entrustReceEntity; if (StrUtil.isNotEmpty(errMsg)) { if (errMsg.equals("委托验收")) { -// IoOrderEntity orderEntity = orderService.findByBillNo(billNo); -// entrustReceEntity = entrustReceService.findByUnique(orderEntity.getAction(), userId); -// if (entrustReceEntity != null) { -// acceptOrderEntity.setEntrust(true); -// } else -// return ResultVOUtils.error(500, "无权限验收！"); + IoOrderEntity orderEntity = orderService.findByBillNo(billNo); + entrustReceEntity = entrustReceService.findByUnique(orderEntity.getAction(), userId); + if (entrustReceEntity != null) { + acceptOrderEntity.setEntrust(true); + } +// else return ResultVOUtils.error(500, "无权限验收！"); } else return ResultVOUtils.error(500, errMsg); } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 4fbd4993a..b9dfaf4b8 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -4,9 +4,9 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_wms_pzh?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root - password: 123456 + password: Glxp@6066 hikari: connection-timeout: 60000 maximum-pool-size: 20 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index a4c7e80ec..80e18f1ee 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: test + active: dev jmx: enabled: false servlet: From b7c6ef8cc7b4be5e35c4ecb3eb822d0ea8a9fafc Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 12 Jul 2023 17:58:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A7=94=E6=89=98=E9=AA=8C=E6=94=B6?= =?UTF-8?q?=E4=B8=8D=E8=B0=83=E6=8B=A8=E5=85=A5=E5=BA=93=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/controller/inout/IoOrderReviewController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java index 04bc9a923..a12e1bc5f 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java @@ -324,7 +324,7 @@ public class IoOrderReviewController extends BaseController { supplementCode.setDeptCode(supplementOrder.getDeptCode()); supplementCode.setOrderId(supplementOrderNo); //查询补单设置 - supplementCode.setAction(bussinessTypeEntity.getSupplementOrderType()); + supplementCode.setAction(bussinessTypeEntity.getAction()); supplementCode.setMainAction(bussinessTypeEntity.getMainAction()); supplementCode.setId(null); supplementCodes.add(supplementCode);