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

feat: nj

Browse Source
njxyy
chenhc 4 months ago
parent 8e6f51c46b
commit dc2ecb90c4
1 changed files with 42 additions and 32 deletions
Show Stats Download Patch File Download Diff File

74
src/main/java/com/glxp/mipsdl/client/njxyy/NjxyyClient.java
Unescape Escape View File

@ -24,6 +24,7 @@ import com.glxp.mipsdl.dao.auth.AuthWarehouseDao;
import com.glxp.mipsdl.dao.basic.BasicBussinessTypeDao; import com.glxp.mipsdl.dao.basic.BasicBussinessTypeDao;
import com.glxp.mipsdl.dao.basic.BasicCorpDao; import com.glxp.mipsdl.dao.basic.BasicCorpDao;
import com.glxp.mipsdl.dao.basic.BasicUdirelDao; 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.IoCodeDao;
import com.glxp.mipsdl.dao.inout.IoOrderDao; import com.glxp.mipsdl.dao.inout.IoOrderDao;
import com.glxp.mipsdl.dao.inout.IoOrderDetailBizDao; import com.glxp.mipsdl.dao.inout.IoOrderDetailBizDao;
@ -111,6 +112,8 @@ public class NjxyyClient extends CommonHttpClient {
@Resource @Resource
private BasicUdirelDao basicUdirelDao; private BasicUdirelDao basicUdirelDao;
@Resource @Resource
private UdiRlSupDao udiRlSupDao;
@Resource
ThrProductsDao thrProductsDao; ThrProductsDao thrProductsDao;
@Resource @Resource
private OrderUploadLogService orderUploadLogService; private OrderUploadLogService orderUploadLogService;
@ -678,6 +681,9 @@ public class NjxyyClient extends CommonHttpClient {
} }
BasicUdirelEntity udirelEntity = basicUdirelDao.selectByNameCode(udiEntity.getUdi()); BasicUdirelEntity udirelEntity = basicUdirelDao.selectByNameCode(udiEntity.getUdi());
CompanyProductRelevanceRequest companyProductRelevanceRequest = new CompanyProductRelevanceRequest();
companyProductRelevanceRequest.setUuid(udirelEntity.getUuid());
List<UdiRlSupResponse> udiRlSupResponses = udiRlSupDao.filterUdiGp(companyProductRelevanceRequest);
if (udirelEntity == null) { if (udirelEntity == null) {
return ResultVOUtils.error(500, "耗材字典未对照！"); return ResultVOUtils.error(500, "耗材字典未对照！");
} }
@ -690,45 +696,39 @@ public class NjxyyClient extends CommonHttpClient {
//收费入库 //收费入库
ioOrderRequest.setAction("SC20250702001"); ioOrderRequest.setAction("SC20250702001");
} else { } else {
// //判断库存
if (IntUtil.value(udirelEntity.getPurType()) == 1) { // List<IoCodeEntity> codeEntities = codeDao.selectList(new LambdaQueryWrapper<IoCodeEntity>().eq(IoCodeEntity::getCode, codeRequest.getCode()).eq(IoCodeEntity::getAction, "SC20250702002"));
//收费退库 入账 // if (CollUtil.isEmpty(codeEntities)) {
ioOrderRequest.setAction("SC20250702002"); // codeEntities = codeDao.selectList(new LambdaQueryWrapper<IoCodeEntity>().eq(IoCodeEntity::getErrUdiCode, codeRequest.getCode()).eq(IoCodeEntity::getAction, "SC20250702002"));
//判断库存 // if (CollUtil.isEmpty(codeEntities)) {
List<IoCodeEntity> codeEntities = codeDao.selectList(new LambdaQueryWrapper<IoCodeEntity>().eq(IoCodeEntity::getCode, codeRequest.getCode()).eq(IoCodeEntity::getAction, "SC20250702002")); // return ResultVOUtils.error(500, "该UDI码未出库！");
if (CollUtil.isEmpty(codeEntities)) { // }
codeEntities = codeDao.selectList(new LambdaQueryWrapper<IoCodeEntity>().eq(IoCodeEntity::getErrUdiCode, codeRequest.getCode()).eq(IoCodeEntity::getAction, "SC20250702002")); // }
if (CollUtil.isEmpty(codeEntities)) {
return ResultVOUtils.error(500, "该UDI码未出库！");
}
}
codeRequestListYb.add(codeRequest); codeRequestListYb.add(codeRequest);
if (IntUtil.value(udirelEntity.getPurType()) == 2) {
} else if (IntUtil.value(udirelEntity.getPurType()) == 2) { if (CollUtil.isNotEmpty(udiRlSupResponses)){
//收费退库 预验收 long customerId = udiRlSupResponses.get(0).getCustomerId();
ioOrderRequest.setAction("SC70927695263969"); if(customerId != 0l){
//判断库存 codeRequest.setSupId(String.valueOf(customerId));
List<IoCodeEntity> codeEntities = codeDao.selectList(new LambdaQueryWrapper<IoCodeEntity>().eq(IoCodeEntity::getCode, codeRequest.getCode()).eq(IoCodeEntity::getAction, "SC70927695263969")); }else {
if (CollUtil.isEmpty(codeEntities)) { return ResultVOUtils.error(500, "预验收产品供应商ID未维护！");
codeEntities = codeDao.selectList(new LambdaQueryWrapper<IoCodeEntity>().eq(IoCodeEntity::getErrUdiCode, codeRequest.getCode()).eq(IoCodeEntity::getAction, "SC70927695263969"));
if (CollUtil.isEmpty(codeEntities)) {
return ResultVOUtils.error(500, "该UDI码未出库！");
} }
}else {
return ResultVOUtils.error(500, "预验收产品供应商ID为找到！");
} }
codeRequestListYys.add(codeRequest); codeRequestListYys.add(codeRequest);
} else if (IntUtil.value(udirelEntity.getPurType()) == 3) { } else if (IntUtil.value(udirelEntity.getPurType()) == 3) {
//收费退库 寄售 if (CollUtil.isNotEmpty(udiRlSupResponses)){
ioOrderRequest.setAction("SC70927877557094"); long customerId = udiRlSupResponses.get(0).getCustomerId();
//判断库存 if(customerId != 0l){
List<IoCodeEntity> codeEntities = codeDao.selectList(new LambdaQueryWrapper<IoCodeEntity>().eq(IoCodeEntity::getCode, codeRequest.getCode()).eq(IoCodeEntity::getAction, "SC70927877557094")); codeRequest.setSupId(String.valueOf(customerId));
if (CollUtil.isEmpty(codeEntities)) { }else {
codeEntities = codeDao.selectList(new LambdaQueryWrapper<IoCodeEntity>().eq(IoCodeEntity::getErrUdiCode, codeRequest.getCode()).eq(IoCodeEntity::getAction, "SC70927877557094")); return ResultVOUtils.error(500, "预验收产品供应商ID未维护！");
if (CollUtil.isEmpty(codeEntities)) {
return ResultVOUtils.error(500, "该UDI码未出库！");
} }
}else {
return ResultVOUtils.error(500, "寄售产品供应商ID为找到！");
} }
codeRequestListJs.add(codeRequest); codeRequestListJs.add(codeRequest);
} }
} }
@ -736,6 +736,8 @@ public class NjxyyClient extends CommonHttpClient {
String billNo = ""; String billNo = "";
{ {
//收费退库 入账
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);
@ -750,7 +752,11 @@ public class NjxyyClient extends CommonHttpClient {
if (CollUtil.isNotEmpty(codeRequestListYys)){ if (CollUtil.isNotEmpty(codeRequestListYys)){
//收费退库 预验收
ioOrderRequest.setAction("SC70927695263969");
ioOrderRequest.setInvCode("1000001"); ioOrderRequest.setInvCode("1000001");
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);
@ -764,7 +770,11 @@ public class NjxyyClient extends CommonHttpClient {
} }
if (CollUtil.isNotEmpty(codeRequestListJs)){ if (CollUtil.isNotEmpty(codeRequestListJs)){
//收费退库 寄售
ioOrderRequest.setAction("SC70927877557094");
ioOrderRequest.setInvCode("1000002"); ioOrderRequest.setInvCode("1000002");
ioOrderRequest.setFromCorp(codeRequestListJs.get(0).getSupId());
forInvOutScanCodeRequest.setCodeRequestList(codeRequestListJs); forInvOutScanCodeRequest.setCodeRequestList(codeRequestListJs);
forInvOutScanCodeRequest.setIoOrderRequest(ioOrderRequest); forInvOutScanCodeRequest.setIoOrderRequest(ioOrderRequest);
String response = httpClient.postUDIWMSJson(thirdSysConfig.getPostInvOutScanCode(), forInvOutScanCodeRequest); String response = httpClient.postUDIWMSJson(thirdSysConfig.getPostInvOutScanCode(), forInvOutScanCodeRequest);

Write Preview
Loading…
Cancel
Save