diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java index 1f993d67..8fb641e6 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/controller/CollectionController.java @@ -22,6 +22,8 @@ import jnpf.collection.service.Collection_item0Service; import jnpf.config.ConfigValueUtil; import jnpf.contractfile.entity.ContractFileEntity; import jnpf.contractfile.service.ContractFileService; +import jnpf.customer.entity.CustomerEntity; +import jnpf.customer.service.CustomerService; import jnpf.exception.DataException; import jnpf.poundlist.entity.PoundlistEntity; import jnpf.poundlist.service.PoundlistService; @@ -89,6 +91,8 @@ public class CollectionController { private PoundlistService poundlistService; @Autowired private ContractFileService contractFileService; + @Autowired + private CustomerService customerService; /** * 单据编号显示 * @@ -486,6 +490,20 @@ public class CollectionController { @GetMapping("/{id}") public ActionResult info(@PathVariable("id") String id){ CollectionEntity entity= collectionService.getInfo(id); + if(ObjectUtils.isNotEmpty(entity)){ + if (StringUtils.isNotEmpty(entity.getCustomerId())){ + CustomerEntity customerEntity = customerService.getById(entity.getCustomerId()); + if (ObjectUtils.isNotEmpty(customerEntity) && StringUtils.isNotEmpty(customerEntity.getSupplierNm())){ + entity.setCustomerNm(customerEntity.getSupplierNm()); + } + } + if (StringUtils.isNotEmpty(entity.getContractId())){ + ContractFileEntity contractFileEntity = contractFileService.getById(entity.getContractId()); + if (ObjectUtils.isNotEmpty(contractFileEntity) && StringUtils.isNotEmpty(contractFileEntity.getContractName())){ + entity.setContractNm(contractFileEntity.getContractName()); + } + } + } CollectionInfoVO vo=JsonUtil.getJsonToBean(entity, CollectionInfoVO.class); //子表 @@ -495,6 +513,13 @@ public class CollectionController { queryWrapper.lambda().eq(SaleorderitemEntity::getId, collection_item0Entity.getSalesorderId()); SaleorderitemEntity saleorderitemEntity = saleorderitemService.getOne(queryWrapper); if (ObjectUtils.isNotEmpty(saleorderitemEntity)) { + if (StringUtils.isNotEmpty(saleorderitemEntity.getContractId())){ + ContractFileEntity contractFileEntity = contractFileService.getById(saleorderitemEntity.getContractId()); + if (ObjectUtils.isNotEmpty(contractFileEntity) && StringUtils.isNotEmpty(contractFileEntity.getContractCode())){ + collection_item0Entity.setContractCode(contractFileEntity.getContractCode()); + } + } + collection_item0Entity.setSourceName(saleorderitemEntity.getDocumentNo()); collection_item0Entity.setPrice(saleorderitemEntity.getPrice()); collection_item0Entity.setAmountCollected(saleorderitemEntity.getAmountCollected()); collection_item0Entity.setContractId(saleorderitemEntity.getContractId()); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/Collection_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/Collection_item0Entity.java index f4ce666e..910bfdae 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/Collection_item0Entity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/entity/Collection_item0Entity.java @@ -78,9 +78,9 @@ public class Collection_item0Entity { @TableField(exist = false) private BigDecimal amountCollected; -// /** 合同编码 **/ -// @TableField(exist = false) -// private String contractCode; + /** 合同编码 **/ + @TableField(exist = false) + private String contractCode; /** 重量 **/ @TableField(exist = false) @@ -101,5 +101,8 @@ public class Collection_item0Entity { /** 合同编码 **/ @TableField(exist = false) private String contractId; + /**销售订单号*/ + @TableField(exist = false) + private String sourceName; } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionInfoVO.java index 371ffa19..4407b21e 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionInfoVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/CollectionInfoVO.java @@ -80,4 +80,10 @@ public class CollectionInfoVO{ @JsonProperty("collection_item0List") private List collection_item0List; + @JsonProperty("customerNm") + private String customerNm; + + @JsonProperty("contractNm") + private String contractNm; + } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/Collection_item0Model.java b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/Collection_item0Model.java index 5ccabcc8..6d978a2b 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/Collection_item0Model.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/collection/model/collection/Collection_item0Model.java @@ -59,4 +59,12 @@ public class Collection_item0Model { @JsonProperty("creatorTime") private Long creatorTime; + /** 合同编码 **/ + @JsonProperty("contractCode") + private String contractCode; + + /** 销售订单号 **/ + @JsonProperty("sourceName") + private String sourceName; + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java index 0e54b789..f307dfdc 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java @@ -585,10 +585,18 @@ public class PurchaseorderController { PurchaseorderitemEntity entity = purchaseorderitemService.getInfo(id); PurchaseorderInfoVO vo = JsonUtil.getJsonToBean(entity, PurchaseorderInfoVO.class); vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName())); - /*SupplierEntity supplierEntity = supplierService.getById(vo.getSupplierId()); - if(supplierEntity != null){ - vo.setSupplierName(supplierEntity.getSupplierName()); - }*/ + if(StringUtils.isNotEmpty(vo.getSupplierId())) { + SupplierEntity supplierEntity = supplierService.getById(vo.getSupplierId()); + if (ObjectUtils.isNotEmpty(supplierEntity) && StringUtils.isNotEmpty(supplierEntity.getSupplierName())) { + vo.setSupplierName(supplierEntity.getSupplierName()); + } + } + if (StringUtils.isNotEmpty(vo.getContractCode())){ + ContractFileEntity contractFileEntity = contractFileService.getById(vo.getContractCode()); + if (ObjectUtils.isNotEmpty(contractFileEntity) && StringUtils.isNotEmpty(contractFileEntity.getContractName())){ + vo.setContractName(contractFileEntity.getContractName()); + } + } if (vo.getCreatorTime() != null) { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/controller/ReceiptoutController.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/controller/ReceiptoutController.java index 6fc58259..c4546b91 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/controller/ReceiptoutController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/controller/ReceiptoutController.java @@ -21,12 +21,16 @@ import jnpf.materialvo.entity.MaterialEntity; import jnpf.materialvo.service.MaterialService; import jnpf.poundlist.entity.PoundlistEntity; import jnpf.poundlist.service.PoundlistService; +import jnpf.reservoirarea.entity.ReservoirareaEntity; +import jnpf.reservoirarea.service.ReservoirareaService; import jnpf.saleorder.entity.SaleorderitemEntity; import jnpf.saleorder.entity.Salesorder_item0Entity; import jnpf.saleorder.service.SaleorderitemService; import jnpf.saleorder.service.Salesorder_item0Service; import jnpf.vehicle.entity.VehicleEntity; import jnpf.vehicle.service.VehicleService; +import jnpf.warehouse.entity.WareHouseEntity; +import jnpf.warehouse.service.WareHouseService; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.transaction.annotation.Transactional; @@ -103,6 +107,10 @@ public class ReceiptoutController { private VehicleService vehicleService; @Autowired private MaterialService materialService; + @Autowired + private ReservoirareaService reservoirareaService; + @Autowired + private WareHouseService wareHouseService; /** * 销售订单出货，出库单创建 @@ -395,15 +403,31 @@ public class ReceiptoutController { //子表 List Receiptout_item0List = receiptoutService.GetReceiptout_item0List(id); for(Receiptout_item0Entity receiptout_item0Entity : Receiptout_item0List){ - VehicleEntity vehicleEntity = vehicleService.getById(receiptout_item0Entity.getVehicleId()); - if (ObjectUtils.isNotEmpty(vehicleEntity) && StringUtils.isNotEmpty(vehicleEntity.getTicketno())){ - receiptout_item0Entity.setVehicleName(vehicleEntity.getTicketno()); + if (StringUtils.isNotEmpty(receiptout_item0Entity.getVehicleId())) { + VehicleEntity vehicleEntity = vehicleService.getById(receiptout_item0Entity.getVehicleId()); + if (ObjectUtils.isNotEmpty(vehicleEntity) && StringUtils.isNotEmpty(vehicleEntity.getTicketno())) { + receiptout_item0Entity.setVehicleName(vehicleEntity.getTicketno()); + } } - MaterialEntity materialEntity = materialService.getById(receiptout_item0Entity.getMaterialId()); - if (ObjectUtils.isNotEmpty(materialEntity) && StringUtils.isNotEmpty(materialEntity.getItemName())){ - receiptout_item0Entity.setMaterialName(materialEntity.getItemName()); + if (StringUtils.isNotEmpty(receiptout_item0Entity.getMaterialId())) { + MaterialEntity materialEntity = materialService.getById(receiptout_item0Entity.getMaterialId()); + if (ObjectUtils.isNotEmpty(materialEntity) && StringUtils.isNotEmpty(materialEntity.getItemName())) { + receiptout_item0Entity.setMaterialName(materialEntity.getItemName()); + } } - } + if(StringUtils.isNotEmpty(receiptout_item0Entity.getReservoirareaId())){ + ReservoirareaEntity reservoirareaEntity = reservoirareaService.getById(receiptout_item0Entity.getReservoirareaId()); + if(reservoirareaEntity != null){ + receiptout_item0Entity.setReservoirareaName(reservoirareaEntity.getAreaname()); + } + } + if(StringUtils.isNotEmpty(receiptout_item0Entity.getWarehouseId())){ + WareHouseEntity wareHouseEntity = wareHouseService.getById(receiptout_item0Entity.getWarehouseId()); + if(wareHouseEntity != null){ + receiptout_item0Entity.setWarehouseName(wareHouseEntity.getName()); + } + } + } vo.setReceiptout_item0List(JsonUtil.getJsonToList(Receiptout_item0List,Receiptout_item0Model.class )); //副表 return ActionResult.success(vo); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/Receiptout_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/Receiptout_item0Entity.java index 08b3c950..3e62eeb2 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/Receiptout_item0Entity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/entity/Receiptout_item0Entity.java @@ -129,4 +129,9 @@ public class Receiptout_item0Entity { @TableField(exist = false) private String areaName; + @TableField(exist = false) + private String reservoirareaName; + @TableField(exist = false) + private String warehouseName; + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/Receiptout_item0Model.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/Receiptout_item0Model.java index af496746..e3223393 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/Receiptout_item0Model.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptout/model/receiptout/Receiptout_item0Model.java @@ -1,5 +1,6 @@ package jnpf.receiptout.model.receiptout; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.util.List; import java.util.Date; @@ -72,6 +73,11 @@ public class Receiptout_item0Model { @JsonProperty("materialName") private String materialName; + @TableField("reservoirareaName") + private String reservoirareaName; + @TableField("warehouseName") + private String warehouseName; + } diff --git a/SC-web/src/views/scm/basicInformation/collection/Detail.vue b/SC-web/src/views/scm/basicInformation/collection/Detail.vue index 1c58ba14..64fe061e 100644 --- a/SC-web/src/views/scm/basicInformation/collection/Detail.vue +++ b/SC-web/src/views/scm/basicInformation/collection/Detail.vue @@ -13,21 +13,27 @@ - - + --> + + + - - + --> + + + @@ -137,24 +143,28 @@ - + - + @@ -190,7 +200,7 @@ - + - + - + - + @@ -159,6 +162,9 @@ placeholder="请选择" clearable :field="'reservoirareaId'+scope.$index" interfaceId="399117969575232581" :columnOptions="receiptout_item0reservoirareaIdcolumnOptions" propsValue="id" relationField="name" popupType="dialog" popupWidth="800px" disabled> + @@ -241,17 +247,23 @@ 取 消 确 定 +