From d6583ec2a814b884b496cff65e77a24d2250ac86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= Date: Wed, 12 Apr 2023 17:20:08 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 2 +- .../poundlist/entity/PoundlistEntity.java | 6 +++ .../controller/PurchasebackController.java | 28 ++++++++++++-- .../entity/Purchaseback_item0Entity.java | 3 ++ .../purchaseback/PurchasebackInfoVO.java | 4 ++ .../purchaseback/Purchaseback_item0Model.java | 3 ++ .../controller/PurchaseorderController.java | 10 +++++ .../entity/Purchaseorder_item0Entity.java | 2 + .../PurchaseorderPagination.java | 1 + .../controller/ReceiptinController.java | 37 +++++++++++++++++++ .../model/receiptin/ReceiptinInfoVO.java | 4 ++ .../impl/SaleorderitemServiceImpl.java | 2 +- .../mapper/receiptin/ReceiptinMapper.xml | 6 +-- .../scm/basicInformation/arinvoices/index.vue | 22 +++++------ .../poundlist/PurchaseOrderForm.vue | 27 ++++++++++---- .../basicInformation/purchaseback/Detail.vue | 21 ++++++++--- .../basicInformation/purchaseback/Form.vue | 21 ++++++++--- .../basicInformation/purchaseorder/Detail.vue | 32 +++++++++++----- .../basicInformation/purchaseorder/Form.vue | 28 ++++++++++---- .../scm/basicInformation/receiptin/Detail.vue | 30 ++++++++++----- .../scm/basicInformation/receiptin/Form.vue | 28 ++++++++++---- .../scm/basicInformation/saleorder/index.vue | 28 +++++++------- 22 files changed, 257 insertions(+), 88 deletions(-) diff --git a/SC-boot/linkage-admin/src/main/resources/application-dev.yml b/SC-boot/linkage-admin/src/main/resources/application-dev.yml index b3705b04..2dbd479c 100644 --- a/SC-boot/linkage-admin/src/main/resources/application-dev.yml +++ b/SC-boot/linkage-admin/src/main/resources/application-dev.yml @@ -44,7 +44,7 @@ spring: # 生产环境 # host: 222.71.165.188 # 测试环境 - host: 150.158.169.212 + host: 222.71.165.187 port: 6379 password: qweasd,.123 timeout: 8000 #超时时间(单位：秒) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java index aa624774..9e240516 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java @@ -194,6 +194,12 @@ public class PoundlistEntity { @TableField("IS_EXPENSE") private String isExpense; + @TableField("IS_PAYMENT") + private String isPayment; + + @TableField("IS_TRANSFER") + private String isTransfer; + @TableField(exist = false) private String materialName; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/controller/PurchasebackController.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/controller/PurchasebackController.java index fae27f6f..680e61de 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/controller/PurchasebackController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/controller/PurchasebackController.java @@ -20,6 +20,10 @@ import jnpf.poundlist.service.PoundlistService; import jnpf.purchaseorder.entity.Purchaseorder_item0Entity; import jnpf.purchaseorder.service.Purchaseorder_item0Service; import jnpf.purchaseorder.service.PurchaseorderitemService; +import jnpf.vehicle.entity.VehicleEntity; +import jnpf.vehicle.service.VehicleService; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.transaction.annotation.Transactional; import jnpf.base.entity.ProvinceEntity; import jnpf.purchaseback.model.purchaseback.*; @@ -90,6 +94,8 @@ public class PurchasebackController { private Purchaseorder_item0Service purchaseorder_item0Service; @Autowired private PoundlistService poundlistService; + @Autowired + private VehicleService vehicleService; /** * 列表 @@ -330,6 +336,12 @@ public class PurchasebackController { public ActionResult info(@PathVariable("id") String id){ PurchasebackEntity entity= purchasebackService.getInfo(id); PurchasebackInfoVO vo=JsonUtil.getJsonToBean(entity, PurchasebackInfoVO.class); + if (StringUtils.isNotEmpty(vo.getPurchaseOrderId())){ + PurchaseorderEntity purchaseorderEntity = purchaseorderService.getById(vo.getPurchaseOrderId()); + if (ObjectUtils.isNotEmpty(purchaseorderEntity) && StringUtils.isNotEmpty(purchaseorderEntity.getDocumentNo())){ + vo.setPurchaseOrderName(purchaseorderEntity.getDocumentNo()); + } + } if(vo.getCreatorTime()!=null){ vo.setCreatorTime(vo.getCreatorTime()); } @@ -339,9 +351,19 @@ public class PurchasebackController { List Purchaseback_item0List = purchasebackService.GetPurchaseback_item0List(id); for(Purchaseback_item0Entity purchaseback_item0Entity : Purchaseback_item0List){ Purchaseorder_item0Entity purchaseorder_item0Entity = purchaseorder_item0Service.getById(purchaseback_item0Entity.getPurchaseorderItem0Id()); - PoundlistEntity poundlistEntity = poundlistService.getById(purchaseorder_item0Entity.getPoundlistId()); - purchaseback_item0Entity.setMaterialId(poundlistEntity.getMaterialId()); - purchaseback_item0Entity.setVehicleId(poundlistEntity.getVehicleId()); + if (ObjectUtils.isNotEmpty(purchaseorder_item0Entity)) { + PoundlistEntity poundlistEntity = poundlistService.getById(purchaseorder_item0Entity.getPoundlistId()); + if (ObjectUtils.isNotEmpty(poundlistEntity)) { + purchaseback_item0Entity.setMaterialId(poundlistEntity.getMaterialId()); + purchaseback_item0Entity.setVehicleId(poundlistEntity.getVehicleId()); + if (StringUtils.isNotEmpty(poundlistEntity.getVehicleId())){ + VehicleEntity vehicleEntity = vehicleService.getById(poundlistEntity.getVehicleId()); + if (ObjectUtils.isNotEmpty(vehicleEntity) && StringUtils.isNotEmpty(vehicleEntity.getTicketno())){ + purchaseback_item0Entity.setVehicleName(vehicleEntity.getTicketno()); + } + } + } + } } vo.setPurchaseback_item0List(JsonUtil.getJsonToList(Purchaseback_item0List,Purchaseback_item0Model.class )); //副表 diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/Purchaseback_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/Purchaseback_item0Entity.java index c882a750..42b62f81 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/Purchaseback_item0Entity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/Purchaseback_item0Entity.java @@ -112,4 +112,7 @@ public class Purchaseback_item0Entity { @TableField(exist = false) private PoundlistEntity poundlistEntity; + + @TableField(exist = false) + private String vehicleName; } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackInfoVO.java index a8df30f3..3abd3783 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackInfoVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackInfoVO.java @@ -71,4 +71,8 @@ public class PurchasebackInfoVO{ /** 列表子表数据 **/ @JsonProperty("jg_purchaseorder") private PurchaseorderModel jg_purchaseorder; + + /** 采购订单 **/ + @JsonProperty("purchaseOrderName") + private String purchaseOrderName; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/Purchaseback_item0Model.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/Purchaseback_item0Model.java index 16233c26..ce45d3d0 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/Purchaseback_item0Model.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/Purchaseback_item0Model.java @@ -71,4 +71,7 @@ public class Purchaseback_item0Model { @JsonProperty("materialId") private String materialId; + + @JsonProperty("vehicleName") + private String vehicleName; } 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 9f087e57..3901a42a 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 @@ -49,6 +49,8 @@ import jnpf.supplier.service.SupplierService; import jnpf.util.*; import jnpf.util.enums.FileTypeEnum; import jnpf.util.file.UploadUtil; +import jnpf.vehicle.entity.VehicleEntity; +import jnpf.vehicle.service.VehicleService; import jnpf.warehouse.entity.WareHouseEntity; import jnpf.warehouse.service.WareHouseService; import lombok.Cleanup; @@ -137,6 +139,8 @@ public class PurchaseorderController { private Purchaseback_item0Service purchaseback_item0Service; @Autowired private Receiptin_item0Service receiptin_item0Service; + @Autowired + private VehicleService vehicleService; /** * 归档 @@ -622,6 +626,12 @@ public class PurchaseorderController { //子表 List Purchaseorder_item0List = purchaseorderitemService.GetPurchaseorder_item0List(id); for (Purchaseorder_item0Entity purchaseorder_item0Entity : Purchaseorder_item0List) { + if (StringUtils.isNotEmpty(purchaseorder_item0Entity.getVehicleId())){ + VehicleEntity vehicleEntity = vehicleService.getById(purchaseorder_item0Entity.getVehicleId()); + if (ObjectUtils.isNotEmpty(vehicleEntity) && StringUtils.isNotEmpty(vehicleEntity.getTicketno())){ + purchaseorder_item0Entity.setVehicleName(vehicleEntity.getTicketno()); + } + } if (StringUtils.isNotEmpty(purchaseorder_item0Entity.getMaterialId())) { MaterialEntity materialEntity = materialService.getById(purchaseorder_item0Entity.getMaterialId()); if (materialEntity != null) { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/Purchaseorder_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/Purchaseorder_item0Entity.java index 493c4a1d..a06f2865 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/Purchaseorder_item0Entity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/Purchaseorder_item0Entity.java @@ -144,4 +144,6 @@ public class Purchaseorder_item0Entity { private String warehouseName; @TableField(exist = false) private String reservoirareaName; + @TableField(exist = false) + private String vehicleName; } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPagination.java index 43620f05..24d86c25 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPagination.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPagination.java @@ -27,6 +27,7 @@ public class PurchaseorderPagination extends Pagination { private Date startDate; private Date endDate; + /** * 添加权限 */ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/controller/ReceiptinController.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/controller/ReceiptinController.java index 50972499..283b8c20 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/controller/ReceiptinController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/controller/ReceiptinController.java @@ -15,6 +15,8 @@ import jnpf.base.UserInfo; import jnpf.base.vo.DownloadVO; import jnpf.config.ConfigValueUtil; import jnpf.exception.DataException; +import jnpf.materialvo.entity.MaterialEntity; +import jnpf.materialvo.service.MaterialService; import jnpf.poundlist.entity.PoundlistEntity; import jnpf.poundlist.service.PoundlistService; import jnpf.purchaseback.entity.PurchaseorderEntity; @@ -24,8 +26,13 @@ import jnpf.purchaseorder.entity.PurchaseorderitemEntity; import jnpf.purchaseorder.service.PurchaseorderitemService; import jnpf.reservoirarea.entity.ReservoirareaEntity; import jnpf.reservoirarea.service.ReservoirareaService; +import jnpf.supplier.entity.SupplierEntity; +import jnpf.supplier.service.SupplierService; +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; import jnpf.base.entity.ProvinceEntity; @@ -104,6 +111,12 @@ public class ReceiptinController { private ReservoirareaService reservoirareaService; @Autowired private WareHouseService wareHouseService; + @Autowired + private SupplierService supplierService; + @Autowired + private VehicleService vehicleService; + @Autowired + private MaterialService materialService; /** * 列表 @@ -334,6 +347,18 @@ public class ReceiptinController { public ActionResult info(@PathVariable("id") String id){ ReceiptinEntity entity= receiptinService.getInfo(id); ReceiptinInfoVO vo=JsonUtil.getJsonToBean(entity, ReceiptinInfoVO.class); + if (vo.getSouceno() != null){ + PurchaseorderEntity purchaseorderEntity = purchaseorderService.getById(vo.getSouceno()); + if (ObjectUtils.isNotEmpty(purchaseorderEntity) && StringUtils.isNotEmpty(purchaseorderEntity.getDocumentNo())){ + vo.setSoucenoName(purchaseorderEntity.getDocumentNo()); + } + } + if (vo.getSupplierId() != null){ + SupplierEntity supplierEntity = supplierService.getById(vo.getSupplierId()); + if (ObjectUtils.isNotEmpty(supplierEntity) && StringUtils.isNotEmpty(supplierEntity.getSupplierName())){ + vo.setSuppliername(supplierEntity.getSupplierName()); + } + } if(vo.getCreatorTime()!=null){ vo.setCreatorTime(vo.getCreatorTime()); } @@ -342,6 +367,18 @@ public class ReceiptinController { //子表 List Receiptin_item0List = receiptinService.GetReceiptin_item0List(id); for(Receiptin_item0Entity receiptin_item0Entity : Receiptin_item0List) { + if (StringUtils.isNotEmpty(receiptin_item0Entity.getVehicleId())){ + VehicleEntity vehicleEntity = vehicleService.getById(receiptin_item0Entity.getVehicleId()); + if (vehicleEntity != null){ + receiptin_item0Entity.setVehicleName(vehicleEntity.getTicketno()); + } + } + if (StringUtils.isNotEmpty(receiptin_item0Entity.getMaterialId())){ + MaterialEntity materialEntity = materialService.getById(receiptin_item0Entity.getMaterialId()); + if (materialEntity != null){ + receiptin_item0Entity.setMaterialname(materialEntity.getItemName()); + } + } if (StringUtils.isNotEmpty(receiptin_item0Entity.getReservoirareaId())) { ReservoirareaEntity reservoirareaEntity = reservoirareaService.getById(receiptin_item0Entity.getReservoirareaId()); if (reservoirareaEntity != null) { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinInfoVO.java index bd4b8f6e..a4e77701 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinInfoVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinInfoVO.java @@ -79,4 +79,8 @@ public class ReceiptinInfoVO{ /** 子表数据 **/ @JsonProperty("receiptin_item0List") private List receiptin_item0List; + + @JsonProperty("soucenoName") + private String soucenoName; + } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java index d2f66fc5..4f36a1dd 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java @@ -244,7 +244,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl SELECT a.*,b.document_no purchaseorderSouceno,d.supplier_name supplier from jg_receiptin a - LEFT JOIN jg_purchaseorder b on a.souceno = b.id - LEFT JOIN jg_supplier d on a.supplier_id = d.id - ${ew.customSqlSegment} and a.delete_mark = 0 and b.delete_mark = 0 and d.delete_mark = 0 + LEFT JOIN jg_purchaseorder b on a.souceno = b.id and b.delete_mark = 0 + LEFT JOIN jg_supplier d on a.supplier_id = d.id and d.delete_mark = 0 + ${ew.customSqlSegment} and a.delete_mark = 0 AND a.creator_time > #{receiptinPagination.startDate} AND a.creator_time <= #{receiptinPagination.endDate} diff --git a/SC-web/src/views/scm/basicInformation/arinvoices/index.vue b/SC-web/src/views/scm/basicInformation/arinvoices/index.vue index 20c34907..664b23b9 100644 --- a/SC-web/src/views/scm/basicInformation/arinvoices/index.vue +++ b/SC-web/src/views/scm/basicInformation/arinvoices/index.vue @@ -65,29 +65,29 @@ - - - - - - - - - - @@ -102,7 +102,7 @@ 已审批 - -