|
|
|
@ -145,12 +145,6 @@ public class WarehousingNotificationController {
|
|
|
|
|
for (WarehousingProductEntity warehousingProductEntity:warehousingProductList){
|
|
|
|
|
warehousingProductEntity.setStorageNumber(warehousingProductEntity.getPurchaseNum());
|
|
|
|
|
warehousingProductEntity.setStorageUnit(warehousingProductEntity.getPurchaseUnitId());
|
|
|
|
|
// QueryWrapper<BusinessCargoEntity> businessCargoEntityQueryWrapper =new QueryWrapper<>();
|
|
|
|
|
// businessCargoEntityQueryWrapper.lambda().eq(BusinessCargoEntity::getId,warehousingProductEntity.getStorageAreaId());
|
|
|
|
|
// List<BusinessCargoEntity> businessCargoEntityList =businessCargoService.list(businessCargoEntityQueryWrapper);
|
|
|
|
|
// if (businessCargoEntityList.size()>0 && businessCargoEntityList!=null){
|
|
|
|
|
// warehousingProductEntity.setStorageAreaId(businessCargoEntityList.get(0).getCargoName());
|
|
|
|
|
// }
|
|
|
|
|
}
|
|
|
|
|
warehousingNotificationMap.put("tableField121",JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(warehousingProductList)));
|
|
|
|
|
realList.add(warehousingNotificationMap);
|
|
|
|
@ -664,8 +658,6 @@ public class WarehousingNotificationController {
|
|
|
|
|
@Operation(summary = "获取Notification选择的凭证和商品列表")
|
|
|
|
|
@PostMapping("/getNotificationVoucherProductList")
|
|
|
|
|
public ActionResult queryNotificationVoucherProductList(@RequestBody VoucherPagination voucherPagination) throws IOException{
|
|
|
|
|
// WarehousingNotificationEntity warehousingNotificationEntity= warehousingNotificationService.getInfo(voucherPagination.getId());
|
|
|
|
|
|
|
|
|
|
String id = voucherPagination.getNotid();
|
|
|
|
|
QueryWrapper<WarehousingProductEntity> warehousingProductEntityQueryWrapper=new QueryWrapper<>();
|
|
|
|
|
warehousingProductEntityQueryWrapper.lambda().eq(WarehousingProductEntity::getWarehousingId,id);
|
|
|
|
@ -673,16 +665,11 @@ public class WarehousingNotificationController {
|
|
|
|
|
List<VoucherEntity> list=new ArrayList<>();
|
|
|
|
|
for (WarehousingProductEntity warehousingProductEntity:warehousingProductEntityList){
|
|
|
|
|
|
|
|
|
|
// QueryWrapper<VoucherEntity> voucherEntityQueryWrapper=new QueryWrapper<>();
|
|
|
|
|
// VoucherPagination voucherPagination =new VoucherPagination();
|
|
|
|
|
voucherPagination.setProductId(warehousingProductEntity.getProductId());
|
|
|
|
|
List<VoucherEntity> voucherList= voucherService.queryNotificationVoucherPopupInfo(voucherPagination);
|
|
|
|
|
list.addAll(voucherList);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// List<ProductWarehouseEntity> productWarehouseEntityList=workOrderService.getWorkBomProduct(voucherEntity.getId());
|
|
|
|
|
// voucherEntity.setProductWarehouseEntityList(productWarehouseEntityList);
|
|
|
|
|
|
|
|
|
|
//返回对象
|
|
|
|
|
PageListVO vo = new PageListVO();
|
|
|
|
|
vo.setList(list);
|
|
|
|
|