From 4f22588cf80bf82a28d970364de1ca5d13349c52 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Fri, 25 Oct 2024 11:43:09 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E5=A4=9A=E7=A0=81=E8=9E=8D?= =?UTF-8?q?=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/UdiRelevanceController.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index 98a22a9db..a4e376351 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -421,15 +421,20 @@ public class UdiRelevanceController extends BaseController { try { CodeRel codeRel = new CodeRel(); - codeRel.setDiNameCode(udiProductEntity.getNameCode()); - codeRel.setYbbm(udiProductEntity.getYbbm()); - codeRel.setSptm(udiProductEntity.getSptm()); - codeRel.setTyshxyh(udiProductEntity.getTyshxydm()); + if(udiProductEntity.getProductsType() == null || udiProductEntity.getProductsType() == 1){ + codeRel.setDiNameCode(udiRelevanceSaveRequest.getNameCode()); + }else { + codeRel.setDrugCode(udiRelevanceSaveRequest.getNameCode()); + } + codeRel.setYbbm(udiRelevanceSaveRequest.getYbbm()); + codeRel.setSptm(udiRelevanceSaveRequest.getSptm()); + codeRel.setTyshxyh(udiRelevanceSaveRequest.getTyshxydm()); codeRel.setUpdateTime(new Date()); spsDirectClient.updateCodeRelDetail(codeRel); - } catch (Exception e) { - System.out.println("上传多码融合:" + e); + }catch (Exception e){ + System.out.println("上传多码融合:"+e); } + return ResultVOUtils.success("更新成功"); } From 906f15b300fb9ad0805c428f7f1857e818c4283b Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Fri, 25 Oct 2024 14:27:58 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E4=B8=8A=E4=BC=A0=E5=A4=9A?= =?UTF-8?q?=E7=A0=81=E8=9E=8D=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/UdiRelevanceController.java | 25 +++++++++++-------- .../api/service/basic/UdiProductService.java | 17 +++++++------ 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index a4e376351..66b6a81f8 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -1,6 +1,7 @@ package com.glxp.api.controller.basic; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.thread.ThreadUtil; import com.glxp.api.dao.basic.UdiRelevanceDao; import com.glxp.api.dto.DictDto; import com.glxp.api.entity.thrsys.CodeRel; @@ -420,17 +421,19 @@ public class UdiRelevanceController extends BaseController { udiProductService.updateLevelCount(udiRelevanceEntity); try { - CodeRel codeRel = new CodeRel(); - if(udiProductEntity.getProductsType() == null || udiProductEntity.getProductsType() == 1){ - codeRel.setDiNameCode(udiRelevanceSaveRequest.getNameCode()); - }else { - codeRel.setDrugCode(udiRelevanceSaveRequest.getNameCode()); - } - codeRel.setYbbm(udiRelevanceSaveRequest.getYbbm()); - codeRel.setSptm(udiRelevanceSaveRequest.getSptm()); - codeRel.setTyshxyh(udiRelevanceSaveRequest.getTyshxydm()); - codeRel.setUpdateTime(new Date()); - spsDirectClient.updateCodeRelDetail(codeRel); + ThreadUtil.execAsync(() -> { + CodeRel codeRel = new CodeRel(); + if(udiProductEntity.getProductsType() == null || udiProductEntity.getProductsType() == 1){ + codeRel.setDiNameCode(udiRelevanceSaveRequest.getNameCode()); + }else { + codeRel.setDrugCode(udiRelevanceSaveRequest.getNameCode()); + } + codeRel.setYbbm(udiRelevanceSaveRequest.getYbbm()); + codeRel.setSptm(udiRelevanceSaveRequest.getSptm()); + codeRel.setTyshxyh(udiRelevanceSaveRequest.getTyshxydm()); + codeRel.setUpdateTime(new Date()); + spsDirectClient.updateCodeRelDetail(codeRel); + }); }catch (Exception e){ System.out.println("上传多码融合:"+e); } diff --git a/src/main/java/com/glxp/api/service/basic/UdiProductService.java b/src/main/java/com/glxp/api/service/basic/UdiProductService.java index 47f85632a..d2080fac3 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiProductService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiProductService.java @@ -1,6 +1,7 @@ package com.glxp.api.service.basic; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -318,13 +319,15 @@ public class UdiProductService extends ServiceImpl { + CodeRel codeRel = new CodeRel(); + codeRel.setDrugCode(udiProductEntity.getNameCode()); + codeRel.setYbbm(udiProductEntity.getYbbm()); + codeRel.setSptm(udiProductEntity.getSptm()); + codeRel.setTyshxyh(udiProductEntity.getTyshxydm()); + codeRel.setUpdateTime(new Date()); + spsDirectClient.updateCodeRelDetail(codeRel); + }); } catch (Exception e) { System.out.println("上传多码融合:" + e); } From df185518ed500a72a42fce68ce25a1c10a0edaf8 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 25 Oct 2024 15:56:26 +0800 Subject: [PATCH 3/4] =?UTF-8?q?10/25=20bug=20=E4=BC=98=E5=8C=96=201.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/inout/IoCodeTempController.java | 10 ++++++++++ .../glxp/api/controller/inout/IoOrderController.java | 2 +- .../api/res/collect/CollectOrderCodeManResponse.java | 1 + .../service/collect/IoCollectOrderBackupService.java | 5 ++++- .../service/collect/IoCollectOrderCodeManService.java | 8 +++++--- .../mybatis/mapper/purchase/PurApplyDetailDao.xml | 2 +- 6 files changed, 22 insertions(+), 6 deletions(-) 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 f201eb940..a48418b91 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -869,6 +869,14 @@ public class IoCodeTempController extends BaseController { return ResultVOUtils.error(533, "扫码重复或当前追溯码已存在草稿单据中!"); } } + //校验工位库存 +// List codeTempEntities = codeTempService.findByOrderId(addOrderRequest.getBillNo()); +// for (IoCodeTempEntity codeTempEntity : codeTempEntities) { +// //校验工位库存 +// if (fifoCodeEntity.getTotalCount() < codeTempEntity.getReCount()){ +// return ResultVOUtils.error(500, "当前码库存不足!"); +// } +// } } //校验预验收是否已存在 if (bussinessTypeEntity.getActionType() == ConstantStatus.ACTION_TYPE_PREIN && bussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_PUT)) { @@ -1029,6 +1037,7 @@ public class IoCodeTempController extends BaseController { } } if (exitLocalEntity == null) { + UdiRelevanceResponse udiRelevanceResponse1 = udiRelevanceService.selectByNameCode(udiEntity.getUdi()); IoCodeTempEntity codeEnttity = new IoCodeTempEntity(); codeEnttity.setCode(code); codeEnttity.setOrderId(orderId); @@ -1051,6 +1060,7 @@ public class IoCodeTempController extends BaseController { codeEnttity.setRelId(addOrderRequest.getRelId()); codeEnttity.setFifoSplit(addOrderRequest.getFifoSplit()); codeEnttity.setCount(1); + codeEnttity.setPrice(udiRelevanceResponse1.getPrice()); String unitFk = null; if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) { unitFk = addOrderRequest.getFromCorp(); 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 21f485371..7266c8bf0 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -434,7 +434,7 @@ public class IoOrderController extends BaseController { } //校验工位库存 if (fifoCodeEntity.getTotalCount() < codeTempEntity.getReCount()){ - return ResultVOUtils.error(500, "当前码:库存不足!"); + return ResultVOUtils.error(500, "当前码:"+ fifoCodeEntity.getCode()+ "库存不足，请更改码明细!"); } } } diff --git a/src/main/java/com/glxp/api/res/collect/CollectOrderCodeManResponse.java b/src/main/java/com/glxp/api/res/collect/CollectOrderCodeManResponse.java index 069ac7f7b..8f27178fd 100644 --- a/src/main/java/com/glxp/api/res/collect/CollectOrderCodeManResponse.java +++ b/src/main/java/com/glxp/api/res/collect/CollectOrderCodeManResponse.java @@ -36,6 +36,7 @@ public class CollectOrderCodeManResponse { private String ggxh; private String batchNo; private Integer scanCount; + private Integer scanActCount; private String zczbhhzbapzbh; private String manufactory; private String productDate; diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java index b2d2c76b5..403714ffa 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java @@ -2,6 +2,7 @@ package com.glxp.api.service.collect; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; @@ -213,7 +214,9 @@ public class IoCollectOrderBackupService extends ServiceImpl stringBaseResponse = spGetHttp.reviewOrder(reviewFinishRequest, authAdmin.getId() + ""); + ThreadUtil.execAsync(() -> { + BaseResponse stringBaseResponse = spGetHttp.reviewOrder(reviewFinishRequest, authAdmin.getId() + ""); + }); } updateReview(authAdmin,orderEntity); } diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java index 2d8cf8233..83f62aad5 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java @@ -413,9 +413,10 @@ public class IoCollectOrderCodeManService extends ServiceImpl and (pur_apply.status = 3 or saf.status = 3) -# GROUP BY basic_products.uuid + GROUP BY basic_products.uuid From 67d6056b662ec8221361d8c5a111f6917d13ce6b Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Fri, 25 Oct 2024 18:07:56 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=20=E4=B8=8A=E4=BC=A0=E5=A4=9A?= =?UTF-8?q?=E7=A0=81=E8=9E=8D=E5=90=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/entity/thrsys/CodeRel.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/entity/thrsys/CodeRel.java b/src/main/java/com/glxp/api/entity/thrsys/CodeRel.java index 060ea406e..3bf6267c8 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/CodeRel.java +++ b/src/main/java/com/glxp/api/entity/thrsys/CodeRel.java @@ -73,8 +73,8 @@ public class CodeRel { @TableField(value = "createTime") public Date createTime; - @TableField(value = "fromtype") - public Integer fromtype; + @TableField(value = "fromType") + public Integer fromType; } \ No newline at end of file