From 70a8894243d11f6587f3efc497ebcbe480954817 Mon Sep 17 00:00:00 2001 From: Vayne Date: Sat, 25 Mar 2023 19:15:24 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=94=80=E5=94=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CollectionController.java | 16 +- .../entity/Receiptout_item0Entity.java | 7 + .../controller/SaleorderitemController.java | 136 +- .../entity/Salesorder_item0Entity.java | 3 + .../saleorder/mapper/SaleorderitemMapper.java | 4 + .../Arinvoices_item0soitemModel.java | 8 +- .../saleorderitem/CollectionsoitemModel.java | 4 +- .../saleorderitem/PaymentsoitemModel.java | 4 +- .../saleorderitem/ReceiptoutsoitemModel.java | 13 +- .../saleorderitem/SalesbacksoitemModel.java | 4 +- .../saleorderitem/Salesorder_item0Model.java | 6 + .../service/SaleorderitemService.java | 3 + .../impl/SaleorderitemServiceImpl.java | 10 + .../mapper/collection/CollectionMapper.xml | 16 +- .../mapper/receiptout/ReceiptoutMapper.xml | 3 +- .../mapper/saleback/SalebackMapper.xml | 6 +- .../mapper/salesorderitem/SaleorderMapper.xml | 34 +- .../basicInformation/arinvoices/Detail.vue | 684 +++++--- .../scm/basicInformation/arinvoices/Form.vue | 48 +- .../scm/basicInformation/arinvoices/index.vue | 15 +- .../basicInformation/collection/Detail.vue | 898 ++++++++--- .../scm/basicInformation/collection/Form.vue | 28 + .../scm/basicInformation/collection/index.vue | 31 +- .../basicInformation/receiptout/Detail.vue | 425 +++-- .../scm/basicInformation/receiptout/index.vue | 15 +- .../scm/basicInformation/saleback/Detail.vue | 731 ++++++--- .../scm/basicInformation/saleorder/Detail.vue | 1369 ++++++++++++----- .../scm/basicInformation/saleorder/Form.vue | 4 +- .../saleorder/arinvoicesForm.vue | 24 +- .../scm/basicInformation/saleorder/index.vue | 40 +- 30 files changed, 3378 insertions(+), 1211 deletions(-) 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 b86913a3..2ebbf9ab 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 @@ -115,7 +115,7 @@ public class CollectionController { } /** - * 选完合同，默认显示订单信息 + * 选完客户，默认显示订单信息 * * @param param * @return @@ -137,6 +137,20 @@ public class CollectionController { return ActionResult.success(entity); } + /** + * 选完合同，默认显示订单信息 + * + * @param param + * @return + */ + @GetMapping("/show") + public ActionResult collectionShow(@Param("param") String param) { + ContractFileEntity entity = contractFileService.getInfo(param); + List list = collectionService.querySaleOrderInfo(param); + entity.setSaleorderitemList(list); + return ActionResult.success(entity); + } + /** * 认款 * 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 2036d94e..08b3c950 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 @@ -122,4 +122,11 @@ public class Receiptout_item0Entity { @TableField("MATERIAL_ID") private String materialId; + @TableField(exist = false) + private String vehicleName; + @TableField(exist = false) + private String name; + @TableField(exist = false) + private String areaName; + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java index 0a48841e..3fec7c73 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java @@ -23,6 +23,10 @@ import jnpf.base.vo.DownloadVO; import jnpf.collection.entity.Collection_item0Entity; 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.materialvo.entity.MaterialEntity; import jnpf.materialvo.service.MaterialService; @@ -38,6 +42,7 @@ import jnpf.reservoirarea.entity.ReservoirareaEntity; import jnpf.reservoirarea.service.ReservoirareaService; import jnpf.saleorder.mapper.ReceiptoutsoitemMapper; import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.annotations.Param; import org.springframework.security.core.parameters.P; import org.springframework.transaction.annotation.Transactional; @@ -145,6 +150,10 @@ public class SaleorderitemController { private Arinvoices_item1Service arinvoices_item1Service; @Autowired private Receiptin_item0Service receiptin_item0Service; + @Autowired + private ContractFileService contractFileService; + @Autowired + private CustomerService customerService; /** * 修改磅单单价 @@ -671,6 +680,81 @@ public class SaleorderitemController { for(Salesorder_item0Entity salesorder_item0Entity : Salesorder_item0List){ } vo.setSalesorder_item0List(JsonUtil.getJsonToList(Salesorder_item0List,Salesorder_item0Model.class )); + List jg_receiptoutList = saleorderitemService.GetReceiptoutsoitemList(id); + List jg_receiptoutModelList = new ArrayList<>(); + if (jg_receiptoutList!=null && jg_receiptoutList.size()>0) { + List list = saleorderitemService.queryReceiptoutItemInfo(jg_receiptoutList.get(0).getId()); + jg_receiptoutModelList = JsonUtil.getJsonToList(list, ReceiptoutsoitemModel.class); + for (ReceiptoutsoitemModel jg_receiptoutModel : jg_receiptoutModelList) { + jg_receiptoutModel.setDocumentNo(jg_receiptoutList.get(0).getDocumentNo()); + jg_receiptoutModel.setIssueDate(jg_receiptoutList.get(0).getIssueDate().getTime()); +// Map vehicleIdMap = new HashMap<>(); +// jg_receiptoutModel.setVehicleId(generaterSwapUtil.getPopupSelectValue("398732963950472005","id","ticketno",jg_receiptoutModel.getVehicleId(),vehicleIdMap)); +// Map materialIdMap = new HashMap<>(); +// jg_receiptoutModel.setMaterialId(generaterSwapUtil.getPopupSelectValue("398719564478785669","id","item_name",jg_receiptoutModel.getMaterialId(),materialIdMap)); +// Map reservoirareaIdMap = new HashMap<>(); +// jg_receiptoutModel.setReservoirareaId(generaterSwapUtil.getPopupSelectValue("392939299932268421","id","areaname",jg_receiptoutModel.getReservoirareaId(),reservoirareaIdMap)); +// Map warehouseMap = new HashMap<>(); +// jg_receiptoutModel.setWarehouseId(generaterSwapUtil.getPopupSelectValue("399117969575232581","id","name",jg_receiptoutModel.getWarehouseId(),warehouseMap)); + } + } + vo.setReceiptoutsoitemList(jg_receiptoutModelList); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(ArinvoicesEntity::getSalesOrderId,id); + ArinvoicesEntity arinvoicesEntity = arinvoicesService.getOne(queryWrapper); + List jg_arinvoices_item0ModelList = new ArrayList<>(); + if (ObjectUtils.isNotEmpty(arinvoicesEntity)) { + List jg_arinvoices_item0List = saleorderitemService.GetArinvoices_item0soitemList(arinvoicesEntity.getId()); + jg_arinvoices_item0ModelList = JsonUtil.getJsonToList(jg_arinvoices_item0List, Arinvoices_item0soitemModel.class); + for (Arinvoices_item0soitemModel jg_arinvoices_item0Model : jg_arinvoices_item0ModelList) { + jg_arinvoices_item0Model.setAttachMent(generaterSwapUtil.getFileNameInJson(jg_arinvoices_item0Model.getAttachMent())); + } + } + vo.setArinvoices_item0soitemList(jg_arinvoices_item0ModelList); + QueryWrapper queryWrapper1 = new QueryWrapper<>(); + queryWrapper1.lambda().eq(Collection_item0Entity::getSalesorderId,id); + List collection_item0Entity = collection_item0Service.list(queryWrapper1); + List collectionsoitemEntityList = new ArrayList<>(); + if (collection_item0Entity.size()>0) { + for (Collection_item0Entity collection_item0Entity1 : collection_item0Entity) { + List jg_collectionList = saleorderitemService.GetCollectionsoitemList(collection_item0Entity1.getCollectionId()); + collectionsoitemEntityList.addAll(jg_collectionList); + } + } + List jg_collectionModelList = JsonUtil.getJsonToList(collectionsoitemEntityList, CollectionsoitemModel.class); + for (CollectionsoitemModel jg_collectionModel : jg_collectionModelList) { + } + vo.setCollectionsoitemList(jg_collectionModelList); + List jg_salesbackList = saleorderitemService.GetSalesbacksoitemList(id); + List jg_salesbackModelList = JsonUtil.getJsonToList(jg_salesbackList,SalesbacksoitemModel.class); + for(SalesbacksoitemModel jg_salesbackModel : jg_salesbackModelList){ + } + vo.setSalesbacksoitemList(jg_salesbackModelList); + List jg_paymentList = saleorderitemService.GetPaymentsoitemList(id); + List jg_paymentModelList = JsonUtil.getJsonToList(jg_paymentList,PaymentsoitemModel.class); + for(PaymentsoitemModel jg_paymentModel : jg_paymentModelList){ + } + vo.setPaymentsoitemList(jg_paymentModelList); + List poundlist = saleorderitemService.GetPoundlistList(id); + vo.setPoundlistentityList(poundlist); + + //附表数据转换 + +//添加到详情表单对象中 +// ContractFileEntity contractFileEntity = contractFileService.getInfo(vo.getContractId()); +// if (ObjectUtils.isNotEmpty(contractFileEntity) && StringUtils.isNotEmpty(contractFileEntity.getContractName())){ +// vo.setContractId(contractFileEntity.getContractName()); +// } +// CustomerEntity customerEntity = customerService.getInfo(vo.getCustomerId()); +// if (ObjectUtils.isNotEmpty(customerEntity) && StringUtils.isNotEmpty(customerEntity.getSupplierNm())){ +// vo.setCustomerId(customerEntity.getSupplierNm()); +// } +// Map contractCodeMap = new HashMap<>(); +// vo.setContractId(generaterSwapUtil.getPopupSelectValue("391146878474963333","id","contract_name",vo.getContractId(),contractCodeMap)); +// Map costomerCodeMap = new HashMap<>(); +// vo.setCustomerId(generaterSwapUtil.getPopupSelectValue("398016916830126469","id","supplier_nm",vo.getCustomerId(),costomerCodeMap)); +// vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName())); +// vo.setCreatorTime(vo.getCreatorTime()); // List ReceiptoutsoitemList = saleorderitemService.GetReceiptoutsoitemList(id); // for(ReceiptoutsoitemEntity receiptoutsoitemEntity : ReceiptoutsoitemList){ @@ -711,31 +795,31 @@ public class SaleorderitemController { SaleorderitemEntity entity= saleorderitemService.getInfo(id); SaleorderitemInfoVO vo=JsonUtil.getJsonToBean(entity, SaleorderitemInfoVO.class); //子表数据转换 - List jg_salesorder_item0List = saleorderitemService.GetSalesorder_item0List(id); + List jg_salesorder_item0List = saleorderitemService.querySaleOrderItemInfo(id); List jg_salesorder_item0ModelList = JsonUtil.getJsonToList(jg_salesorder_item0List,Salesorder_item0Model.class); - for(Salesorder_item0Model jg_salesorder_item0Model : jg_salesorder_item0ModelList){ - Map vehicleIdMap = new HashMap<>(); - jg_salesorder_item0Model.setVehicleId(generaterSwapUtil.getPopupSelectValue("381432451370615173","id","ticketno",jg_salesorder_item0Model.getVehicleId(),vehicleIdMap)); - Map materialIdMap = new HashMap<>(); - jg_salesorder_item0Model.setMaterialId(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","item_name",jg_salesorder_item0Model.getMaterialId(),materialIdMap)); - } +// for(Salesorder_item0Model jg_salesorder_item0Model : jg_salesorder_item0ModelList){ +// Map vehicleIdMap = new HashMap<>(); +// jg_salesorder_item0Model.setVehicleId(generaterSwapUtil.getPopupSelectValue("381432451370615173","id","ticketno",jg_salesorder_item0Model.getVehicleId(),vehicleIdMap)); +// Map materialIdMap = new HashMap<>(); +// jg_salesorder_item0Model.setMaterialId(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","item_name",jg_salesorder_item0Model.getMaterialId(),materialIdMap)); +// } vo.setSalesorder_item0List(jg_salesorder_item0ModelList); List jg_receiptoutList = saleorderitemService.GetReceiptoutsoitemList(id); List jg_receiptoutModelList = new ArrayList<>(); - if (jg_receiptoutList.size()>0) { - List list = saleorderitemService.getReceiptout(jg_receiptoutList.get(0).getId()); + if (jg_receiptoutList!=null && jg_receiptoutList.size()>0) { + List list = saleorderitemService.queryReceiptoutItemInfo(jg_receiptoutList.get(0).getId()); jg_receiptoutModelList = JsonUtil.getJsonToList(list, ReceiptoutsoitemModel.class); for (ReceiptoutsoitemModel jg_receiptoutModel : jg_receiptoutModelList) { jg_receiptoutModel.setDocumentNo(jg_receiptoutList.get(0).getDocumentNo()); - jg_receiptoutModel.setIssueDate(jg_receiptoutList.get(0).getIssueDate()); - Map vehicleIdMap = new HashMap<>(); - jg_receiptoutModel.setVehicleId(generaterSwapUtil.getPopupSelectValue("398732963950472005","id","ticketno",jg_receiptoutModel.getVehicleId(),vehicleIdMap)); - Map materialIdMap = new HashMap<>(); - jg_receiptoutModel.setMaterialId(generaterSwapUtil.getPopupSelectValue("398719564478785669","id","item_name",jg_receiptoutModel.getMaterialId(),materialIdMap)); - Map reservoirareaIdMap = new HashMap<>(); - jg_receiptoutModel.setReservoirareaId(generaterSwapUtil.getPopupSelectValue("392939299932268421","id","areaname",jg_receiptoutModel.getReservoirareaId(),reservoirareaIdMap)); - Map warehouseMap = new HashMap<>(); - jg_receiptoutModel.setWarehouseId(generaterSwapUtil.getPopupSelectValue("399117969575232581","id","name",jg_receiptoutModel.getWarehouseId(),warehouseMap)); + jg_receiptoutModel.setIssueDate(jg_receiptoutList.get(0).getIssueDate().getTime()); +// Map vehicleIdMap = new HashMap<>(); +// jg_receiptoutModel.setVehicleId(generaterSwapUtil.getPopupSelectValue("398732963950472005","id","ticketno",jg_receiptoutModel.getVehicleId(),vehicleIdMap)); +// Map materialIdMap = new HashMap<>(); +// jg_receiptoutModel.setMaterialId(generaterSwapUtil.getPopupSelectValue("398719564478785669","id","item_name",jg_receiptoutModel.getMaterialId(),materialIdMap)); +// Map reservoirareaIdMap = new HashMap<>(); +// jg_receiptoutModel.setReservoirareaId(generaterSwapUtil.getPopupSelectValue("392939299932268421","id","areaname",jg_receiptoutModel.getReservoirareaId(),reservoirareaIdMap)); +// Map warehouseMap = new HashMap<>(); +// jg_receiptoutModel.setWarehouseId(generaterSwapUtil.getPopupSelectValue("399117969575232581","id","name",jg_receiptoutModel.getWarehouseId(),warehouseMap)); } } vo.setReceiptoutsoitemList(jg_receiptoutModelList); @@ -781,10 +865,18 @@ public class SaleorderitemController { //附表数据转换 //添加到详情表单对象中 - Map contractCodeMap = new HashMap<>(); - vo.setContractId(generaterSwapUtil.getPopupSelectValue("391146878474963333","id","contract_name",vo.getContractId(),contractCodeMap)); - Map costomerCodeMap = new HashMap<>(); - vo.setCustomerId(generaterSwapUtil.getPopupSelectValue("398016916830126469","id","supplier_nm",vo.getCustomerId(),costomerCodeMap)); + ContractFileEntity contractFileEntity = contractFileService.getInfo(vo.getContractId()); + if (ObjectUtils.isNotEmpty(contractFileEntity) && StringUtils.isNotEmpty(contractFileEntity.getContractName())){ + vo.setContractId(contractFileEntity.getContractName()); + } + CustomerEntity customerEntity = customerService.getInfo(vo.getCustomerId()); + if (ObjectUtils.isNotEmpty(customerEntity) && StringUtils.isNotEmpty(customerEntity.getSupplierNm())){ + vo.setCustomerId(customerEntity.getSupplierNm()); + } +// Map contractCodeMap = new HashMap<>(); +// vo.setContractId(generaterSwapUtil.getPopupSelectValue("391146878474963333","id","contract_name",vo.getContractId(),contractCodeMap)); +// Map costomerCodeMap = new HashMap<>(); +// vo.setCustomerId(generaterSwapUtil.getPopupSelectValue("398016916830126469","id","supplier_nm",vo.getCustomerId(),costomerCodeMap)); vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName())); vo.setCreatorTime(vo.getCreatorTime()); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Salesorder_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Salesorder_item0Entity.java index c75f5c8f..84530a82 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Salesorder_item0Entity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Salesorder_item0Entity.java @@ -151,6 +151,9 @@ public class Salesorder_item0Entity { @TableField(exist = false) private String batchNo; + @TableField(exist = false) + private String vehicleName; + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SaleorderitemMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SaleorderitemMapper.java index 069f9d13..e87b6328 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SaleorderitemMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SaleorderitemMapper.java @@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jnpf.poundlist.entity.PoundlistEntity; import jnpf.poundlist.model.poundlist.PoundlistPagination; +import jnpf.receiptout.entity.Receiptout_item0Entity; import jnpf.saleorder.entity.SaleorderitemEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import jnpf.saleorder.entity.Salesorder_item0Entity; import jnpf.saleorder.model.saleorderitem.SaleorderitemPagination; import org.apache.ibatis.annotations.Param; @@ -23,5 +25,7 @@ import java.util.List; public interface SaleorderitemMapper extends BaseMapper { IPage querySalesOrder(@Param("page") Page page, @Param("saleorderitemPagination") SaleorderitemPagination saleorderitemPagination); PoundlistEntity queryPoundlist(String poundlistId); + List querySaleOrderItem(String id); + List queryReceiptoutItem(String id); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/Arinvoices_item0soitemModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/Arinvoices_item0soitemModel.java index 083e1935..aa6ec867 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/Arinvoices_item0soitemModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/Arinvoices_item0soitemModel.java @@ -27,6 +27,10 @@ public class Arinvoices_item0soitemModel { @JsonProperty("invoiceCode") private String invoiceCode; + /** 金额 **/ + @JsonProperty("invoiceQuantity") + private String invoiceQuantity; + /** 金额 **/ @JsonProperty("involceAmount") private String involceAmount; @@ -48,9 +52,9 @@ public class Arinvoices_item0soitemModel { private String invoiceStatus; /** 开票日期 **/ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @JsonProperty("invoiceDate") - private Date invoiceDate; + private Long invoiceDate; /** 开票人 **/ @JsonProperty("creatorUserName") private String creatorUserName; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/CollectionsoitemModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/CollectionsoitemModel.java index c12a5487..7d0020d3 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/CollectionsoitemModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/CollectionsoitemModel.java @@ -24,9 +24,9 @@ public class CollectionsoitemModel { private String documentNo; /** 收款时间 **/ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @JsonProperty("businessDate") - private Date businessDate; + private Long businessDate; /** 收款金额 **/ @JsonProperty("amountCollected") private String amountCollected; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/PaymentsoitemModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/PaymentsoitemModel.java index 8abca305..cc6b1dca 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/PaymentsoitemModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/PaymentsoitemModel.java @@ -24,9 +24,9 @@ public class PaymentsoitemModel { private String documentno; /** 付款日期 **/ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @JsonProperty("duedate") - private Date duedate; + private Long duedate; /** 付款金额 **/ @JsonProperty("paymentamount") private String paymentamount; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/ReceiptoutsoitemModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/ReceiptoutsoitemModel.java index 35394b0f..28c715bc 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/ReceiptoutsoitemModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/ReceiptoutsoitemModel.java @@ -25,9 +25,9 @@ public class ReceiptoutsoitemModel { private String documentNo; /** 出库日期 **/ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @JsonProperty("issueDate") - private Date issueDate; + private Long issueDate; /** 车牌号 **/ @JsonProperty("vehicleId") private String vehicleId; @@ -80,6 +80,15 @@ public class ReceiptoutsoitemModel { @JsonProperty("poundType") private String poundType; + @JsonProperty("vehicleName") + private String vehicleName; + @JsonProperty("materialName") + private String materialName; + @JsonProperty("name") + private String name; + @JsonProperty("areaName") + private String areaName; + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SalesbacksoitemModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SalesbacksoitemModel.java index bf235824..912f321a 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SalesbacksoitemModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SalesbacksoitemModel.java @@ -24,9 +24,9 @@ public class SalesbacksoitemModel { private String documentNo; /** 退货日期 **/ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") +// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @JsonProperty("creatorTime") - private Date creatorTime; + private Long creatorTime; /** 退货数量 **/ @JsonProperty("refundNum") private String refundNum; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/Salesorder_item0Model.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/Salesorder_item0Model.java index 34f68160..9c054204 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/Salesorder_item0Model.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/Salesorder_item0Model.java @@ -77,5 +77,11 @@ public class Salesorder_item0Model { @JsonProperty("businessId") private String businessId; + @JsonProperty("vehicleName") + private String vehicleName; + + @JsonProperty("materialName") + private String materialName; + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/SaleorderitemService.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/SaleorderitemService.java index 5735badf..83274a59 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/SaleorderitemService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/SaleorderitemService.java @@ -42,6 +42,9 @@ public interface SaleorderitemService extends IService { List getReceiptout(String id); + List querySaleOrderItemInfo(String id); + + List queryReceiptoutItemInfo(String id); //列表子表数据方法 } 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 b6622cbc..6528bf7b 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 @@ -560,6 +560,16 @@ public class SaleorderitemServiceImpl extends ServiceImpl querySaleOrderItemInfo(String id) { + return saleorderitemMapper.querySaleOrderItem(id); + } + + @Override + public List queryReceiptoutItemInfo(String id) { + return saleorderitemMapper.queryReceiptoutItem(id); + } + //列表子表数据方法 diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/collection/CollectionMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/collection/CollectionMapper.xml index cf6f40ae..a01b105f 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/collection/CollectionMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/collection/CollectionMapper.xml @@ -10,15 +10,15 @@ diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml index 0ccf5d64..6044179a 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml @@ -12,7 +12,7 @@ left join jg_contract b on a.contract_id = b.id left join jg_customer c on a.customer_id = c.id where 1=1 - and a.delete_mark = '0' + and a.delete_mark = '0' and b.delete_mark = '0' and c.delete_mark = '0' /*添加权限*/ AND a.department_id = #{saleorderitemPagination.departmentId} @@ -63,8 +63,38 @@ FROM LEFT JOIN jg_contract g ON a.purchase_id = g.id LEFT JOIN base_user h ON a.business_id = h.f_id LEFT JOIN jg_natural i ON a.natural_id = i.id - where a.delete_mark = '0' + where a.delete_mark = '0' and b.delete_mark = '0' and c.delete_mark = '0' and d.delete_mark = '0' and e.delete_mark = '0' and f.delete_mark = '0' and g.delete_mark = '0' and i.delete_mark = '0' and a.id = #{poundlistId} + + + + diff --git a/SC-web/src/views/scm/basicInformation/arinvoices/Detail.vue b/SC-web/src/views/scm/basicInformation/arinvoices/Detail.vue index 38379a20..41743fad 100644 --- a/SC-web/src/views/scm/basicInformation/arinvoices/Detail.vue +++ b/SC-web/src/views/scm/basicInformation/arinvoices/Detail.vue @@ -1,83 +1,118 @@