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

处理单据修改

Browse Source
dev_2.5_optimize
yewj 5 months ago
parent 459b422492
commit 67300df297
4 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File

2
src/main/java/com/glxp/api/controller/auth/AuthUserController.java
Unescape Escape View File

@ -179,7 +179,7 @@ public class AuthUserController extends BaseController {
}
// @AuthRuleAnnotation("")
// @AuthRuleAnnotation("")
// @PostMapping("/admin/auth/admin/force/updateUser")
// public BaseResponse forceUpdateUser(@RequestBody @Valid UpdateUserRequset updateUserRequset, BindingResult bindingResult) {
// if (bindingResult.hasErrors()) {

2
src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
Unescape Escape View File

@ -1067,7 +1067,7 @@ public class IoOrderDetailBizController extends BaseController {
if (i == 0) {
addBizProductReqeust.setOrderEntity(ioOrderEntity);
}
addBizProductReqeust.setProductType(udiRelevanceResponse.getProductType());
addBizProductReqeust.setProductType(udiRelevanceResponse.getProductsType());
BaseResponse response = orderDetailBizService.addBizProduct(addBizProductReqeust);
if (response.getCode() != 20000) {
return response;

8
src/main/java/com/glxp/api/service/alihealth/impl/AlihealthBusServiceImpl.java
Unescape Escape View File

@ -186,7 +186,7 @@ public class AlihealthBusServiceImpl implements AlihealthBusService {
ioCodeLostService.insertOrUpdate(codeLostEntity);
UdiEntity udiEntityy = FilterUdiUtils.getUdi(addOrderRequest.getCode());
BaseResponse response2 = ioOrderDetailBizService.adddDrugOrder(addOrderRequest,udiEntityy,addOrderRequest.getCode());
BaseResponse response2 = ioOrderDetailBizService.adddDrugOrder(addOrderRequest, udiEntityy, addOrderRequest.getCode());
if (response2.getCode() != 20000) {
throw new JsonException(response2.getMessage());
@ -263,8 +263,8 @@ public class AlihealthBusServiceImpl implements AlihealthBusService {
List<CompanyProductRelevanceEntity> companyProductRelevanceEntities = companyProductRelevanceDao.selectList(new LambdaQueryWrapper<CompanyProductRelevanceEntity>()
.eq(CompanyProductRelevanceEntity::getUdiRlIdFk, id)
.eq(CompanyProductRelevanceEntity::getCustomerId, userId));
if (CollUtil.isEmpty(companyProductRelevanceEntities)){
throw new JsonException(500, "当前产品标识:【"+ udiRelevance.getNameCode()+"】未添加文件中供应商配送服务！");
if (CollUtil.isEmpty(companyProductRelevanceEntities)) {
throw new JsonException(500, "当前产品标识:【" + udiRelevance.getNameCode() + "】未添加文件中供应商配送服务！");
}
AddBizProductReqeust productRequest = new AddBizProductReqeust();
@ -274,7 +274,7 @@ public class AlihealthBusServiceImpl implements AlihealthBusService {
productRequest.setDatas(null);
productRequest.setCount(IntUtil.value(orderUploadVo.getShipmentQuantity()));
productRequest.setBatchNo(orderUploadVo.getBatchNumber());
productRequest.setProductType(udiRelevance.getProductType());
productRequest.setProductType(udiRelevance.getProductsType());
productRequest.setYcBizNo(orderUploadVo.getShipmentDetailId());
productRequest.setPrice(orderUploadVo.getPurchasePrice());
productRequest.setSupId(fromCorp);

44
src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
Unescape Escape View File

@ -161,16 +161,22 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
else udiRelevanceResponse = udiRelevanceResponses.get(0);
//判断层级标识是否正确
if (IntUtil.value(sysWorkplaceDocumentEntity.getOrderCirType()) == 2) {
if (udiRelevanceResponse.getUseMaxLevel() != null && IntUtil.value(udiRelevanceResponse.getPackLevel()) > IntUtil.value(udiRelevanceResponse.getUseMaxLevel())) {
throw new JsonException(500, "当前产品不支持采集该包装层级追溯码！");
}
if (udiRelevanceResponse.getUseMaxLevel() == null && IntUtil.value(udiRelevanceResponse.getPackLevel()) > 1) {
throw new JsonException(500, "当前产品不支持采集该包装层级追溯码！");
}
if (IntUtil.value(udiRelevanceResponse.getPackLevel()) < IntUtil.value(udiRelevanceResponse.getUseLevel())) {
throw new JsonException(500, "当前产品不支持采集该包装层级追溯码！");
if(IntUtil.value(udiRelevanceResponse.getProductsType()) == 1){
}else {
if (udiRelevanceResponse.getUseMaxLevel() != null && IntUtil.value(udiRelevanceResponse.getPackLevel()) > IntUtil.value(udiRelevanceResponse.getUseMaxLevel())) {
throw new JsonException(500, "当前产品不支持采集该包装层级追溯码！");
}
if (udiRelevanceResponse.getUseMaxLevel() == null && IntUtil.value(udiRelevanceResponse.getPackLevel()) > 1) {
throw new JsonException(500, "当前产品不支持采集该包装层级追溯码！");
}
if (IntUtil.value(udiRelevanceResponse.getPackLevel()) < IntUtil.value(udiRelevanceResponse.getUseLevel())) {
throw new JsonException(500, "当前产品不支持采集该包装层级追溯码！");
}
}
} else {
if (udiRelevanceResponse.getDistributeMaxLevel() != null && IntUtil.value(udiRelevanceResponse.getDistributeMaxLevel()) < IntUtil.value(udiRelevanceResponse.getPackLevel())) {
throw new JsonException(500, "当前产品不支持采集该包装层级追溯码！");
@ -185,17 +191,17 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
// 产品采购类型
// 拿到产品采购类型
// code purType 查找 io_collect_code_backup 是否存在 不存在 提示 当前码未进入预验收/寄售库
if (IntUtil.value(collectSet.getIsScanCodeCheck())) {
if (IntUtil.value(udiRelevanceResponse.getPurType()) != 1 && IntUtil.value(udiRelevanceResponse.getPurType()) != 0) {
IoCollectCodeBackup collectCodeBackup = ioCollectCodeBackService.getOne(new LambdaQueryWrapper<IoCollectCodeBackup>()
.eq(IoCollectCodeBackup::getCode, code)
.eq(IoCollectCodeBackup::getPurType, udiRelevanceResponse.getPurType()));
if (collectCodeBackup == null) {
String PurTypeName = IntUtil.value(udiRelevanceResponse.getPurType()) == 2 ? "预验收" : "寄售";
throw new JsonException(500, "当前产品追溯码未进入" + PurTypeName + "库");
}
}
}
// if (IntUtil.value(collectSet.getIsScanCodeCheck())) {
// if (IntUtil.value(udiRelevanceResponse.getPurType()) != 1 && IntUtil.value(udiRelevanceResponse.getPurType()) != 0) {
// IoCollectCodeBackup collectCodeBackup = ioCollectCodeBackService.getOne(new LambdaQueryWrapper<IoCollectCodeBackup>()
// .eq(IoCollectCodeBackup::getCode, code)
// .eq(IoCollectCodeBackup::getPurType, udiRelevanceResponse.getPurType()));
// if (collectCodeBackup == null) {
// String PurTypeName = IntUtil.value(udiRelevanceResponse.getPurType()) == 2 ? "预验收" : "寄售";
// throw new JsonException(500, "当前产品追溯码未进入" + PurTypeName + "库");
// }
// }
// }
//流通数量
Integer circleCount = calCountUtil.getCirActCount(udiRelevanceResponse);

Write Preview
Loading…
Cancel
Save