耗材字典,单据验收修改

master
anthonywj 2 years ago
parent 4d00e27958
commit 74836b0047

@ -137,7 +137,7 @@ public class IoOrderDetailBizController extends BaseController {
datas.add(addBizProductReqeust); datas.add(addBizProductReqeust);
} }
for (AddBizProductReqeust item : datas) { for (AddBizProductReqeust item : datas) {
UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(item.getRelId()); UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectSupGroupById(item.getRelId());
// todo 查询产品是否已经通过认证 // todo 查询产品是否已经通过认证
// 1111 // 1111

@ -97,7 +97,6 @@ public class IoOrderReviewController extends BaseController {
if (orderEntity == null) { if (orderEntity == null) {
return ResultVOUtils.error(500, "未找到该业务单据"); return ResultVOUtils.error(500, "未找到该业务单据");
} }
if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_REW) { if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_REW) {
return updateReview(getUser(), orderEntity); return updateReview(getUser(), orderEntity);
} else if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_SUCCESS) { } else if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_SUCCESS) {

@ -50,6 +50,8 @@ public interface UdiRelevanceService {
UdiRelevanceResponse selectGroupById(Long id); UdiRelevanceResponse selectGroupById(Long id);
UdiRelevanceResponse selectSupGroupById(Long id);
UdiRelevanceEntity selectUpdateByUuid(String uuid); UdiRelevanceEntity selectUpdateByUuid(String uuid);
UdiRelevanceEntity selectUpdateByThirdId(String thirdId); UdiRelevanceEntity selectUpdateByThirdId(String thirdId);

@ -177,6 +177,17 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService {
return data.get(0); return data.get(0);
return null; return null;
} }
@Override
public UdiRelevanceResponse selectSupGroupById(Long id) {
FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest();
filterUdiRelRequest.setId(id);
filterUdiRelRequest.setDiType(1);
List<UdiRelevanceResponse> data = udiRelevanceDao.filterUdiJoinSup(filterUdiRelRequest);
if (data != null && data.size() > 0)
return data.get(0);
return null;
}
@Override @Override
public UdiRelevanceEntity selectUpdateByUuid(String uuid) { public UdiRelevanceEntity selectUpdateByUuid(String uuid) {

@ -165,7 +165,7 @@
basic_products.cplx, basic_products.cplx,
basic_products.hchzsb, basic_products.hchzsb,
basic_products.cpdls, basic_products.cpdls,
basic_products.price, company_product_relevance.price,
basic_products.basicPrductRemak1, basic_products.basicPrductRemak1,
basic_products.basicPrductRemak2, basic_products.basicPrductRemak2,
basic_products.basicPrductRemak3, basic_products.basicPrductRemak3,

Loading…
Cancel
Save