diff --git a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java index eb21e67d5..a83c371ac 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java @@ -299,4 +299,26 @@ public class SysWorkplaceController extends BaseController { } return ResultVOUtils.success("更新成功"); } + + + @PostMapping("/udiwms/sysWorkplace/getListByBusType") + public BaseResponse getListByBusType(@RequestBody SysWorkplaceRequest request) { +// Page page = sysWorkplaceService.page(new Page<>(request.getPage(), request.getLimit()), Wrappers.lambdaQuery(SystemWorkplace.class) +// .eq(StrUtil.isNotBlank(request.getInvCode()),SystemWorkplace::getInvCode,request.getInvCode()) +// .like(StrUtil.isNotBlank(request.getKey()),SystemWorkplace::getWorkplaceId,request.getKey()) +// .or() +// .like(StrUtil.isNotBlank(request.getKey()),SystemWorkplace::getWorkplaceName,request.getKey()) +// ); + request.setUserId(getUserId() + ""); + DeptEntity deptEntity = deptService.selectByCode(request.getDeptCode()); + if (deptEntity.getPid() == 0){ + request.setDeptCode(null); + } + List page = sysWorkplaceService.getListByBusType(request); + PageInfo pageInfo = new PageInfo<>(page); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(page); + return ResultVOUtils.success(pageSimpleResponse); + } } 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 cf46cd435..d6625982f 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderBackupController.java @@ -96,7 +96,10 @@ public class IoCollectOrderBackupController extends BaseController { public BaseResponse orderUpload(@RequestBody CollectOrderRequest collectOrderRequest) { if (StrUtil.isEmpty(collectOrderRequest.getBillNo())) return ResultVOUtils.error(500, "单据号不能为空"); - ioCollectOrderBackupService.orderUpload(collectOrderRequest.getBillNo()); + Boolean aBoolean = ioCollectOrderBackupService.orderUpload(collectOrderRequest.getBillNo()); + if (!aBoolean){ + return ResultVOUtils.error("上传失败"); + } return ResultVOUtils.success(); } 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 1091cd2a8..4b597d430 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java @@ -82,7 +82,7 @@ public class IoCollectOrderController extends BaseController { request.setLimit(100); request.setUserId(userId.toString()); page = basicCollectUserService.filterList(request); - if (page != null) { + if (page != null && page.size() > 0) { workPlaceCodes = page.stream() .map(UserWorkResponse::getWorkplaceId) .collect(Collectors.toList()); 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 6515b47a4..b94319619 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -10,14 +10,13 @@ import com.glxp.api.entity.collect.IoCollectOrder; import com.glxp.api.entity.collect.IoCollectOrderOrigin; import com.glxp.api.entity.inv.InvProductDetailEntity; import com.glxp.api.exception.JsonException; +import com.glxp.api.req.collect.CollectOrderBizRequest; import com.glxp.api.req.collect.CollectOrderRequest; +import com.glxp.api.res.collect.CollectOrderBizResponse; import com.glxp.api.res.collect.IoCollectOrderResponse; import com.glxp.api.res.inout.IoOrderDetailCodeResponse; import com.glxp.api.res.inout.VailCodeResultResponse; -import com.glxp.api.service.collect.IoCollectCodeService; -import com.glxp.api.service.collect.IoCollectOrderBizBackupService; -import com.glxp.api.service.collect.IoCollectOrderService; -import com.glxp.api.service.collect.IoCollectOriginService; +import com.glxp.api.service.collect.*; import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.service.inv.impl.InvProductDetailService; import org.aspectj.weaver.ast.Var; @@ -117,6 +116,9 @@ public class IoCodeTempController extends BaseController { @Resource IoSplitFifoInvService ioSplitFifoInvService; + @Resource + IoCollectOrderBackupService ioCollectOrderBackupService; + /** * PDA-----单据上传 */ @@ -319,7 +321,7 @@ public class IoCodeTempController extends BaseController { UdiRelevanceResponse checkUdi = udiRelevanceService.selectByNameCode(udiEntity.getUdi()); if (checkUdi == null) { - return ResultVOUtils.error(500, "产品字典不存在此产品！"); + return ResultVOUtils.error(500, "耗材字典不存在此产品！"); } boolean checkSuccess = true; String lostMsg = ""; @@ -682,6 +684,7 @@ public class IoCodeTempController extends BaseController { } + String orderId = addOrderRequest.getBillNo(); //三期校验 @@ -804,6 +807,24 @@ public class IoCodeTempController extends BaseController { } + //校验码表是否已经存在追溯码 io_code_temp + IoCodeTempEntity codeTempEntity1 = codeTempService.selectByCode(code,udiEntity.getBatchNo(),bussinessTypeEntity.getAction()); + if (codeTempEntity1 != null){ + return ResultVOUtils.error(533,"扫码重复或当前追溯码已存在草稿单据中!"); + } + //校验工位存量是否存在 + if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_OUT)) { + IoSplitFifoCodeEntity fifoCodeEntity = fifoCodeService.findByCode(code, addOrderRequest.getWorkPlaceCode()); + if (fifoCodeEntity != null && StrUtil.isNotEmpty(fifoCodeEntity.getSerialNo())) { + return ResultVOUtils.error(533, "当前追溯码已存在！"); + } + } else { + + IoSplitFifoCodeEntity fifoCodeEntity = fifoCodeService.findByCode(code, addOrderRequest.getWorkPlaceCode()); + if (fifoCodeEntity == null) { + return ResultVOUtils.error(500, "当前追溯码未上货！"); + } + } //校验预验收是否已存在 if (bussinessTypeEntity.getActionType() == ConstantStatus.ACTION_TYPE_PREIN && bussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_PUT)) { if (StrUtil.isNotEmpty(udiEntity.getSerialNo())) { @@ -851,14 +872,6 @@ public class IoCodeTempController extends BaseController { addOrderRequest.setFromCorp(fromCorp); } - //校验工位存量是否存在 - if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_OUT)) { - IoSplitFifoCodeEntity fifoCodeEntity = fifoCodeService.findByCode(code, null); - if (fifoCodeEntity != null && StrUtil.isNotEmpty(fifoCodeEntity.getSerialNo())) { - return ResultVOUtils.error(500, "当前追溯码已存在！"); - } - } - //先生成扫码单据 IoOrderEntity orderEntity = orderService.findByBillNo(orderId); @@ -1291,14 +1304,13 @@ public class IoCodeTempController extends BaseController { } - + //校验码表是否已经存在追溯码 io_code_temp + IoCodeTempEntity codeTempEntity = codeTempService.selectByCode(code,udiEntity.getBatchNo(),bussinessTypeEntity.getAction()); + if (codeTempEntity != null){ + return ResultVOUtils.error(533,"扫码重复或当前追溯码已存在草稿单据中!"); + } //校验工位存量是否存在 if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_OUT)) { - //校验码表是否已经存在追溯码 io_code_temp - IoCodeTempEntity codeTempEntity = codeTempService.selectByCode(code,udiEntity.getBatchNo()); - if (codeTempEntity != null){ - return ResultVOUtils.error(533,"当前追溯码已存在草稿单据中!"); - } IoSplitFifoCodeEntity fifoCodeEntity = fifoCodeService.findByCode(code, addOrderRequest.getWorkPlaceCode()); if (fifoCodeEntity != null && StrUtil.isNotEmpty(fifoCodeEntity.getSerialNo())) { return ResultVOUtils.error(533, "当前追溯码已存在！"); @@ -1309,10 +1321,6 @@ public class IoCodeTempController extends BaseController { if (fifoCodeEntity == null) { return ResultVOUtils.error(500, "当前追溯码未上货！"); } - IoCodeTempEntity codeTempEntity = codeTempService.selectByCode(code,udiEntity.getBatchNo()); - if (codeTempEntity != null){ - return ResultVOUtils.error(533,"当前追溯码已存在草稿单据中!"); - } } @@ -2612,11 +2620,14 @@ public class IoCodeTempController extends BaseController { } String orderFinishBillNo = addOrderCodeRequest.getOrderFinishBillNo(); - List list = ioCollectCodeService.list(new LambdaUpdateWrapper().eq(IoCollectCode::getBillNo, orderFinishBillNo)); - if (CollUtil.isEmpty(list)) return ResultVOUtils.error(500, "未找到已完成单的码明细"); +// List list = ioCollectCodeService.list(new LambdaUpdateWrapper().eq(IoCollectCode::getBillNo, orderFinishBillNo)); + CollectOrderBizRequest collectOrderBizRequest = new CollectOrderBizRequest(); + collectOrderBizRequest.setOrderIdFk(orderFinishBillNo); + List collectOrderBizResponses = ioCollectOrderBackupService.combieOrderDetail(collectOrderBizRequest); + if (CollUtil.isEmpty(collectOrderBizResponses)) return ResultVOUtils.error(500, "未找到已完成单的码明细"); List codeList = new ArrayList<>(); - list.forEach(item -> { - String code = item.getCode(); + collectOrderBizResponses.forEach(item -> { + String code = item.getFinishUdiCode(); Integer reCountObj = item.getScanCount(); int reCount = reCountObj != null ? reCountObj : 0; // 如果reCountObj为null，则默认为0次迭代 for (int i = 0; i < reCount; i++) { diff --git a/src/main/java/com/glxp/api/dao/auth/SysWorkplaceDao.java b/src/main/java/com/glxp/api/dao/auth/SysWorkplaceDao.java index cfff96b79..3fd715508 100644 --- a/src/main/java/com/glxp/api/dao/auth/SysWorkplaceDao.java +++ b/src/main/java/com/glxp/api/dao/auth/SysWorkplaceDao.java @@ -23,4 +23,5 @@ public interface SysWorkplaceDao extends BaseMapper { List getAllByBusType(String busTypeCode); + List getListByBusType(@Param("request") SysWorkplaceRequest request); } diff --git a/src/main/java/com/glxp/api/req/auth/SysWorkplaceRequest.java b/src/main/java/com/glxp/api/req/auth/SysWorkplaceRequest.java index d9d327a52..421a5b7cf 100644 --- a/src/main/java/com/glxp/api/req/auth/SysWorkplaceRequest.java +++ b/src/main/java/com/glxp/api/req/auth/SysWorkplaceRequest.java @@ -30,6 +30,8 @@ public class SysWorkplaceRequest extends ListPageRequest { private List workPlaceIds; private String chargeUser; + private String userId; + private String busType; private Boolean userIdFlag; diff --git a/src/main/java/com/glxp/api/service/auth/SysWorkplaceService.java b/src/main/java/com/glxp/api/service/auth/SysWorkplaceService.java index a46e18705..96eb7a248 100644 --- a/src/main/java/com/glxp/api/service/auth/SysWorkplaceService.java +++ b/src/main/java/com/glxp/api/service/auth/SysWorkplaceService.java @@ -81,4 +81,15 @@ public class SysWorkplaceService extends ServiceImpl getListByBusType(SysWorkplaceRequest request) { + if (null == request) { + return Collections.emptyList(); + } + if (null != request.getPage() && null != request.getLimit()) { + PageHelper.offsetPage((request.getPage() - 1) * request.getLimit(), request.getLimit()); + } + List page = super.baseMapper.getListByBusType(request); + return page; + } } 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 73cee8413..caeee8dea 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java @@ -273,7 +273,7 @@ public class IoCollectOrderBackupService extends ServiceImpl ew = new QueryWrapper<>(); ew.eq("code",code); ew.eq(StrUtil.isNotEmpty(batchNo), "batchNo", batchNo); + ew.eq(StrUtil.isNotEmpty(action), "action", action); return ioCodeTempDao.selectOne(ew); } diff --git a/src/main/resources/mybatis/mapper/auth/SysWorkplaceDao.xml b/src/main/resources/mybatis/mapper/auth/SysWorkplaceDao.xml index f2726119e..48b7e1957 100644 --- a/src/main/resources/mybatis/mapper/auth/SysWorkplaceDao.xml +++ b/src/main/resources/mybatis/mapper/auth/SysWorkplaceDao.xml @@ -60,4 +60,56 @@ GROUP BY sys_workplace.workplaceId +