diff --git a/src/main/java/com/glxp/mipsdl/client/axxyy/AxxyyClient.java b/src/main/java/com/glxp/mipsdl/client/axxyy/AxxyyClient.java index b9f1154..2be2784 100644 --- a/src/main/java/com/glxp/mipsdl/client/axxyy/AxxyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/axxyy/AxxyyClient.java @@ -711,7 +711,7 @@ public class AxxyyClient extends CommonHttpClient { // return ResultVOUtils.error(500, "该UDI码未出库!"); // } // } - codeRequestListYb.add(codeRequest); + codeRequestListYb.add(codeRequest); if (IntUtil.value(udirelEntity.getPurType()) == 2) { if (CollUtil.isNotEmpty(udiRlSupResponses)){ long customerId = udiRlSupResponses.get(0).getCustomerId(); @@ -741,58 +741,58 @@ public class AxxyyClient extends CommonHttpClient { - { - //收费退库 入账 - 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("SC73399619155911"); - ioOrderRequest.setInvCode("1000001"); + if (CollUtil.isNotEmpty(codeRequestListYys)){ + //收费退库 预验收 + ioOrderRequest.setAction("SC73399619155911"); + 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; + 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("SC73399555402219"); - 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("SC73399555402219"); + 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; + } } } - } } return ResultVOUtils.success(billNo); diff --git a/src/main/java/com/glxp/mipsdl/controller/ExAxxyyController.java b/src/main/java/com/glxp/mipsdl/controller/ExAxxyyController.java index 8fc4cec..e804d02 100644 --- a/src/main/java/com/glxp/mipsdl/controller/ExAxxyyController.java +++ b/src/main/java/com/glxp/mipsdl/controller/ExAxxyyController.java @@ -9,6 +9,7 @@ import com.glxp.mipsdl.dao.auth.AuthWarehouseDao; import com.glxp.mipsdl.dao.basic.BasicUdirelDao; import com.glxp.mipsdl.entity.auth.AuthWarehouseEntity; import com.glxp.mipsdl.entity.basic.BasicUdirelEntity; +import com.glxp.mipsdl.req.base.forthird.ForInvOutScanCodeFilter; import com.glxp.mipsdl.req.base.forthird.ForInvProductsFilter; import com.glxp.mipsdl.res.BaseResponse; import com.glxp.mipsdl.util.ResultVOUtils; @@ -100,4 +101,17 @@ public class ExAxxyyController { } + + + /** + * B003 高值耗材实时出库/退库 + * + * @param forInvOutScanCodeFilter + * @return + */ + @PostMapping("/ex/udiwms/inv/out/scanCode") + public BaseResponse invOutScanCode(@RequestBody ForInvOutScanCodeFilter forInvOutScanCodeFilter) { + return ClientProcessor.getHttpClient().queryUdiInvOutScanCode(forInvOutScanCodeFilter); + } + }