diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java index 11162959..3e3c095f 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java @@ -96,8 +96,14 @@ public class PoundlistController { PoundlistEntity poundlistEntity = poundlistService.getOne(queryWrapper); if (ObjectUtils.isNotEmpty(poundlistEntity)) { ContractFileEntity entity = contractFileService.getInfo(poundlistEntity.getSalesId()); - poundlistEntity.setContractNo(entity.getContractNo()); + if (entity!=null && StringUtils.isNotEmpty(entity.getContractNo())) { + poundlistEntity.setContractNo(entity.getContractNo()); + } poundlistEntity.setDocumentNo(generaterSwapUtil.getBillNumber("salesOrder", false)); + poundlistEntity.setRate("0"); + if (poundlistEntity.getSalesPrice()!=null) { + poundlistEntity.setUnitPrice(poundlistEntity.getSalesPrice()); + } list.add(poundlistEntity); } } 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 82c62d4f..ccca92f0 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 @@ -213,4 +213,12 @@ public class PoundlistEntity { private String purchaseContractNo; @TableField(exist = false) private String documentNo; + @TableField(exist = false) + private String rate; + @TableField(exist = false) + private BigDecimal unitPrice; + @TableField(exist = false) + private BigDecimal noPrice; + @TableField(exist = false) + private BigDecimal price; } 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 d3a23f65..2fb90fcd 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 @@ -182,13 +182,16 @@ public class PurchaseorderController { public ActionResult list(@RequestBody PurchaseorderPagination purchaseorderPagination)throws IOException{ List list= purchaseorderitemService.getList(purchaseorderPagination); //处理id字段转名称，若无需转或者为空可删除 - for(PurchaseorderitemEntity entity:list){ + /*for(PurchaseorderitemEntity entity:list){ Map contractCodeMap = new HashMap<>(); entity.setContractName(generaterSwapUtil.getPopupSelectValue("390143765857220229","id","contract_name",entity.getContractCode(),contractCodeMap)); Map supplierIdMap = new HashMap<>(); entity.setSupplierName(generaterSwapUtil.getPopupSelectValue("397751667988199621","id","supplier_name",entity.getSupplierId(),supplierIdMap)); + + + entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName())); - } + }*/ List listVO=JsonUtil.getJsonToList(list,PurchaseorderListVO.class); for(PurchaseorderListVO purchaseorderVO:listVO){ } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PurchaseorderitemMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PurchaseorderitemMapper.java index 3de8063d..f3ae0d21 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PurchaseorderitemMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PurchaseorderitemMapper.java @@ -3,8 +3,11 @@ package jnpf.purchaseorder.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jnpf.mobilePort.entity.PurchaseOrderVO; import jnpf.purchaseorder.entity.PurchaseorderitemEntity; +import jnpf.purchaseorder.model.purchaseorder.PurchaseorderPagination; import org.apache.ibatis.annotations.Param; import java.util.HashMap; @@ -23,4 +26,5 @@ public interface PurchaseorderitemMapper extends BaseMapper> getPdfInfo(@Param("ew")Wrapper queryWrapper); List> getWordExcelInfo(@Param("ew")Wrapper queryWrapper); List> getVehicleInfo(@Param("ew")Wrapper queryWrapper); + IPage queryByKeyword(@Param("page") Page page, @Param("purchaseorderPagination") PurchaseorderPagination purchaseorderPagination); } 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 abd5a820..2a9166e2 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 @@ -3,6 +3,8 @@ package jnpf.purchaseorder.model.purchaseorder; import lombok.Data; import jnpf.base.Pagination; + +import java.util.Date; import java.util.List; /** @@ -22,6 +24,8 @@ public class PurchaseorderPagination extends Pagination { private String supplierName; private List creatorTime; private String status; + private Date startDate; + private Date endDate; /** * 菜单id */ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java index 7450502c..b06f7b11 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java @@ -23,6 +23,8 @@ import jnpf.base.controller.BillRuleController; import jnpf.base.entity.ProvinceEntity; import jnpf.base.mapper.ProvinceMapper; import jnpf.config.ConfigValueUtil; +import jnpf.contractfile.entity.ContractFileEntity; +import jnpf.contractfile.service.ContractFileService; import jnpf.customer.entity.CustomerEntity; import jnpf.customer.mapper.CustomerVMapper; import jnpf.exception.DataException; @@ -839,19 +841,89 @@ if (pMap!=null&&pMap.size()>0){ } + } } - } - if(StringUtil.isNotEmpty(purchaseorderPagination.getDocumentNo())){ + if(StringUtil.isNotEmpty(purchaseorderPagination.getCreatorTime())){ + List PoundDateList = purchaseorderPagination.getCreatorTime(); + Long fir = Long.valueOf(PoundDateList.get(0)); + Long sec = Long.valueOf(PoundDateList.get(1)); + purchaseorderPagination.setStartDate(new Date(fir)); + purchaseorderPagination.setEndDate(DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); + } + if(StringUtil.isEmpty(purchaseorderPagination.getSidx())){ + purchaseorderPagination.setSidx("CREATOR_TIME"); + purchaseorderPagination.setSort("DESC"); + }else{ + try { + String sidx = purchaseorderPagination.getSidx(); + PoundlistEntity poundlistEntity = new PoundlistEntity(); + Field declaredField = poundlistEntity.getClass().getDeclaredField(sidx); + declaredField.setAccessible(true); + String value = declaredField.getAnnotation(TableField.class).value(); + purchaseorderPagination.setSidx(value); + } catch (NoSuchFieldException e) { + e.printStackTrace(); + } + } + Page page=new Page<>(purchaseorderPagination.getCurrentPage(), purchaseorderPagination.getPageSize()); + IPage iPage = purchaseorderitemMapper.queryByKeyword(page, purchaseorderPagination); + return purchaseorderPagination.setData(iPage.getRecords(),iPage.getTotal()); + + + + + + + + /*if(StringUtil.isNotEmpty(purchaseorderPagination.getDocumentNo())){ purchaseorderNum++; purchaseorderQueryWrapper.lambda().like(PurchaseorderitemEntity::getDocumentNo,purchaseorderPagination.getDocumentNo()); - } + } + if(StringUtil.isNotEmpty(purchaseorderPagination.getStatus())){ + purchaseorderNum++; + purchaseorderQueryWrapper.lambda().like(PurchaseorderitemEntity::getStatus,purchaseorderPagination.getStatus()); + } + if(StringUtil.isNotEmpty(purchaseorderPagination.getCreatorTime())){ + purchaseorderNum++; + List PoundDateList = purchaseorderPagination.getCreatorTime(); + Long fir = Long.valueOf(PoundDateList.get(0)); + Long sec = Long.valueOf(PoundDateList.get(1)); + + purchaseorderQueryWrapper.lambda().ge(PurchaseorderitemEntity::getCreatorTime, new Date(fir)) + .le(PurchaseorderitemEntity::getCreatorTime, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); + + } + if(StringUtil.isNotEmpty(purchaseorderPagination.getPurchaseName())){ + QueryWrapper contractFileQueryWrapper =new QueryWrapper<>(); + contractFileQueryWrapper.lambda().like(ContractFileEntity::getContractName, purchaseorderPagination.getPurchaseName()); + contractFileQueryWrapper.lambda().select(ContractFileEntity::getId); + List customerIdList = contractFileService.listObjs(contractFileQueryWrapper).stream().map(o -> (String) o).collect(Collectors.toList()); + purchaseorderNum++; + if(customerIdList.size() > 0){ + purchaseorderQueryWrapper.lambda().in(PurchaseorderitemEntity::getContractCode,customerIdList); + }else{ + purchaseorderQueryWrapper.lambda().eq(PurchaseorderitemEntity::getContractCode, purchaseorderPagination.getPurchaseName()); + } + } + if(StringUtil.isNotEmpty(purchaseorderPagination.getSupplierName())){ + QueryWrapper customerQueryWrapper =new QueryWrapper<>(); + customerQueryWrapper.lambda().like(SupplierEntity::getSupplierName, purchaseorderPagination.getSupplierName()); + customerQueryWrapper.lambda().select(SupplierEntity::getId); + List customerIdList = supplierService.listObjs(customerQueryWrapper).stream().map(o -> (String) o).collect(Collectors.toList()); + purchaseorderNum++; + if(customerIdList.size() > 0){ + purchaseorderQueryWrapper.lambda().in(PurchaseorderitemEntity::getSupplierId,customerIdList); + }else{ + purchaseorderQueryWrapper.lambda().eq(PurchaseorderitemEntity::getSupplierId, purchaseorderPagination.getSupplierName()); + } + } if(AllIdList.size()>0){ purchaseorderQueryWrapper.lambda().in(PurchaseorderitemEntity::getId, AllIdList); } //排序 if(StringUtil.isEmpty(purchaseorderPagination.getSidx())){ - purchaseorderQueryWrapper.lambda().orderByDesc(PurchaseorderitemEntity::getId); + purchaseorderQueryWrapper.lambda().orderByDesc(PurchaseorderitemEntity::getId); }else{ try { String sidx = purchaseorderPagination.getSidx(); @@ -865,13 +937,13 @@ if (pMap!=null&&pMap.size()>0){ } } if((total>0 && AllIdList.size()>0) || total==0){ - Page page=new Page<>(purchaseorderPagination.getCurrentPage(), purchaseorderPagination.getPageSize()); - IPage userIPage=this.page(page, purchaseorderQueryWrapper); - return purchaseorderPagination.setData(userIPage.getRecords(),userIPage.getTotal()); + Page page=new Page<>(purchaseorderPagination.getCurrentPage(), purchaseorderPagination.getPageSize()); + IPage userIPage=this.page(page, purchaseorderQueryWrapper); + return purchaseorderPagination.setData(userIPage.getRecords(),userIPage.getTotal()); }else{ List list = new ArrayList(); return purchaseorderPagination.setData(list, list.size()); - } + }*/ } @Override public List getTypeList(PurchaseorderPagination purchaseorderPagination, String dataType){ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/SalebackEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/SalebackEntity.java index ab27e62f..97920346 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/SalebackEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/entity/SalebackEntity.java @@ -87,4 +87,11 @@ public class SalebackEntity { @TableField("STATUS") private String status; + @TableField(exist = false) + private String contractName; + @TableField(exist = false) + private String customerName; + @TableField(exist = false) + private String saledocumentNo; + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/mapper/SalebackMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/mapper/SalebackMapper.java index becf73d1..988e057d 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/mapper/SalebackMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/mapper/SalebackMapper.java @@ -1,8 +1,14 @@ package jnpf.saleback.mapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jnpf.saleback.entity.SalebackEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import jnpf.saleback.model.saleback.SalebackPagination; +import jnpf.saleorder.entity.SaleorderitemEntity; +import jnpf.saleorder.model.saleorderitem.SaleorderitemPagination; +import org.apache.ibatis.annotations.Param; /** * @@ -13,5 +19,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 日期： 2023-01-13 */ public interface SalebackMapper extends BaseMapper { - + IPage querySaleBack(@Param("page") Page page, @Param("salebackPagination") SalebackPagination salebackPagination); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackListVO.java index bb1eed37..2be35977 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackListVO.java @@ -3,6 +3,7 @@ package jnpf.saleback.model.saleback; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.sql.Time; import java.util.Date; @@ -74,6 +75,13 @@ public class SalebackListVO{ @JsonProperty("creatorUserName") private String creatorUserName; + @TableField(exist = false) + private String contractName; + @TableField(exist = false) + private String customerName; + @TableField(exist = false) + private String saledocumentNo; + // // /**列表子表数据 */ // @JsonProperty("jg_salesorder") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackPagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackPagination.java index 5a1f2caf..b04b6553 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackPagination.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackPagination.java @@ -3,6 +3,8 @@ package jnpf.saleback.model.saleback; import lombok.Data; import jnpf.base.Pagination; + +import java.util.Date; import java.util.List; /** @@ -18,6 +20,13 @@ public class SalebackPagination extends Pagination { /** 单据编号 */ private String documentNo; + + private String saledocumentNo; + + private String status; + + private Date startDate; + private Date endDate; /** * 菜单id */ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/SalebackServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/SalebackServiceImpl.java index 90de0a6f..387c7e33 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/SalebackServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/SalebackServiceImpl.java @@ -54,6 +54,8 @@ public class SalebackServiceImpl extends ServiceImpl0 && AllIdList.size()>0) || total==0){ Page page=new Page<>(salebackPagination.getCurrentPage(), salebackPagination.getPageSize()); - IPage userIPage=this.page(page, salebackQueryWrapper); + IPage userIPage=salebackMapper.querySaleBack(page, salebackPagination); return salebackPagination.setData(userIPage.getRecords(),userIPage.getTotal()); - }else{ - List list = new ArrayList(); - return salebackPagination.setData(list, list.size()); - } } @Override public List getTypeList(SalebackPagination salebackPagination,String dataType){ 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 ce151f46..ffa4ce84 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 @@ -392,18 +392,14 @@ public class SaleorderitemController { List list= saleorderitemService.getList(saleorderitemPagination); //处理id字段转名称，若无需转或者为空可删除 for(SaleorderitemEntity entity:list){ - Map contractCodeMap = new HashMap<>(); - entity.setContractId(generaterSwapUtil.getPopupSelectValue("391146878474963333","id","contract_name",entity.getContractId(),contractCodeMap)); - Map costomerCodeMap = new HashMap<>(); - entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("398016916830126469","id","supplier_nm",entity.getCustomerId(),costomerCodeMap)); +// Map contractCodeMap = new HashMap<>(); +// entity.setContractId(generaterSwapUtil.getPopupSelectValue("391146878474963333","id","contract_name",entity.getContractId(),contractCodeMap)); +// Map costomerCodeMap = new HashMap<>(); +// entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("398016916830126469","id","supplier_nm",entity.getCustomerId(),costomerCodeMap)); entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName())); // entity.setCreatorTime(generaterSwapUtil.userSelectValue(entity.getCreatorTime())); } List listVO=JsonUtil.getJsonToList(list,SaleorderitemListVO.class); - for(SaleorderitemListVO saleorderitemVO:listVO){ - } - - PageListVO vo=new PageListVO(); vo.setList(listVO); PaginationVO page=JsonUtil.getJsonToBean(saleorderitemPagination,PaginationVO.class); @@ -723,7 +719,7 @@ public class SaleorderitemController { 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()); + 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<>(); @@ -771,6 +767,8 @@ public class SaleorderitemController { for(PaymentsoitemModel jg_paymentModel : jg_paymentModelList){ } vo.setPaymentsoitemList(jg_paymentModelList); + List poundlist = saleorderitemService.GetPoundlistList(id); + vo.setPoundlistentityList(poundlist); //附表数据转换 diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SaleorderitemEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SaleorderitemEntity.java index c50a862d..6b8e75a7 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SaleorderitemEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SaleorderitemEntity.java @@ -87,8 +87,8 @@ public class SaleorderitemEntity { // @TableField("CONTRACT_CODE") // private String contractCode; - @TableField("CONTRACT_NAME") - private String contractName; +// @TableField("CONTRACT_NAME") +// private String contractName; @TableField("CONTRACT_NO") private String contractNo; @@ -96,8 +96,8 @@ public class SaleorderitemEntity { // @TableField("COSTOMER_CODE") // private String costomerCode; - @TableField("COSTOMER_NAME") - private String costomerName; +// @TableField("COSTOMER_NAME") +// private String costomerName; @TableField("NUM") private BigDecimal num; @@ -170,5 +170,9 @@ public class SaleorderitemEntity { @TableField(exist = false) private BigDecimal amount; + @TableField(exist = false) + private String contractName; + @TableField(exist = false) + private String customerName; } 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 69d7d4e6..069f9d13 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 @@ -1,8 +1,16 @@ package jnpf.saleorder.mapper; +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.saleorder.entity.SaleorderitemEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import jnpf.saleorder.model.saleorderitem.SaleorderitemPagination; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @@ -13,5 +21,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 日期： 2023-02-22 */ public interface SaleorderitemMapper extends BaseMapper { + IPage querySalesOrder(@Param("page") Page page, @Param("saleorderitemPagination") SaleorderitemPagination saleorderitemPagination); + PoundlistEntity queryPoundlist(String poundlistId); } 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 3bc144ff..083e1935 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 @@ -1,5 +1,6 @@ package jnpf.saleorder.model.saleorderitem; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.util.List; import java.util.Date; @@ -47,8 +48,9 @@ public class Arinvoices_item0soitemModel { private String invoiceStatus; /** 开票日期 **/ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @JsonProperty("invoiceDate") - private Long invoiceDate; + private Date 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 3c64ccc2..c12a5487 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 @@ -1,5 +1,6 @@ package jnpf.saleorder.model.saleorderitem; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.util.List; import java.util.Date; @@ -23,8 +24,9 @@ public class CollectionsoitemModel { private String documentNo; /** 收款时间 **/ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @JsonProperty("businessDate") - private Long businessDate; + private Date 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 6cf2f864..8abca305 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 @@ -1,5 +1,6 @@ package jnpf.saleorder.model.saleorderitem; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.util.List; import java.util.Date; @@ -23,8 +24,9 @@ public class PaymentsoitemModel { private String documentno; /** 付款日期 **/ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @JsonProperty("duedate") - private Long duedate; + private Date 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 a755fffc..35394b0f 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 @@ -1,6 +1,7 @@ package jnpf.saleorder.model.saleorderitem; import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.util.List; import java.util.Date; @@ -24,8 +25,9 @@ public class ReceiptoutsoitemModel { private String documentNo; /** 出库日期 **/ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @JsonProperty("issueDate") - private Long issueDate; + private Date issueDate; /** 车牌号 **/ @JsonProperty("vehicleId") private String vehicleId; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemInfoVO.java index c94dee0c..465f73d2 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemInfoVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemInfoVO.java @@ -4,6 +4,7 @@ package jnpf.saleorder.model.saleorderitem; import com.baomidou.mybatisplus.annotation.TableField; +import jnpf.poundlist.entity.PoundlistEntity; import jnpf.saleorder.model.saleorderitem.Salesorder_item0Model; import jnpf.saleorder.model.saleorderitem.ReceiptoutsoitemModel; import jnpf.saleorder.model.saleorderitem.Arinvoices_item0soitemModel; @@ -124,4 +125,7 @@ public class SaleorderitemInfoVO{ /** 客户id**/ @TableField("customerId") private String customerId; + + @TableField(exist = false) + private List poundlistentityList; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemListVO.java index e0d262a7..0c497343 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemListVO.java @@ -113,5 +113,10 @@ public class SaleorderitemListVO{ @TableField("customerId") private String customerId; + @TableField(exist = false) + private String contractName; + @TableField(exist = false) + private String customerName; + } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemPagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemPagination.java index e11620f2..eb899d9e 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemPagination.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemPagination.java @@ -3,6 +3,8 @@ package jnpf.saleorder.model.saleorderitem; import lombok.Data; import jnpf.base.Pagination; + +import java.util.Date; import java.util.List; /** @@ -22,7 +24,12 @@ public class SaleorderitemPagination extends Pagination { /** 单据状态 */ private String status; - /** 单据状态 */ + private String contractName; + + private String customerName; + private Date startDate; + private Date endDate; + private List creatorTime; /** * 菜单id 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 04ed9a64..bf235824 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 @@ -1,5 +1,6 @@ package jnpf.saleorder.model.saleorderitem; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.util.List; import java.util.Date; @@ -23,8 +24,9 @@ public class SalesbacksoitemModel { private String documentNo; /** 退货日期 **/ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @JsonProperty("creatorTime") - private Long creatorTime; + private Date creatorTime; /** 退货数量 **/ @JsonProperty("refundNum") private String refundNum; 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 002447df..5735badf 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 @@ -1,6 +1,7 @@ package jnpf.saleorder.service; import com.baomidou.mybatisplus.extension.service.IService; +import jnpf.poundlist.entity.PoundlistEntity; import jnpf.receiptout.entity.Receiptout_item0Entity; import jnpf.saleorder.entity.*; import jnpf.saleorder.model.saleorderitem.SaleorderitemPagination; @@ -37,6 +38,7 @@ public interface SaleorderitemService extends IService { List GetCollectionsoitemList(String id); List GetSalesbacksoitemList(String id); List GetPaymentsoitemList(String id); + List GetPoundlistList(String id); List getReceiptout(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 bdbcdeed..dbda5504 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 @@ -1,6 +1,8 @@ package jnpf.saleorder.service.impl; import jnpf.arinvoices.entity.ArinvoicesEntity; +import jnpf.poundlist.entity.PoundlistEntity; +import jnpf.poundlist.service.PoundlistService; import jnpf.receiptout.entity.Receiptout_item0Entity; import jnpf.receiptout.service.Receiptout_item0Service; import jnpf.saleorder.entity.*; @@ -21,10 +23,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import java.util.stream.Collectors; - - - - +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springframework.beans.factory.annotation.Autowired; @@ -33,6 +33,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import java.text.SimpleDateFormat; import jnpf.util.*; + +import javax.annotation.Resource; import java.util.*; /** @@ -73,6 +75,10 @@ public class SaleorderitemServiceImpl extends ServiceImpl0 && AllIdList.size()>0) || total==0){ Page page=new Page<>(saleorderitemPagination.getCurrentPage(), saleorderitemPagination.getPageSize()); - IPage userIPage=this.page(page, saleorderitemQueryWrapper); + IPage userIPage=saleorderitemMapper.querySalesOrder(page, saleorderitemPagination); return saleorderitemPagination.setData(userIPage.getRecords(),userIPage.getTotal()); - }else{ - List list = new ArrayList(); - return saleorderitemPagination.setData(list, list.size()); - } } @Override public List getTypeList(SaleorderitemPagination saleorderitemPagination,String dataType){ @@ -483,7 +484,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl GetReceiptoutsoitemList(String id){ QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(ReceiptoutsoitemEntity::getSalesId, id); + queryWrapper.lambda().eq(ReceiptoutsoitemEntity::getSourceNo, id); return receiptoutsoitemService.list(queryWrapper); } @Override @@ -511,6 +512,35 @@ public class SaleorderitemServiceImpl extends ServiceImpl GetPoundlistList(String id) { + QueryWrapper saleQueryWrapper = new QueryWrapper<>(); + saleQueryWrapper.lambda().eq(Salesorder_item0Entity::getSalesOrderId,id); + List list = salesorder_item0Service.list(saleQueryWrapper); + List poundlistEntityList = new ArrayList<>(); + if (list.size()>0) { + for (Salesorder_item0Entity entity : list) { + PoundlistEntity poundlistEntity = saleorderitemMapper.queryPoundlist(entity.getPoundlistId()); + if (ObjectUtils.isNotEmpty(poundlistEntity)){ + if (StringUtils.isNotEmpty(entity.getRate())){ + poundlistEntity.setRate(entity.getRate()); + } + if (entity.getUnitPrice()!=null){ + poundlistEntity.setUnitPrice(entity.getUnitPrice()); + } + if (entity.getNoPrice()!=null){ + poundlistEntity.setNoPrice(entity.getNoPrice()); + } + if (entity.getPrice()!=null){ + poundlistEntity.setPrice(entity.getPrice()); + } + poundlistEntityList.add(poundlistEntity); + } + } + } + return poundlistEntityList; + } + @Override public List getReceiptout(String id) { QueryWrapper queryWrapper = new QueryWrapper<>(); diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml index b341f6f0..8a69ba0b 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml @@ -267,4 +267,34 @@ LEFT JOIN jg_vehicle e ON c.vehicle_id = e.id ) aaa ${ew.customSqlSegment} + + + diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/saleback/SalebackMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/saleback/SalebackMapper.xml new file mode 100644 index 00000000..4853257b --- /dev/null +++ b/SC-boot/linkage-scm/src/main/resources/mapper/saleback/SalebackMapper.xml @@ -0,0 +1,29 @@ + + + + + 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 1b0dd99c..087808c1 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 @@ -2,6 +2,57 @@ + + + diff --git a/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue b/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue index a53f700e..d28f6b40 100644 --- a/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue +++ b/SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue @@ -928,19 +928,16 @@ var amount = 0; var advance = 0; var notPrice = 0; - var rate = 0; for (let i = 0;i { - // if (rate == item.id) { - // this.dataForm.salesorder_item0List[i].rate = item.fullName - // debugger - // this.dataForm.salesorder_item0List[i].noPrice = this.dataForm.salesorder_item0List[i].price*(100-item.fullName)/100 - // notPrice = notPrice + parseFloat(this.dataForm.salesorder_item0List[i].noPrice) - // } - // }) + this.rateOptions.find((item) => { + if (this.dataForm.salesorder_item0List[i].rate == item.id) { + this.dataForm.salesorder_item0List[i].noPrice = this.dataForm.salesorder_item0List[i].price*(100-item.fullName)/100 + notPrice = notPrice + parseFloat(this.dataForm.salesorder_item0List[i].noPrice) + } + }) if (list[i].advance == 1){ advance = advance + list[i].salesPrice*list[i].settlement; } diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue b/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue index 0ee0449d..7ca2301e 100644 --- a/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue +++ b/SC-web/src/views/scm/basicInformation/purchaseorder/index.vue @@ -543,7 +543,7 @@ } const ids = this.multipleSelection.join() request({ - url: `/api/purchaseorderNum = '';/Purchaseorder/batchQueryPurchaseorder/${ids}`, + url: `/api/purchaseorder/Purchaseorder/batchQueryPurchaseorder/${ids}`, method: 'get' }).then(res => { var amountFlag = true; diff --git a/SC-web/src/views/scm/basicInformation/saleback/index.vue b/SC-web/src/views/scm/basicInformation/saleback/index.vue index 240c774a..b0e54e7d 100644 --- a/SC-web/src/views/scm/basicInformation/saleback/index.vue +++ b/SC-web/src/views/scm/basicInformation/saleback/index.vue @@ -40,7 +40,7 @@ - @@ -130,7 +130,7 @@ exportBoxVisible: false, columnList: [ { prop: 'documentNo', label: '单据编号' }, - { prop: 'salesOrderId', label: '销售订单' }, + { prop: 'saledocumentNo', label: '销售订单' }, // { prop: 'jg_salesorder.contractName', label: '合同名称' }, // { prop: 'jg_salesorder.costomerName', label: '客户名称' }, { prop: 'refundAmount', label: '退款金额' }, diff --git a/SC-web/src/views/scm/basicInformation/saleorder/index.vue b/SC-web/src/views/scm/basicInformation/saleorder/index.vue index 8de779cc..e7a75dbe 100644 --- a/SC-web/src/views/scm/basicInformation/saleorder/index.vue +++ b/SC-web/src/views/scm/basicInformation/saleorder/index.vue @@ -9,6 +9,16 @@ + + + + + + + + + + - - @@ -167,8 +177,8 @@ width="150" > columnList: [ {prop: 'documentNo', label: '单据编号'}, {prop: 'erpNo', label: 'ERP订单号'}, - {prop: 'contractId', label: '合同名称'}, - {prop: 'customerId', label: '客户名称'}, + {prop: 'contractName', label: '合同名称'}, + {prop: 'customerName', label: '客户名称'}, {prop: 'price', label: '金额'}, {prop: 'num', label: '重量'}, {prop: 'currency', label: '币别'},