yunxi
/
jigangSCM2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

出库通知部分问题提交

Browse Source
jg-waiwang-pro
CJYXTX\27961 6 months ago
parent 9ff04dcfb2
commit 2216a1ce29
3 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File

3
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java
Unescape View File

@ -624,8 +624,9 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
public List<VoucherEntity> queryNotificationVoucherPopupInfo(VoucherPagination voucherPagination) {
QueryWrapper<VoucherEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("b.product_id",voucherPagination.getProductId());
queryWrapper.eq("a.voucher_status","4");
queryWrapper.notIn(ObjectUtils.isNotEmpty(voucherPagination.getExcludeIdList()),"a.id",voucherPagination.getExcludeIdList());
// queryWrapper.in(ObjectUtils.isNotEmpty(voucherPagination.getProductIdList()),"b.product_id",voucherPagination.getProductIdList());
queryWrapper.in(ObjectUtils.isNotEmpty(voucherPagination.getProductIdList()),"b.product_id",voucherPagination.getProductIdList());
queryWrapper.isNull("a.f_delete_mark");
Page<VoucherEntity> page=new Page<>(voucherPagination.getCurrentPage(), voucherPagination.getPageSize());
IPage<VoucherEntity> voucherEntityIPage = voucherMapper.queryVoucherNotification(page,queryWrapper);

13
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WarehousingNotificationController.java
Unescape View File

@ -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);

6
jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/NotificationVoucherSale.vue
Unescape View File

@ -36,10 +36,10 @@
</el-table-column>
<el-table-column prop="poundCode" label="磅单编号" align="left">
</el-table-column>
<el-table-column prop="vehicleName" label="车牌号" align="left">
<!-- <el-table-column prop="vehicleName" label="车牌号" align="left">
</el-table-column>
<el-table-column prop="supplierName" label="供应商名字" align="left">
</el-table-column>
</el-table-column> -->
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize"
@pagination="init" />
@ -83,7 +83,7 @@ export default {
if (excludeIdList && excludeIdList instanceof Array) {
this.excludeIdList = excludeIdList;
}
if (val && typeof(val) == 'string') {
if (val && typeof (val) == 'string') {
this.val = val;
}
let query = {

Write Preview
Loading…
Cancel
Save