From 7d7ac52514fac657377ae7814d0b933bb023b869 Mon Sep 17 00:00:00 2001 From: yewj Date: Tue, 22 Oct 2024 15:18:01 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=AB=E7=A0=81?= =?UTF-8?q?=E5=87=8F=E4=B8=80=E5=88=A0=E9=99=A4=EF=BC=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=89=AB=E7=A0=81=E6=95=B0=E9=87=8F=EF=BC=8C=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?PDA=E6=89=AB=E7=A0=81=E6=97=B6=E6=B5=81=E9=80=9A=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E4=BD=BF=E7=94=A8=E6=97=B6=E6=95=B0=E9=87=8F=E8=AE=A1?= =?UTF-8?q?=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoCodeTempController.java | 50 ++++++++++++++++--- 1 file changed, 42 insertions(+), 8 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 2c6eb2314..e163bc3b6 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -2055,7 +2055,11 @@ public class IoCodeTempController extends BaseController { if (codeTempEntity.getMyCount() > 1) { codeTempEntity.setCount(codeTempEntity.getMyCount() - 1); - codeTempEntity.setReCount(codeTempEntity.getMyReCount() - udiCalCountUtil.getActCount(bussinessTypeEntity, udiRelevanceResponses)); + if (bussinessTypeEntity.isUse()) { + codeTempEntity.setReCount(codeTempEntity.getMyReCount() - udiCalCountUtil.getUseActCount(udiRelevanceResponses)); + } else { + codeTempEntity.setReCount(codeTempEntity.getMyReCount() - udiCalCountUtil.getCirActCount(udiRelevanceResponses)); + } codeTempService.updateById(codeTempEntity); } else { codeTempService.deleteById(id); @@ -2069,7 +2073,16 @@ public class IoCodeTempController extends BaseController { int orderReCount = IntUtil.value(orderDetailCodeEntity.getReCount()); if (orderCount > 1) { orderDetailCodeEntity.setCount(orderCount - 1); - orderDetailCodeEntity.setReCount(orderReCount - udiCalCountUtil.getActCount(bussinessTypeEntity, udiRelevanceResponses)); + + + if (bussinessTypeEntity.isUse()) { + orderDetailCodeEntity.setReCount(orderReCount - udiCalCountUtil.getUseActCount(udiRelevanceResponses)); +// codeTempEntity.setReCount(codeTempEntity.getMyReCount() - udiCalCountUtil.getUseActCount(udiRelevanceResponses); + } else { + orderDetailCodeEntity.setReCount(orderReCount - udiCalCountUtil.getCirActCount(udiRelevanceResponses)); +// codeTempEntity.setReCount(codeTempEntity.getMyReCount() - udiCalCountUtil.getCirActCount(udiRelevanceResponses); + } + ioOrderDetailCodeService.update(orderDetailCodeEntity); } else { ioOrderDetailCodeService.deleteById(orderDetailCodeEntity.getId()); @@ -2133,9 +2146,16 @@ public class IoCodeTempController extends BaseController { } IoCodeTempEntity tempEntity = codeTempService.selectById(codeTempEntity.getId()); - codeTempEntity.setReCount(codeTempEntity.getReCount() * udiCalCountUtil.getActCount(codeTempEntity.getNameCode())); +// codeTempEntity.setReCount(codeTempEntity.getReCount() * udiCalCountUtil.getActCount(codeTempEntity.getNameCode())); + List udiRelevanceResponses = udiRelevanceService.selectGroupByNameCode(codeTempEntity.getNameCode(), null); + BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(codeTempEntity.getAction()); + if (bussinessTypeEntity.isUse()) { + codeTempEntity.setReCount(codeTempEntity.getMyCount() * udiCalCountUtil.getUseActCount(udiRelevanceResponses.get(0))); + } else { + codeTempEntity.setReCount(codeTempEntity.getMyCount() * udiCalCountUtil.getCirActCount(udiRelevanceResponses.get(0))); + } + codeTempService.updateById(codeTempEntity); - BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(tempEntity.getAction()); BaseResponse invRes = null; if (bussinessTypeEntity.isScanPreIn() && checkDiAttribute(bussinessTypeEntity, codeTempEntity.getRelId(), 2)) { //校验预验收库存 invRes = checkInvService.checkPreInInv(bussinessTypeEntity, codeTempEntity, true); @@ -2420,11 +2440,20 @@ public class IoCodeTempController extends BaseController { BeanUtils.copyProperties(exitLocalEntity, genDetaiEntity); genDetaiEntity.setCount(1); - genDetaiEntity.setReCount(udiCalCountUtil.getActCount(udiRelevanceResponses.get(0))); - exitLocalEntity.setCount(exitLocalEntity.getMyCount() + 1); - exitLocalEntity.setReCount(exitLocalEntity.getMyCount() * udiCalCountUtil.getActCount(udiRelevanceResponses.get(0))); + if (bussinessTypeEntity.isUse()) { + genDetaiEntity.setReCount(udiCalCountUtil.getUseActCount(udiRelevanceResponses.get(0))); + } else { + genDetaiEntity.setReCount(udiCalCountUtil.getCirActCount(udiRelevanceResponses.get(0))); + } + exitLocalEntity.setCount(exitLocalEntity.getMyCount() + 1); +// exitLocalEntity.setReCount(exitLocalEntity.getMyCount() * udiCalCountUtil.getActCount(udiRelevanceResponses.get(0))); + if (bussinessTypeEntity.isUse()) { + exitLocalEntity.setReCount(exitLocalEntity.getMyReCount() * udiCalCountUtil.getUseActCount(udiRelevanceResponses.get(0))); + } else { + exitLocalEntity.setReCount(exitLocalEntity.getMyReCount() * udiCalCountUtil.getCirActCount(udiRelevanceResponses.get(0))); + } if (!StringUtils.isBlank(exitLocalEntity.getSerialNo())) { return ResultVOUtils.error(500, "重复扫码！"); @@ -2517,7 +2546,12 @@ public class IoCodeTempController extends BaseController { // return ResultVOUtils.error(500, "当前上货只允许录入拆零产品！"); // } //计算实际数量 - codeEnttity.setReCount(IntUtil.value(codeEnttity.getMyReCount()) + udiCalCountUtil.getActCount(udiRelevanceResponse)); + if (bussinessTypeEntity.isUse()) { + codeEnttity.setReCount(codeEnttity.getMyReCount() * udiCalCountUtil.getUseActCount(udiRelevanceResponses.get(0))); + } else { + codeEnttity.setReCount(codeEnttity.getMyReCount() * udiCalCountUtil.getCirActCount(udiRelevanceResponses.get(0))); + } + } else if (udiRelevanceResponses.size() == 0) { if (unitFk == null) return ResultVOUtils.error(500, "耗材字典不存在此产品！"); From f23db0fe4a032b1f1c5bdd6b41aaf556cce91866 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 22 Oct 2024 17:03:27 +0800 Subject: [PATCH 2/5] =?UTF-8?q?10/22=20=E5=BA=93=E5=AD=98=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/UdiRelevanceController.java | 1 + .../IoCollectOrderBackupController.java | 6 +- .../collect/IoCollectOrderController.java | 2 +- .../api/entity/basic/BasicProductsEntity.java | 40 +++++++++++- .../req/basic/UdiRelevanceSaveRequest.java | 4 ++ .../collect/IoCollectOrderBackupService.java | 61 ++++++++++++++----- .../collect/IoCollectOrderService.java | 11 +++- .../service/inout/IoSplitFifoCodeService.java | 4 +- .../task/AsyncIoCollectOrderUploadTask.java | 2 +- .../mybatis/mapper/basic/UdiRelevanceDao.xml | 3 + .../collect/IoCollectOrderOriginMapper.xml | 3 +- 11 files changed, 109 insertions(+), 28 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 a2f1b5b40..9fdc417fd 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -365,6 +365,7 @@ public class UdiRelevanceController extends BaseController { // udiRelevanceEntity.setUseLevelDi(udiRelevanceSaveRequest.getUseLevelDi()); // udiRelevanceEntity.setUseLevelUnit(udiRelevanceSaveRequest.getUseLevelUnit()); udiRelevanceEntity.setUseLevel(udiRelevanceSaveRequest.getUseLevel()); + udiRelevanceEntity.setUnpackUseTime(udiRelevanceSaveRequest.getUnpackUseTime()); // udiRelevanceEntity.setDistributeLevelDi(udiRelevanceSaveRequest.getDistributeLevelDi()); // udiRelevanceEntity.setDistributeLevelUnit(udiRelevanceSaveRequest.getDistributeLevelUnit()); // udiRelevanceEntity.setDistributeLevelCount(udiRelevanceSaveRequest.getDistributeLevelCount()); diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java index 6eec2e828..f8f21cbe3 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java @@ -41,8 +41,8 @@ public class IoCollectOrderBackupController extends BaseController { private BasicCollectUserService basicCollectUserService; - @PostMapping("/udiwms/basic/collect/orderFinish/filter") - public BaseResponse filterOrder(@RequestBody CollectOrderRequest collectOrderRequest) { + @GetMapping("/udiwms/basic/collect/orderFinish/filter") + public BaseResponse filterOrder(CollectOrderRequest collectOrderRequest) { List workPlaceCodes = null; List page; @@ -97,7 +97,7 @@ public class IoCollectOrderBackupController extends BaseController { public BaseResponse orderUpload(@RequestBody CollectOrderRequest collectOrderRequest) { if (StrUtil.isEmpty(collectOrderRequest.getBillNo())) return ResultVOUtils.error(500, "单据号不能为空"); - Boolean aBoolean = ioCollectOrderBackupService.orderUpload(collectOrderRequest.getBillNo()); + Boolean aBoolean = ioCollectOrderBackupService.orderUpload(collectOrderRequest.getBillNo(),getUser()); if (!aBoolean) { return ResultVOUtils.error("上传失败"); } diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java index fcb412e17..18374a825 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java @@ -409,7 +409,7 @@ public class IoCollectOrderController extends BaseController { } } collectOrderRequest.setUpdateUser(getUserId()); - collectOrderService.finishOrder(collectOrderRequest); + collectOrderService.finishOrder(collectOrderRequest,getUser()); return ResultVOUtils.success(); } diff --git a/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java index df04706eb..6f6e4cad0 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java @@ -332,7 +332,7 @@ public class BasicProductsEntity { * 最後更新時間 */ @TableField(value = "updateTime") - private String updateTime; + private Date updateTime; /** * 创建人 @@ -502,16 +502,50 @@ public class BasicProductsEntity { @TableField(value = "pinyinInitial") private String pinyinInitial; - @TableField(value = "majorStatus") private String majorStatus; + @TableField(value = "zdcfsycs") + private Integer zdcfsycs; + + @TableField(value = "sfwblztlcp") + private String sfwblztlcp; + @TableField(value = "cgzmraqxgxx") + private String cgzmraqxgxx; + @TableField(value = "sfbjwycxsy") + private String sfbjwycxsy; + @TableField(value = "sfwwjbz") + private String sfwwjbz; + @TableField(value = "syqsfxyjxmj") + private String syqsfxyjxmj; + @TableField(value = "mjfs") + private String mjfs; + @TableField(value = "categoryName") + private String categoryName; + @TableField(value = "destinyType") + private Integer destinyType; + + /** + * 当前层级包含流通层级使用数量 + */ + @TableField(value = "bhltcjsl") + private Integer bhltcjsl; + + /** + * 当前层级包含使用层级数量 + */ + @TableField(value = "bhsycjsl") + private Integer bhsycjsl; //工位预警数量 @TableField(value = "workPlaceCount") private Integer workPlaceCount; - + /** + * 下级单位 + */ + @TableField(value = "xjdw") + private String xjdw; public static final String COL_ID = "id"; diff --git a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java index 834901f1e..238284ddf 100644 --- a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java +++ b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java @@ -169,6 +169,10 @@ public class UdiRelevanceSaveRequest { private Integer useLeverCount; private Integer useLevel; private Integer distributeLevel; + /** + * 拆包后可用时长(小时) + */ + private Integer unpackUseTime; //工位预警数 private Integer workPlaceCount; /** 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 e7fb8fbce..e40340eee 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java @@ -7,13 +7,17 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; +import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.dao.collect.IoCollectOrderBackupMapper; import com.glxp.api.dao.inout.IoCodeTempDao; +import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; +import com.glxp.api.entity.basic.EntrustReceEntity; import com.glxp.api.entity.basic.SysWorkplaceDocumentEntity; import com.glxp.api.entity.collect.*; import com.glxp.api.entity.inout.IoCodeTempEntity; @@ -24,19 +28,18 @@ import com.glxp.api.http.sync.SpGetHttpClient; import com.glxp.api.req.collect.CollectOrderBizRequest; import com.glxp.api.req.collect.CollectOrderRequest; import com.glxp.api.req.collect.PostCollectOrderRequest; +import com.glxp.api.req.inout.ReviewFinishRequest; import com.glxp.api.res.basic.BasicSkPrescribeResponse; import com.glxp.api.res.collect.CollectOrderBizResponse; import com.glxp.api.res.collect.IoCollectOrderResponse; +import com.glxp.api.service.auth.impl.AuthAdminServiceImpl; import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.basic.SysWorkplaceDocumentService; import com.glxp.api.service.basic.UdiRlSupService; import com.glxp.api.service.inout.IoAddInoutService; import com.glxp.api.service.inout.IoCheckInoutService; import com.glxp.api.service.inout.IoOrderService; -import com.glxp.api.util.CustomUtil; -import com.glxp.api.util.GennerOrderUtils; -import com.glxp.api.util.IntUtil; -import com.glxp.api.util.OrderNoTypeBean; +import com.glxp.api.util.*; import org.springframework.beans.BeanUtils; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -85,7 +88,12 @@ public class IoCollectOrderBackupService extends ServiceImpl filterList(CollectOrderRequest collectOrderRequest) { @@ -146,7 +154,7 @@ public class IoCollectOrderBackupService extends ServiceImpl进入流程 + ioCheckInoutService.checkSecond(orderEntity); + return ResultVOUtils.success("更新成功"); + } } diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java index 01063a24c..0608e6a7b 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java @@ -22,6 +22,7 @@ import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantType; import com.glxp.api.dao.collect.IoCollectOrderMapper; import com.glxp.api.dao.inout.IoCodeTempDao; +import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.DeptEntity; import com.glxp.api.entity.auth.SysWorkplace; import com.glxp.api.entity.basic.*; @@ -143,6 +144,12 @@ public class IoCollectOrderService extends ServiceImpl() .eq(IoSplitFifoCodeEntity::getCode, code) diff --git a/src/main/java/com/glxp/api/task/AsyncIoCollectOrderUploadTask.java b/src/main/java/com/glxp/api/task/AsyncIoCollectOrderUploadTask.java index a54a5c6d9..510094ceb 100644 --- a/src/main/java/com/glxp/api/task/AsyncIoCollectOrderUploadTask.java +++ b/src/main/java/com/glxp/api/task/AsyncIoCollectOrderUploadTask.java @@ -81,7 +81,7 @@ public class AsyncIoCollectOrderUploadTask implements SchedulingConfigurer { List orderResponses = ioCollectOrderBackupService.filterList(collectOrderRequest); if (CollUtil.isNotEmpty(orderResponses)){ orderResponses.forEach( item -> { - ioCollectOrderBackupService.orderUpload(item.getBillNo()); + ioCollectOrderBackupService.orderUpload(item.getBillNo(),null); }); } diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 2b1145d91..0edb69fb9 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -1540,6 +1540,9 @@ distributeLevel=#{distributeLevel}, + + unpackUseTime=#{unpackUseTime}, + WHERE id = #{id} diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml index 46746d48d..edd1d55c1 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml @@ -24,7 +24,7 @@ ico.fromCorpName, ico.tagMsg, sys_workplace_document.busName busTypeName, - thr_bustype_origin.name actionName, + COALESCE(thr_bustype_origin.name, basic_bussiness_type.name) as actionName, sw.workplaceName, ico.id, ico.orderTime, @@ -40,6 +40,7 @@ FROM io_collect_order_origin ico left join sys_workplace_document on ico.busType = sys_workplace_document.documentTypeCode left join thr_bustype_origin on sys_workplace_document.documentTypeCode = thr_bustype_origin.action + left join basic_bussiness_type on sys_workplace_document.documentTypeCode = basic_bussiness_type.action left join basic_corp bc on ico.fromCorp = bc.erpId left join sys_workplace sw on ico.workPlaceCode = sw.workplaceId From 9e318b8f8e9fd2d1995e79dcef7ddc73484f0346 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Tue, 22 Oct 2024 17:51:30 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B7=A5=E4=BD=8D?= =?UTF-8?q?=E5=BA=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoSplitFifoInvController.java | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoSplitFifoInvController.java b/src/main/java/com/glxp/api/controller/inout/IoSplitFifoInvController.java index 41ca7f480..5993c3641 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoSplitFifoInvController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoSplitFifoInvController.java @@ -1,15 +1,23 @@ package com.glxp.api.controller.inout; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.pagehelper.PageInfo; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; +import com.glxp.api.dao.basic.SysWorkplaceDocumentDao; +import com.glxp.api.entity.auth.SysWorkplace; +import com.glxp.api.entity.basic.SysWorkplaceDocumentEntity; +import com.glxp.api.entity.basic.SysWorkplacePutRel; import com.glxp.api.req.inout.IoSplitFifoInvRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.inout.IoSplitInvResponse; +import com.glxp.api.service.auth.SysWorkplaceService; +import com.glxp.api.service.basic.SysWorkplaceDocumentService; import com.glxp.api.service.inout.IoSplitFifoInvService; +import com.glxp.api.service.thrsys.SysWorkplacePutRelService; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; @@ -24,9 +32,12 @@ import java.util.List; @RestController public class IoSplitFifoInvController extends BaseController { - + @Resource + SysWorkplaceService sysWorkplaceService; @Resource IoSplitFifoInvService splitFifoInvService; + @Resource + SysWorkplacePutRelService sysWorkplacePutRelService; /** * 库存查询 @@ -39,6 +50,16 @@ public class IoSplitFifoInvController extends BaseController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } + + //判断是否为采集工位 + Long workPlaceCode = ioSplitFifoInvRequest.getWorkPlaceCode(); + SysWorkplace workplace = sysWorkplaceService.getWorkplace(workPlaceCode); + Integer workPlaceClass = workplace.getWorkPlaceClass(); + if (workPlaceClass == 1){ + SysWorkplacePutRel putWorkPlace = sysWorkplacePutRelService.findPutWorkPlace(workPlaceCode, null); + ioSplitFifoInvRequest.setWorkPlaceCode(putWorkPlace.getWorkPlaceCode()); + } + List splitCodeEntities = splitFifoInvService.filterList(ioSplitFifoInvRequest); for (IoSplitInvResponse ioSplitCodeResponse : splitCodeEntities) { if (StrUtil.isEmpty(ioSplitCodeResponse.getGgxh())) { From 0b10eb6610b9d030ad351170124d3524e99d8b27 Mon Sep 17 00:00:00 2001 From: yewj Date: Tue, 22 Oct 2024 17:52:54 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collect/IoCollectOrderBackupController.java | 7 ++++--- .../api/service/thrsys/SysWorkplacePutRelService.java | 8 +++++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java index f8f21cbe3..59cffeab6 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java @@ -41,8 +41,8 @@ public class IoCollectOrderBackupController extends BaseController { private BasicCollectUserService basicCollectUserService; - @GetMapping("/udiwms/basic/collect/orderFinish/filter") - public BaseResponse filterOrder(CollectOrderRequest collectOrderRequest) { + @PostMapping("/udiwms/basic/collect/orderFinish/filter") + public BaseResponse filterOrder(@RequestBody CollectOrderRequest collectOrderRequest) { List workPlaceCodes = null; List page; @@ -97,7 +97,7 @@ public class IoCollectOrderBackupController extends BaseController { public BaseResponse orderUpload(@RequestBody CollectOrderRequest collectOrderRequest) { if (StrUtil.isEmpty(collectOrderRequest.getBillNo())) return ResultVOUtils.error(500, "单据号不能为空"); - Boolean aBoolean = ioCollectOrderBackupService.orderUpload(collectOrderRequest.getBillNo(),getUser()); + Boolean aBoolean = ioCollectOrderBackupService.orderUpload(collectOrderRequest.getBillNo(), getUser()); if (!aBoolean) { return ResultVOUtils.error("上传失败"); } @@ -107,6 +107,7 @@ public class IoCollectOrderBackupController extends BaseController { /** * 通过业务外键获取码明细 + * * @param collectOrderBizRequest * @return */ diff --git a/src/main/java/com/glxp/api/service/thrsys/SysWorkplacePutRelService.java b/src/main/java/com/glxp/api/service/thrsys/SysWorkplacePutRelService.java index ebac573a4..686bd3f04 100644 --- a/src/main/java/com/glxp/api/service/thrsys/SysWorkplacePutRelService.java +++ b/src/main/java/com/glxp/api/service/thrsys/SysWorkplacePutRelService.java @@ -25,7 +25,13 @@ public class SysWorkplacePutRelService extends ServiceImpl sysWorkplacePutRelList = list(new LambdaQueryWrapper().eq(SysWorkplacePutRel::getCollectWorkCode, workPlaceCode).eq(busType != null, SysWorkplacePutRel::getCollectBusType, busType)); if (CollUtil.isNotEmpty(sysWorkplacePutRelList)) From 3021ca2d16d7aa9d93a0cff83ca79961ca546a7e Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 22 Oct 2024 18:07:15 +0800 Subject: [PATCH 5/5] =?UTF-8?q?10/22=20=E4=BC=98=E5=8C=961.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/service/collect/IoCollectOrderBackupService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e40340eee..b2d2c76b5 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java @@ -213,7 +213,7 @@ public class IoCollectOrderBackupService extends ServiceImpl stringBaseResponse = spGetHttp.reviewOrder(reviewFinishRequest, authAdmin.getId() + ""); } updateReview(authAdmin,orderEntity); }