From dc2ecb90c436ac11b42a3d447184ee1155c10652 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Wed, 11 Dec 2024 11:46:51 +0800 Subject: [PATCH] feat: nj --- .../glxp/mipsdl/client/njxyy/NjxyyClient.java | 74 +++++++++++-------- 1 file changed, 42 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/glxp/mipsdl/client/njxyy/NjxyyClient.java b/src/main/java/com/glxp/mipsdl/client/njxyy/NjxyyClient.java index cac9423..cc3e654 100644 --- a/src/main/java/com/glxp/mipsdl/client/njxyy/NjxyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/njxyy/NjxyyClient.java @@ -24,6 +24,7 @@ import com.glxp.mipsdl.dao.auth.AuthWarehouseDao; import com.glxp.mipsdl.dao.basic.BasicBussinessTypeDao; import com.glxp.mipsdl.dao.basic.BasicCorpDao; import com.glxp.mipsdl.dao.basic.BasicUdirelDao; +import com.glxp.mipsdl.dao.basic.UdiRlSupDao; import com.glxp.mipsdl.dao.inout.IoCodeDao; import com.glxp.mipsdl.dao.inout.IoOrderDao; import com.glxp.mipsdl.dao.inout.IoOrderDetailBizDao; @@ -111,6 +112,8 @@ public class NjxyyClient extends CommonHttpClient { @Resource private BasicUdirelDao basicUdirelDao; @Resource + private UdiRlSupDao udiRlSupDao; + @Resource ThrProductsDao thrProductsDao; @Resource private OrderUploadLogService orderUploadLogService; @@ -678,6 +681,9 @@ public class NjxyyClient extends CommonHttpClient { } BasicUdirelEntity udirelEntity = basicUdirelDao.selectByNameCode(udiEntity.getUdi()); + CompanyProductRelevanceRequest companyProductRelevanceRequest = new CompanyProductRelevanceRequest(); + companyProductRelevanceRequest.setUuid(udirelEntity.getUuid()); + List udiRlSupResponses = udiRlSupDao.filterUdiGp(companyProductRelevanceRequest); if (udirelEntity == null) { return ResultVOUtils.error(500, "耗材字典未对照！"); } @@ -690,45 +696,39 @@ public class NjxyyClient extends CommonHttpClient { //收费入库 ioOrderRequest.setAction("SC20250702001"); } else { - - if (IntUtil.value(udirelEntity.getPurType()) == 1) { - //收费退库 入账 - ioOrderRequest.setAction("SC20250702002"); - //判断库存 - List codeEntities = codeDao.selectList(new LambdaQueryWrapper().eq(IoCodeEntity::getCode, codeRequest.getCode()).eq(IoCodeEntity::getAction, "SC20250702002")); - if (CollUtil.isEmpty(codeEntities)) { - codeEntities = codeDao.selectList(new LambdaQueryWrapper().eq(IoCodeEntity::getErrUdiCode, codeRequest.getCode()).eq(IoCodeEntity::getAction, "SC20250702002")); - if (CollUtil.isEmpty(codeEntities)) { - return ResultVOUtils.error(500, "该UDI码未出库！"); - } - } +// //判断库存 +// List codeEntities = codeDao.selectList(new LambdaQueryWrapper().eq(IoCodeEntity::getCode, codeRequest.getCode()).eq(IoCodeEntity::getAction, "SC20250702002")); +// if (CollUtil.isEmpty(codeEntities)) { +// codeEntities = codeDao.selectList(new LambdaQueryWrapper().eq(IoCodeEntity::getErrUdiCode, codeRequest.getCode()).eq(IoCodeEntity::getAction, "SC20250702002")); +// if (CollUtil.isEmpty(codeEntities)) { +// return ResultVOUtils.error(500, "该UDI码未出库！"); +// } +// } codeRequestListYb.add(codeRequest); - - } else if (IntUtil.value(udirelEntity.getPurType()) == 2) { - //收费退库 预验收 - ioOrderRequest.setAction("SC70927695263969"); - //判断库存 - List codeEntities = codeDao.selectList(new LambdaQueryWrapper().eq(IoCodeEntity::getCode, codeRequest.getCode()).eq(IoCodeEntity::getAction, "SC70927695263969")); - if (CollUtil.isEmpty(codeEntities)) { - codeEntities = codeDao.selectList(new LambdaQueryWrapper().eq(IoCodeEntity::getErrUdiCode, codeRequest.getCode()).eq(IoCodeEntity::getAction, "SC70927695263969")); - if (CollUtil.isEmpty(codeEntities)) { - return ResultVOUtils.error(500, "该UDI码未出库！"); + if (IntUtil.value(udirelEntity.getPurType()) == 2) { + if (CollUtil.isNotEmpty(udiRlSupResponses)){ + long customerId = udiRlSupResponses.get(0).getCustomerId(); + if(customerId != 0l){ + codeRequest.setSupId(String.valueOf(customerId)); + }else { + return ResultVOUtils.error(500, "预验收产品供应商ID未维护！"); } + + }else { + return ResultVOUtils.error(500, "预验收产品供应商ID为找到！"); } codeRequestListYys.add(codeRequest); - } else if (IntUtil.value(udirelEntity.getPurType()) == 3) { - //收费退库 寄售 - ioOrderRequest.setAction("SC70927877557094"); - //判断库存 - List codeEntities = codeDao.selectList(new LambdaQueryWrapper().eq(IoCodeEntity::getCode, codeRequest.getCode()).eq(IoCodeEntity::getAction, "SC70927877557094")); - if (CollUtil.isEmpty(codeEntities)) { - codeEntities = codeDao.selectList(new LambdaQueryWrapper().eq(IoCodeEntity::getErrUdiCode, codeRequest.getCode()).eq(IoCodeEntity::getAction, "SC70927877557094")); - if (CollUtil.isEmpty(codeEntities)) { - return ResultVOUtils.error(500, "该UDI码未出库！"); + if (CollUtil.isNotEmpty(udiRlSupResponses)){ + long customerId = udiRlSupResponses.get(0).getCustomerId(); + if(customerId != 0l){ + codeRequest.setSupId(String.valueOf(customerId)); + }else { + return ResultVOUtils.error(500, "预验收产品供应商ID未维护！"); } + }else { + return ResultVOUtils.error(500, "寄售产品供应商ID为找到！"); } - codeRequestListJs.add(codeRequest); } } @@ -736,6 +736,8 @@ public class NjxyyClient extends CommonHttpClient { String billNo = ""; { + //收费退库 入账 + ioOrderRequest.setAction("SC20250702002"); forInvOutScanCodeRequest.setCodeRequestList(codeRequestListYb); forInvOutScanCodeRequest.setIoOrderRequest(ioOrderRequest); String response = httpClient.postUDIWMSJson(thirdSysConfig.getPostInvOutScanCode(), forInvOutScanCodeRequest); @@ -750,7 +752,11 @@ public class NjxyyClient extends CommonHttpClient { if (CollUtil.isNotEmpty(codeRequestListYys)){ + //收费退库 预验收 + ioOrderRequest.setAction("SC70927695263969"); ioOrderRequest.setInvCode("1000001"); + + ioOrderRequest.setFromCorp(codeRequestListYys.get(0).getSupId()); forInvOutScanCodeRequest.setCodeRequestList(codeRequestListYys); forInvOutScanCodeRequest.setIoOrderRequest(ioOrderRequest); String response = httpClient.postUDIWMSJson(thirdSysConfig.getPostInvOutScanCode(), forInvOutScanCodeRequest); @@ -764,7 +770,11 @@ public class NjxyyClient extends CommonHttpClient { } if (CollUtil.isNotEmpty(codeRequestListJs)){ + //收费退库 寄售 + ioOrderRequest.setAction("SC70927877557094"); ioOrderRequest.setInvCode("1000002"); + + ioOrderRequest.setFromCorp(codeRequestListJs.get(0).getSupId()); forInvOutScanCodeRequest.setCodeRequestList(codeRequestListJs); forInvOutScanCodeRequest.setIoOrderRequest(ioOrderRequest); String response = httpClient.postUDIWMSJson(thirdSysConfig.getPostInvOutScanCode(), forInvOutScanCodeRequest);