UDI
/
udi-wms-third-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2/19 优化1.0

Browse Source
axxyy
wangwei 2 months ago
parent 20b4ff0434
commit 688a814d5f
2 changed files with 59 additions and 45 deletions
Show Stats Download Patch File Download Diff File

90
src/main/java/com/glxp/mipsdl/client/axxyy/AxxyyClient.java
Unescape Escape View File

@ -711,7 +711,7 @@ public class AxxyyClient extends CommonHttpClient {
// return ResultVOUtils.error(500, "该UDI码未出库！"); // return ResultVOUtils.error(500, "该UDI码未出库！");
// } // }
// } // }
codeRequestListYb.add(codeRequest); codeRequestListYb.add(codeRequest);
if (IntUtil.value(udirelEntity.getPurType()) == 2) { if (IntUtil.value(udirelEntity.getPurType()) == 2) {
if (CollUtil.isNotEmpty(udiRlSupResponses)){ if (CollUtil.isNotEmpty(udiRlSupResponses)){
long customerId = udiRlSupResponses.get(0).getCustomerId(); long customerId = udiRlSupResponses.get(0).getCustomerId();
@ -741,58 +741,58 @@ public class AxxyyClient extends CommonHttpClient {
{ {
//收费退库 入账 //收费退库 入账
ioOrderRequest.setAction("SC20250702002"); ioOrderRequest.setAction("SC20250702002");
forInvOutScanCodeRequest.setCodeRequestList(codeRequestListYb); forInvOutScanCodeRequest.setCodeRequestList(codeRequestListYb);
forInvOutScanCodeRequest.setIoOrderRequest(ioOrderRequest); forInvOutScanCodeRequest.setIoOrderRequest(ioOrderRequest);
String response = httpClient.postUDIWMSJson(thirdSysConfig.getPostInvOutScanCode(), forInvOutScanCodeRequest); String response = httpClient.postUDIWMSJson(thirdSysConfig.getPostInvOutScanCode(), forInvOutScanCodeRequest);
BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class); BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class);
if (baseResponse.getCode() == 20000){ if (baseResponse.getCode() == 20000){
ForInvOutScanCodeResponse forInvOutScanCodeResponse = JSONObject.parseObject(String.valueOf(baseResponse.getData()), ForInvOutScanCodeResponse.class); ForInvOutScanCodeResponse forInvOutScanCodeResponse = JSONObject.parseObject(String.valueOf(baseResponse.getData()), ForInvOutScanCodeResponse.class);
billNo = billNo + forInvOutScanCodeResponse.getBillNo() + ";"; billNo = billNo + forInvOutScanCodeResponse.getBillNo() + ";";
}else { }else {
return baseResponse; return baseResponse;
}
} }
}
if (CollUtil.isNotEmpty(codeRequestListYys)){ if (CollUtil.isNotEmpty(codeRequestListYys)){
//收费退库 预验收 //收费退库 预验收
ioOrderRequest.setAction("SC73399619155911"); ioOrderRequest.setAction("SC73399619155911");
ioOrderRequest.setInvCode("1000001"); ioOrderRequest.setInvCode("1000001");
ioOrderRequest.setFromCorp(codeRequestListYys.get(0).getSupId()); ioOrderRequest.setFromCorp(codeRequestListYys.get(0).getSupId());
forInvOutScanCodeRequest.setCodeRequestList(codeRequestListYys); forInvOutScanCodeRequest.setCodeRequestList(codeRequestListYys);
forInvOutScanCodeRequest.setIoOrderRequest(ioOrderRequest); forInvOutScanCodeRequest.setIoOrderRequest(ioOrderRequest);
String response = httpClient.postUDIWMSJson(thirdSysConfig.getPostInvOutScanCode(), forInvOutScanCodeRequest); String response = httpClient.postUDIWMSJson(thirdSysConfig.getPostInvOutScanCode(), forInvOutScanCodeRequest);
BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class); BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class);
if (baseResponse.getCode() == 20000){ if (baseResponse.getCode() == 20000){
ForInvOutScanCodeResponse forInvOutScanCodeResponse = JSONObject.parseObject(String.valueOf(baseResponse.getData()), ForInvOutScanCodeResponse.class); ForInvOutScanCodeResponse forInvOutScanCodeResponse = JSONObject.parseObject(String.valueOf(baseResponse.getData()), ForInvOutScanCodeResponse.class);
billNo = billNo + forInvOutScanCodeResponse.getBillNo(); billNo = billNo + forInvOutScanCodeResponse.getBillNo();
}else { }else {
return baseResponse; return baseResponse;
}
} }
}
if (CollUtil.isNotEmpty(codeRequestListJs)){
//收费退库 寄售
ioOrderRequest.setAction("SC73399555402219");
ioOrderRequest.setInvCode("1000002");
ioOrderRequest.setFromCorp(codeRequestListJs.get(0).getSupId()); if (CollUtil.isNotEmpty(codeRequestListJs)){
forInvOutScanCodeRequest.setCodeRequestList(codeRequestListJs); //收费退库 寄售
forInvOutScanCodeRequest.setIoOrderRequest(ioOrderRequest); ioOrderRequest.setAction("SC73399555402219");
String response = httpClient.postUDIWMSJson(thirdSysConfig.getPostInvOutScanCode(), forInvOutScanCodeRequest); ioOrderRequest.setInvCode("1000002");
BaseResponse baseResponse = JSONObject.parseObject(response, BaseResponse.class);
if (baseResponse.getCode() == 20000){ ioOrderRequest.setFromCorp(codeRequestListJs.get(0).getSupId());
ForInvOutScanCodeResponse forInvOutScanCodeResponse = JSONObject.parseObject(String.valueOf(baseResponse.getData()), ForInvOutScanCodeResponse.class); forInvOutScanCodeRequest.setCodeRequestList(codeRequestListJs);
billNo = billNo + forInvOutScanCodeResponse.getBillNo(); forInvOutScanCodeRequest.setIoOrderRequest(ioOrderRequest);
}else { String response = httpClient.postUDIWMSJson(thirdSysConfig.getPostInvOutScanCode(), forInvOutScanCodeRequest);
return baseResponse; 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); return ResultVOUtils.success(billNo);

14
src/main/java/com/glxp/mipsdl/controller/ExAxxyyController.java
Unescape Escape View File

@ -9,6 +9,7 @@ import com.glxp.mipsdl.dao.auth.AuthWarehouseDao;
import com.glxp.mipsdl.dao.basic.BasicUdirelDao; import com.glxp.mipsdl.dao.basic.BasicUdirelDao;
import com.glxp.mipsdl.entity.auth.AuthWarehouseEntity; import com.glxp.mipsdl.entity.auth.AuthWarehouseEntity;
import com.glxp.mipsdl.entity.basic.BasicUdirelEntity; 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.req.base.forthird.ForInvProductsFilter;
import com.glxp.mipsdl.res.BaseResponse; import com.glxp.mipsdl.res.BaseResponse;
import com.glxp.mipsdl.util.ResultVOUtils; 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);
}
} }

Write Preview
Loading…
Cancel
Save