diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml index aefb0271..a75ac58c 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml @@ -164,6 +164,7 @@ + @@ -675,11 +676,13 @@ '其他采购' END AS orderType1, b.NAME AS subjectName, - c.contract_name AS contractName + c.contract_name AS contractName, + d.addressName FROM jg_business_order a LEFT JOIN jg_subject_basic b ON a.first_subject_basic_id = b.id AND b.f_delete_mark IS NULL LEFT JOIN jg_contract c ON a.contract_id = c.id AND c.f_delete_mark is NULL + LEFT JOIN jg_business_address d ON a.receive_address = d.id AND d.f_delete_mark is null ${ew.customSqlSegment} diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml index ffaa3606..c0867480 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml @@ -422,4 +422,29 @@ ${ew.customSqlSegment} AND e.f_status = 2 AND a.id not in (SELECT voucher_id from jg_warehousing_storage_poundlist where f_delete_mark is null) + diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/VoucherMapper.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/VoucherMapper.java index 2888f7ed..31e748c2 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/VoucherMapper.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/VoucherMapper.java @@ -33,4 +33,6 @@ public interface VoucherMapper extends BaseMapper { IPage queryVoucherList(@Param("page") Page page, @Param("voucherPagination")VoucherPagination voucherPagination, @Param("ew")QueryWrapper voucherEntityQueryWrapper); IPage queryVoucherPopup1(@Param("page") Page page,@Param("ew") QueryWrapper voucherEntityQueryWrapper); + + VoucherEntity queryVoucherInfo(String id); } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/VoucherService.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/VoucherService.java index 2355d0cc..da18eca8 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/VoucherService.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/VoucherService.java @@ -58,4 +58,6 @@ public interface VoucherService extends IService { //查询采购发货凭证 List queryPurchaseDeliveryVoucherInfo(); + VoucherEntity queryVoucherInfo(String id); + } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java index c049206e..8e71dbb5 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java @@ -632,4 +632,9 @@ public class VoucherServiceImpl extends ServiceImpl queryPurchaseDeliveryVoucherInfo() { return voucherMapper.queryPurchaseDeliveryVoucher(); } + + @Override + public VoucherEntity queryVoucherInfo(String id) { + return voucherMapper.queryVoucherInfo(id); + } } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java index 344b1e58..5c5b5d18 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java @@ -658,8 +658,8 @@ public class WarehousingStorageServiceImpl extends ServiceImpl tableField114 = JsonUtil.getJsonToList(receiptOrderForm.getDeliveryVoucherRelationList(),WarehousingStoragePoundlistEntity.class); - for(WarehousingStoragePoundlistEntity entitys : tableField114){ - entitys.setId(RandomUtil.uuId()); - entitys.setBusinessType("1"); - entitys.setDocumentType("1"); - entitys.setWarehousingStorageId(entity.getId()); - warehousingStoragePoundlistService.saveOrUpdate(entitys); - } - } + //WarehousingStorageProduct子表数据新增修改 if (receiptOrderForm.getDeliveryProductRelationList()!=null){ //统计收货数量 @@ -706,6 +696,7 @@ public class WarehousingStorageServiceImpl extends ServiceImpl tableField114 = JsonUtil.getJsonToList(receiptOrderForm.getDeliveryVoucherRelationList(),WarehousingStoragePoundlistEntity.class); + for(WarehousingStoragePoundlistEntity entitys : tableField114){ + entitys.setId(RandomUtil.uuId()); + entitys.setBusinessType("1"); + entitys.setDocumentType("1"); + entitys.setWarehousingStorageId(entity.getId()); + //将商品子表id放入凭证子表 + QueryWrapper productQueryWrapper = new QueryWrapper<>(); + productQueryWrapper.lambda().eq(WarehousingStorageProductEntity::getProductId, entitys.getProductId()); + productQueryWrapper.lambda().eq(WarehousingStorageProductEntity::getStorageUnit, entitys.getUnit()); + productQueryWrapper.lambda().eq(WarehousingStorageProductEntity::getWarehousingStorageId, entity.getId()); + List warehousingStorageProductEntity = warehousingStorageProductService.list(productQueryWrapper); + for (WarehousingStorageProductEntity product : warehousingStorageProductEntity) { + entitys.setStorageProductId(product.getId()); + } + warehousingStoragePoundlistService.saveOrUpdate(entitys); + } + } + } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/VoucherController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/VoucherController.java index 23072f52..22901db9 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/VoucherController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/VoucherController.java @@ -123,6 +123,8 @@ public class VoucherController { private WarehousingStoragePoundlistService warehousingStoragePoundlistService; @Autowired private WarehousingStorageProductService warehousingStorageProductService; + @Autowired + private ReceiptOrderService receiptOrderService; /** * 列表 @@ -649,6 +651,7 @@ public class VoucherController { queryWrapper.lambda().eq(WarehousingNotificationEntity::getWarehousingType,"1"); queryWrapper.lambda().and(wrapper -> wrapper.eq(WarehousingNotificationEntity::getWarehousingStatus,"3").or().eq(WarehousingNotificationEntity::getWarehousingStatus,"4")); + queryWrapper.inSql("id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单 //找出入库通知 List noticeList = warehousingNotificationService.list(queryWrapper); for (WarehousingNotificationEntity entity : noticeList){ @@ -656,6 +659,7 @@ public class VoucherController { storageQueryWrapper.lambda().eq(WarehousingStorageEntity::getWarehousingId,entity.getId()); storageQueryWrapper.lambda().eq(WarehousingStorageEntity::getWarehousingStorageType,"3");//采购入库 storageQueryWrapper.lambda().eq(WarehousingStorageEntity::getWarehousingStorageStatus,"3");//状态为已入库 + storageQueryWrapper.inSql("id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单 //找出入库单 List warehousingStorageEntityList = warehousingStorageService.list(storageQueryWrapper); for (WarehousingStorageEntity storageEntity : warehousingStorageEntityList){ @@ -666,32 +670,64 @@ public class VoucherController { } } }else if (ObjectUtils.isNotEmpty(businessOrderEntity) && businessOrderEntity.getDeliveryType().equals("2")){ - + QueryWrapper receiptOrderQueryWrapper = new QueryWrapper<>(); + receiptOrderQueryWrapper.lambda().eq(ReceiptOrderEntity::getBusinessId,voucherPagination.getBusinessOrderId()); + receiptOrderQueryWrapper.lambda().eq(ReceiptOrderEntity::getReceiptType,"1"); + receiptOrderQueryWrapper.lambda().eq(ReceiptOrderEntity::getReceiptStatus,"3"); + receiptOrderQueryWrapper.inSql("id", "SELECT f_process_id FROM flow_task WHERE f_status = '2'");//通过审核的订单 + List receiptOrderEntityList = receiptOrderService.list(receiptOrderQueryWrapper); + //循环收货单找出所有的入库单 + for (ReceiptOrderEntity receiptOrderEntity : receiptOrderEntityList){ + QueryWrapper storageQueryWrapper = new QueryWrapper<>(); + storageQueryWrapper.lambda().eq(WarehousingStorageEntity::getWarehousingId,receiptOrderEntity.getId()); + storageQueryWrapper.lambda().eq(WarehousingStorageEntity::getWarehousingStorageType,"15");//采购收货单入库 + storageQueryWrapper.lambda().eq(WarehousingStorageEntity::getWarehousingStorageStatus,"3");//状态为已入库 + //找出入库单 + List warehousingStorageEntityList = warehousingStorageService.list(storageQueryWrapper); + for (WarehousingStorageEntity warehousingStorageEntity : warehousingStorageEntityList){ + QueryWrapper pountlistQueryWrapper = new QueryWrapper<>(); + pountlistQueryWrapper.lambda().eq(WarehousingStoragePoundlistEntity::getWarehousingStorageId,warehousingStorageEntity.getId()); + List warehousingStoragePoundlistEntityList = warehousingStoragePoundlistService.list(pountlistQueryWrapper); + storagePoundlistEntityList.addAll(warehousingStoragePoundlistEntityList); + } + } } //将凭证和对应的商品封装 for (WarehousingStoragePoundlistEntity storagePoundlistEntity : storagePoundlistEntityList){ QueryWrapper productQueryWrapper = new QueryWrapper<>(); productQueryWrapper.lambda().eq(WarehousingStorageProductEntity::getId,storagePoundlistEntity.getStorageProductId()); - List product = warehousingStorageProductService.list(productQueryWrapper); - storagePoundlistEntity.setWarehousingStorageProductEntityList(product); - } - List list= voucherService.queryVoucherPopupByReturnInfo(voucherPagination); - for (VoucherEntity entity : list) { - if (StringUtil.isNotEmpty(entity.getProductId())){ - List productWarehouseEntity = productWarehouseService.getProductByVoucherInfo(entity.getProductId()); - for (ProductWarehouseEntity productEntity : productWarehouseEntity) { - productEntity.setUnit(entity.getUnit()); - productEntity.setGrossWeight(entity.getGrossWeight()); - productEntity.setTareWeight(entity.getTareWeight()); - productEntity.setBuckleWeight(entity.getBuckleWeight()); - productEntity.setNetWeight(entity.getNetWeight()); - } - entity.setProductWarehouseEntityList(productWarehouseEntity); + List productList = warehousingStorageProductService.list(productQueryWrapper); + for (WarehousingStorageProductEntity product : productList){ + product.setGrossWeight(storagePoundlistEntity.getGrossWeight());//毛重 + product.setTareWeight(storagePoundlistEntity.getTareWeight());//皮重 + product.setBuckleWeight(storagePoundlistEntity.getBuckleWeight());//扣重 + product.setNetWeight(storagePoundlistEntity.getNetWeight());//净重 } + storagePoundlistEntity.setWarehousingStorageProductEntityList(productList); } + for(WarehousingStoragePoundlistEntity poundlistEntity : storagePoundlistEntityList){ + VoucherEntity voucherEntity = voucherService.queryVoucherInfo(poundlistEntity.getVoucherId()); + poundlistEntity.setDocumentType1(voucherEntity.getDocumentType1()); + poundlistEntity.setVoucherType1(voucherEntity.getVoucherType1()); + poundlistEntity.setVehicleNumber(voucherEntity.getVehicleNumber()); + } +// List list= voucherService.queryVoucherPopupByReturnInfo(voucherPagination); +// for (VoucherEntity entity : list) { +// if (StringUtil.isNotEmpty(entity.getProductId())){ +// List productWarehouseEntity = productWarehouseService.getProductByVoucherInfo(entity.getProductId()); +// for (ProductWarehouseEntity productEntity : productWarehouseEntity) { +// productEntity.setUnit(entity.getUnit()); +// productEntity.setGrossWeight(entity.getGrossWeight()); +// productEntity.setTareWeight(entity.getTareWeight()); +// productEntity.setBuckleWeight(entity.getBuckleWeight()); +// productEntity.setNetWeight(entity.getNetWeight()); +// } +// entity.setProductWarehouseEntityList(productWarehouseEntity); +// } +// } //返回对象 PageListVO vo = new PageListVO(); - vo.setList(list); + vo.setList(storagePoundlistEntityList); PaginationVO page = JsonUtil.getJsonToBean(voucherPagination, PaginationVO.class); vo.setPagination(page); return ActionResult.success(vo); diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessOrderEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessOrderEntity.java index 787d1dac..54b7c9c3 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessOrderEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessOrderEntity.java @@ -192,4 +192,6 @@ public class BusinessOrderEntity { private String isTransferSource; @TableField(exist = false) private String settlementMethod1; + @TableField(exist = false) + private String addressName; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingStoragePoundlistEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingStoragePoundlistEntity.java index 8efd790d..266347a3 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingStoragePoundlistEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingStoragePoundlistEntity.java @@ -2,6 +2,8 @@ package jnpf.entity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; + +import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -54,13 +56,28 @@ public class WarehousingStoragePoundlistEntity { @TableField("F_TENANT_ID") private String tenantId; - @TableField(exist = false) + @TableField("PRODUCT_ID") private String productId; - @TableField(exist = false) + @TableField("UNIT") private String unit; + @TableField("GROSS_WEIGHT") + private BigDecimal grossWeight; + @TableField("TARE_WEIGHT") + private BigDecimal tareWeight; + @TableField("BUCKLE_WEIGHT") + private BigDecimal buckleWeight; + @TableField("NET_WEIGHT") + private BigDecimal netWeight; //对应的商品List @TableField(exist = false) private List warehousingStorageProductEntityList; + @TableField(exist = false) + private String documentType1; + @TableField(exist = false) + private String voucherType1; + @TableField(exist = false) + private String vehicleNumber; + } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingStorageProductEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingStorageProductEntity.java index eaa14d0f..9cd184d7 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingStorageProductEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/WarehousingStorageProductEntity.java @@ -65,4 +65,15 @@ public class WarehousingStorageProductEntity { @TableField("F_TENANT_ID") private String tenantId; + /** + * 退货单的商品列表 + * */ + @TableField(exist = false) + private BigDecimal grossWeight; + @TableField(exist = false) + private BigDecimal tareWeight; + @TableField(exist = false) + private BigDecimal buckleWeight; + @TableField(exist = false) + private BigDecimal netWeight; } diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/VoucherBox.vue b/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/VoucherBox.vue index 83b44bb1..3ca01e97 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/VoucherBox.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/publicPopup/VoucherBox.vue @@ -36,10 +36,10 @@ - - - + + diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/returnCargoOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/returnCargoOrder/form.vue index b22a427a..83a871d6 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/returnCargoOrder/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/returnCargoOrder/form.vue @@ -1327,10 +1327,12 @@ export default { }) }, initVoucherList(list) { + debugger for (let i = 0; i < list.length; i++) { const e = list[i]; + debugger let item = { - voucherId: e.id, + voucherId: e.voucherId, voucherCode: e.voucherCode, documentType: e.documentType, voucherType: e.voucherType, @@ -1345,11 +1347,11 @@ export default { buckleWeight: e.buckleWeight, netWeight: e.netWeight, businessType: '2', - list: JSON.parse(JSON.stringify(e.productWarehouseEntityList)), + list: JSON.parse(JSON.stringify(e.warehousingStorageProductEntityList)), } this.dataForm.deliveryVoucherRelationList.push(item) let productEntity = {} - e.productWarehouseEntityList.forEach(item => { + e.warehousingStorageProductEntityList.forEach(item => { if (item.orderMainUnitIds) { var unitName = JSON.parse(item.orderMainUnitIds); var optArray = []; @@ -1401,7 +1403,7 @@ export default { this.dataForm.purchaseOrderInfo = [] this.dataForm.purchaseOrderInfo[0] = val2 this.dataForm.subjectId = val2.firstSubjectBasicId - this.dataForm.deliveryAddress = val2.receiveAddress + this.dataForm.deliveryAddress = val2.addressName this.dataForm.enterpriseId = val2.enterpriseId this.dataForm.warehouseId = val2.deliveryWarehouse this.dataForm.shippingAddress = val2.deliveryAddress