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 cc3e654..27cf9f9 100644 --- a/src/main/java/com/glxp/mipsdl/client/njxyy/NjxyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/njxyy/NjxyyClient.java @@ -662,6 +662,7 @@ public class NjxyyClient extends CommonHttpClient { List codeRequestListYb = new ArrayList<>(); List codeRequestListJs = new ArrayList<>(); List codeRequestListYys = new ArrayList<>(); + String billNo = ""; for (ForInvOutScanCodeFilter.Highvalue highvalue : highvalues) { IoOrderCodeRequest codeRequest = new IoOrderCodeRequest(); codeRequest.setCode(highvalue.getUdicode()); @@ -695,6 +696,16 @@ public class NjxyyClient extends CommonHttpClient { } else if (codeRequest.getCount() > 0) { //收费入库 ioOrderRequest.setAction("SC20250702001"); + forInvOutScanCodeRequest.setCodeRequestList(codeRequestListYb); + forInvOutScanCodeRequest.setIoOrderRequest(ioOrderRequest); + String response = httpClient.postUDIWMSJson(thirdSysConfig.getPostInvOutScanCode(), forInvOutScanCodeRequest); + BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class); + if (baseResponse.getCode() == 20000){ + ForInvOutScanCodeResponse forInvOutScanCodeResponse = JSONObject.parseObject(String.valueOf(baseResponse.getData()), ForInvOutScanCodeResponse.class); + billNo = billNo + forInvOutScanCodeResponse.getBillNo() + ";"; + }else { + return baseResponse; + } } else { // //判断库存 // List codeEntities = codeDao.selectList(new LambdaQueryWrapper().eq(IoCodeEntity::getCode, codeRequest.getCode()).eq(IoCodeEntity::getAction, "SC20250702002")); @@ -732,58 +743,58 @@ public class NjxyyClient extends CommonHttpClient { codeRequestListJs.add(codeRequest); } } - } - String billNo = ""; - { - //收费退库 入账 - ioOrderRequest.setAction("SC20250702002"); - forInvOutScanCodeRequest.setCodeRequestList(codeRequestListYb); - forInvOutScanCodeRequest.setIoOrderRequest(ioOrderRequest); - String response = httpClient.postUDIWMSJson(thirdSysConfig.getPostInvOutScanCode(), forInvOutScanCodeRequest); - BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class); - if (baseResponse.getCode() == 20000){ - ForInvOutScanCodeResponse forInvOutScanCodeResponse = JSONObject.parseObject(String.valueOf(baseResponse.getData()), ForInvOutScanCodeResponse.class); - billNo = billNo + forInvOutScanCodeResponse.getBillNo() + ";"; - }else { - return baseResponse; + + { + //收费退库 入账 + ioOrderRequest.setAction("SC20250702002"); + forInvOutScanCodeRequest.setCodeRequestList(codeRequestListYb); + forInvOutScanCodeRequest.setIoOrderRequest(ioOrderRequest); + String response = httpClient.postUDIWMSJson(thirdSysConfig.getPostInvOutScanCode(), forInvOutScanCodeRequest); + BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class); + if (baseResponse.getCode() == 20000){ + ForInvOutScanCodeResponse forInvOutScanCodeResponse = JSONObject.parseObject(String.valueOf(baseResponse.getData()), ForInvOutScanCodeResponse.class); + billNo = billNo + forInvOutScanCodeResponse.getBillNo() + ";"; + }else { + return baseResponse; + } } - } - 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); - BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class); - if (baseResponse.getCode() == 20000){ - ForInvOutScanCodeResponse forInvOutScanCodeResponse = JSONObject.parseObject(String.valueOf(baseResponse.getData()), ForInvOutScanCodeResponse.class); - billNo = billNo + forInvOutScanCodeResponse.getBillNo(); - }else { - return baseResponse; + 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); + BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class); + if (baseResponse.getCode() == 20000){ + ForInvOutScanCodeResponse forInvOutScanCodeResponse = JSONObject.parseObject(String.valueOf(baseResponse.getData()), ForInvOutScanCodeResponse.class); + billNo = billNo + forInvOutScanCodeResponse.getBillNo(); + }else { + return baseResponse; + } } - } - 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); - BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class); - if (baseResponse.getCode() == 20000){ - ForInvOutScanCodeResponse forInvOutScanCodeResponse = JSONObject.parseObject(String.valueOf(baseResponse.getData()), ForInvOutScanCodeResponse.class); - billNo = billNo + forInvOutScanCodeResponse.getBillNo(); - }else { - return baseResponse; + 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); + BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class); + if (baseResponse.getCode() == 20000){ + ForInvOutScanCodeResponse forInvOutScanCodeResponse = JSONObject.parseObject(String.valueOf(baseResponse.getData()), ForInvOutScanCodeResponse.class); + billNo = billNo + forInvOutScanCodeResponse.getBillNo(); + }else { + return baseResponse; + } } }