diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/invoices/controller/InvoicesController.java b/SC-boot/linkage-scm/src/main/java/jnpf/invoices/controller/InvoicesController.java index 274e83ba..3c949908 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/invoices/controller/InvoicesController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/invoices/controller/InvoicesController.java @@ -17,26 +17,19 @@ import jnpf.config.ConfigValueUtil; import jnpf.exception.DataException; import jnpf.materialvo.entity.MaterialEntity; import jnpf.materialvo.service.MaterialService; -import jnpf.model.EmployeeModel; import jnpf.poundlist.entity.PoundlistEntity; import jnpf.poundlist.service.PoundlistService; import jnpf.purchaseback.entity.PurchaseorderEntity; import jnpf.purchaseback.service.PurchaseorderService; import jnpf.purchaseorder.entity.Purchaseorder_item0Entity; -import jnpf.purchaseorder.entity.PurchaseorderitemEntity; import jnpf.purchaseorder.service.PurchaseorderitemService; import org.apache.commons.lang3.StringUtils; import org.springframework.transaction.annotation.Transactional; -import jnpf.base.entity.ProvinceEntity; import jnpf.invoices.model.invoices.*; import jnpf.invoices.model.invoices.InvoicesPagination; -import jnpf.invoices.entity.*; import jnpf.invoices.entity.InvoicesItem1Entity; import jnpf.invoices.entity.InvoicesItem0Entity; import jnpf.util.*; -import jnpf.base.util.*; -import jnpf.base.vo.ListVO; -import jnpf.util.context.SpringContext; import cn.hutool.core.util.ObjectUtil; import lombok.extern.slf4j.Slf4j; import lombok.Cleanup; @@ -46,16 +39,13 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import jnpf.invoices.entity.InvoicesEntity; import jnpf.invoices.service.InvoicesService; -import jnpf.invoices.entity.InvoicesItem1Entity; import jnpf.invoices.service.InvoicesItem1Service; -import jnpf.invoices.entity.InvoicesItem0Entity; import jnpf.invoices.service.InvoicesItem0Service; import org.springframework.web.bind.annotation.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; import java.io.File; -import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import jnpf.util.GeneraterSwapUtil; @@ -76,7 +66,7 @@ import jnpf.util.enums.FileTypeEnum; */ @Slf4j @RestController -@Api(tags = "应付发票" , value = "invoices") +@Api(tags = "应付发票" , value = "mapper/invoices") @RequestMapping("/api/invoices/Invoices") public class InvoicesController { @@ -114,17 +104,17 @@ public class InvoicesController { public ActionResult list(@RequestBody InvoicesPagination invoicesPagination)throws IOException{ List list= invoicesService.getList(invoicesPagination); //处理id字段转名称，若无需转或者为空可删除 - for(InvoicesEntity entity:list){ + /*for(InvoicesEntity entity:list){ Map purchaseorderIdMap = new HashMap<>(); entity.setPurchaseorderId(generaterSwapUtil.getPopupSelectValue("389673535976550149","id","document_no",entity.getPurchaseorderId(),purchaseorderIdMap)); Map contractIdMap = new HashMap<>(); entity.setContractId(generaterSwapUtil.getPopupSelectValue("389673903103979269","id","contract_name",entity.getContractId(),contractIdMap)); Map supplierIdMap = new HashMap<>(); entity.setSupplierId(generaterSwapUtil.getPopupSelectValue("389674191453990661","id","supplier_name",entity.getSupplierId(),supplierIdMap)); - } + }*/ List listVO=JsonUtil.getJsonToList(list,InvoicesListVO.class); - for(InvoicesListVO invoicesVO:listVO){ - } + /*for(InvoicesListVO invoicesVO:listVO){ + }*/ PageListVO vo=new PageListVO(); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/invoices/mapper/InvoicesMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/invoices/mapper/InvoicesMapper.java index 3063fdb8..56d619b0 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/invoices/mapper/InvoicesMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/invoices/mapper/InvoicesMapper.java @@ -1,8 +1,12 @@ package jnpf.invoices.mapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jnpf.invoices.entity.InvoicesEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import jnpf.invoices.model.invoices.InvoicesPagination; +import org.apache.ibatis.annotations.Param; /** * @@ -14,4 +18,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface InvoicesMapper extends BaseMapper { + IPage queryByKeyword(@Param("page") Page page, @Param("invoicesPagination") InvoicesPagination invoicesPagination); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/invoices/model/invoices/InvoicesPagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/invoices/model/invoices/InvoicesPagination.java index 3f1bbd5f..49dafdf8 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/invoices/model/invoices/InvoicesPagination.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/invoices/model/invoices/InvoicesPagination.java @@ -3,6 +3,8 @@ package jnpf.invoices.model.invoices; import lombok.Data; import jnpf.base.Pagination; + +import java.util.Date; import java.util.List; /** @@ -22,6 +24,8 @@ public class InvoicesPagination extends Pagination { private String purchaseName; private String supplierName; private List creatorTime; + private Date startDate; + private Date endDate; /** * 菜单id */ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/invoices/service/impl/InvoicesServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/invoices/service/impl/InvoicesServiceImpl.java index dcc228fe..de9f21c5 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/invoices/service/impl/InvoicesServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/invoices/service/impl/InvoicesServiceImpl.java @@ -69,7 +69,8 @@ public class InvoicesServiceImpl extends ServiceImpl getList(InvoicesPagination invoicesPagination){ @@ -141,7 +142,38 @@ public class InvoicesServiceImpl extends ServiceImpl PoundDateList = invoicesPagination.getCreatorTime(); + Long fir = Long.valueOf(PoundDateList.get(0)); + Long sec = Long.valueOf(PoundDateList.get(1)); + invoicesPagination.setStartDate(new Date(fir)); + invoicesPagination.setEndDate(DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); + } + if(StringUtil.isEmpty(invoicesPagination.getSidx())){ + invoicesPagination.setSidx("CREATOR_TIME"); + invoicesPagination.setSort("DESC"); + }else{ + try { + String sidx = invoicesPagination.getSidx(); + InvoicesEntity invoicesEntity = new InvoicesEntity(); + Field declaredField = invoicesEntity.getClass().getDeclaredField(sidx); + declaredField.setAccessible(true); + String value = declaredField.getAnnotation(TableField.class).value(); + invoicesPagination.setSidx(value); + } catch (NoSuchFieldException e) { + e.printStackTrace(); + } + } + Page page=new Page<>(invoicesPagination.getCurrentPage(), invoicesPagination.getPageSize()); + IPage iPage = invoicesMapper.queryByKeyword(page, invoicesPagination); + return invoicesPagination.setData(iPage.getRecords(),iPage.getTotal()); + + + + + + + /*if(StringUtil.isNotEmpty(invoicesPagination.getDocumentNo())){ invoicesNum++; invoicesQueryWrapper.lambda().like(InvoicesEntity::getDocumentNo,invoicesPagination.getDocumentNo()); } @@ -181,7 +213,8 @@ public class InvoicesServiceImpl extends ServiceImpl PoundDateList = invoicesPagination.getCreatorTime(); Long fir = Long.valueOf(PoundDateList.get(0)); @@ -219,7 +252,7 @@ public class InvoicesServiceImpl extends ServiceImpl list = new ArrayList(); return invoicesPagination.setData(list, list.size()); - } + }*/ } @Override public List getTypeList(InvoicesPagination invoicesPagination,String dataType){ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/payment/controller/PaymentController.java b/SC-boot/linkage-scm/src/main/java/jnpf/payment/controller/PaymentController.java index 1fd43c41..3954a389 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/payment/controller/PaymentController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/payment/controller/PaymentController.java @@ -137,7 +137,7 @@ public class PaymentController { for (Payment_item0Entity payment_item0Entity: Payment_item0List) { PaymentdocItem0Entity paymentdocItem0Entity = paymentdoc_item0Service.getById(payment_item0Entity.getPaymentdocitemId()); PurchaseorderitemEntity purchaseorderitemEntity = purchaseorderitemService.getById(paymentdocItem0Entity.getPurchaseorderId()); - purchaseorderitemEntity.setPayPrice(purchaseorderitemEntity.getPayPrice().add(paymentdocItem0Entity.getAmount())); + purchaseorderitemEntity.setPayPrice(purchaseorderitemEntity.getPayPrice().add(payment_item0Entity.getAmount())); purchaseorderitemService.updateById(purchaseorderitemEntity); List Purchaseorder_item0List = purchaseorderitemService.GetPurchaseorder_item0List(purchaseorderitemEntity.getId()); List poundlistEntityList = purchaseorderitemService.getPoundList(paymentdocItem0Entity.getPurchaseorderId()); @@ -308,6 +308,9 @@ public class PaymentController { case "duedate" : entitys.add(new ExcelExportEntity("应付日期" ,"duedate")); break; + case "businessdate" : + entitys.add(new ExcelExportEntity("实付日期" ,"businessdate")); + break; case "currency" : entitys.add(new ExcelExportEntity("币别 " ,"currency")); break; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/payment/entity/PaymentEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/payment/entity/PaymentEntity.java index cfbe6d27..26dc5fda 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/payment/entity/PaymentEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/payment/entity/PaymentEntity.java @@ -77,7 +77,7 @@ public class PaymentEntity { private BigDecimal requestedamount; @TableField("BUSINESSDATE") - private String businessdate; + private Date businessdate; @TableField("DUEDATE") private Date duedate; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentCrForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentCrForm.java index 7f834960..1999a37e 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentCrForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentCrForm.java @@ -61,6 +61,10 @@ public class PaymentCrForm { @JsonProperty("duedate") private Long duedate; + /** 实付日期 **/ + @JsonProperty("duedate") + private Long businessdate; + /** 币别 **/ @JsonProperty("currency") private String currency; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentInfoVO.java index 9e4af6ac..a1dff07d 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentInfoVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentInfoVO.java @@ -64,6 +64,10 @@ public class PaymentInfoVO{ @JsonProperty("duedate") private Long duedate; + /** 实付日期 **/ + @JsonProperty("duedate") + private Long businessdate; + /** 币别 **/ @JsonProperty("currency") private String currency; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentListVO.java index 63bef600..64664d34 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentListVO.java @@ -74,6 +74,10 @@ public class PaymentListVO{ @JsonProperty("duedate") private Date duedate; + /** 实付日期 **/ + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + @JsonProperty("businessdate") + private Date businessdate; /** 币别 **/ @JsonProperty("currency") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentUpForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentUpForm.java index 976d522d..416d6d1d 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentUpForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentUpForm.java @@ -75,6 +75,9 @@ public class PaymentUpForm{ @JsonProperty("duedate") private Date duedate; + /** 实付日期 **/ + @JsonProperty("businessdate") + private Date businessdate; /** 币别 **/ @JsonProperty("currency") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java index 67d4d89c..254acef0 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java @@ -107,12 +107,12 @@ public class PaymentdocController { List list= paymentdocService.getList(paymentdocPagination); //处理id字段转名称，若无需转或者为空可删除 for(PaymentdocEntity entity:list){ - Map purchaseIdMap = new HashMap<>(); + /*Map purchaseIdMap = new HashMap<>(); entity.setPurchaseId(generaterSwapUtil.getPopupSelectValue("389673535976550149","id","document_no",entity.getPurchaseId(),purchaseIdMap)); Map contractIdMap = new HashMap<>(); entity.setContractId(generaterSwapUtil.getPopupSelectValue("389673903103979269","id","contract_name",entity.getContractId(),contractIdMap)); Map supplierIdMap = new HashMap<>(); - entity.setSupplierId(generaterSwapUtil.getPopupSelectValue("389674191453990661","id","supplier_name",entity.getSupplierId(),supplierIdMap)); + entity.setSupplierId(generaterSwapUtil.getPopupSelectValue("389674191453990661","id","supplier_name",entity.getSupplierId(),supplierIdMap));*/ QueryWrapper PaymentqueryWrapper = new QueryWrapper<>(); PaymentqueryWrapper.lambda().eq(PaymentEntity::getPaymentno, entity.getDocumentNo()); PaymentEntity paymentEntity = paymentService.getOne(PaymentqueryWrapper); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocListVO.java index 00bba8cd..343d918a 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocListVO.java @@ -45,7 +45,9 @@ public class PaymentdocListVO{ /** 供应商 **/ @JsonProperty("supplierId") private String supplierId; - + /** 供应商 **/ + @JsonProperty("supplierName") + private String supplierName; /** 付款类型 **/ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocPagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocPagination.java index 400833f7..77455ea5 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocPagination.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocPagination.java @@ -18,6 +18,8 @@ public class PaymentdocPagination extends Pagination { /** 单据编号 */ private String documentNo; + /** 供应商 */ + private String supplierName; /** * 菜单id */ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocServiceImpl.java index 326c69a7..fbfbf872 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocServiceImpl.java @@ -4,6 +4,8 @@ import jnpf.paymentdoc.entity.*; import jnpf.paymentdoc.mapper.PaymentdocMapper; import jnpf.paymentdoc.service.*; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jnpf.supplier.entity.SupplierEntity; +import jnpf.supplier.service.SupplierService; import jnpf.util.RandomUtil; import java.math.BigDecimal; import jnpf.permission.model.authorize.AuthorizeConditionModel; @@ -53,7 +55,8 @@ public class PaymentdocServiceImpl extends ServiceImpl customerQueryWrapper =new QueryWrapper<>(); + customerQueryWrapper.lambda().like(SupplierEntity::getSupplierName, paymentdocPagination.getSupplierName()); + customerQueryWrapper.lambda().select(SupplierEntity::getId); + List customerIdList = supplierService.listObjs(customerQueryWrapper).stream().map(o -> (String) o).collect(Collectors.toList()); + paymentdocNum++; + if(customerIdList.size() > 0){ + paymentdocQueryWrapper.lambda().in(PaymentdocEntity::getSupplierId,customerIdList); + }else{ + paymentdocQueryWrapper.lambda().eq(PaymentdocEntity::getSupplierId, paymentdocPagination.getSupplierName()); + } + } if(AllIdList.size()>0){ paymentdocQueryWrapper.lambda().in(PaymentdocEntity::getId, AllIdList); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistCrForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistCrForm.java index 9be55a00..300cb857 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistCrForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistCrForm.java @@ -2,10 +2,7 @@ package jnpf.poundlist.model.poundlist; -import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; - -import java.util.Date; import java.util.List; import java.math.BigDecimal; import com.fasterxml.jackson.annotation.JsonProperty; @@ -56,19 +53,19 @@ public class PoundlistCrForm { /** 皮重 **/ @JsonProperty("tareWeight") - private Integer tareWeight; + private String tareWeight; /** 毛重 **/ @JsonProperty("grossWeight") - private Integer grossWeight; + private String grossWeight; /** 扣重 **/ @JsonProperty("buckleWeight") - private Integer buckleWeight; + private String buckleWeight; /** 净重 **/ @JsonProperty("netWeight") - private Integer netWeight; + private String netWeight; /** 单位 **/ @JsonProperty("unit") @@ -84,11 +81,11 @@ public class PoundlistCrForm { /** 运费 **/ @JsonProperty("transportPrice") - private Integer transportPrice; + private String transportPrice; /** 销售价格 **/ @JsonProperty("salesPrice") - private Integer salesPrice; + private String salesPrice; /** 业务员 **/ @JsonProperty("businessId") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistInfoVO.java index 454a1c74..4a6484f2 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistInfoVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistInfoVO.java @@ -61,19 +61,19 @@ public class PoundlistInfoVO{ /** 皮重 **/ @JsonProperty("tareWeight") - private Integer tareWeight; + private String tareWeight; /** 毛重 **/ @JsonProperty("grossWeight") - private Integer grossWeight; + private String grossWeight; /** 扣重 **/ @JsonProperty("buckleWeight") - private Integer buckleWeight; + private String buckleWeight; /** 净重 **/ @JsonProperty("netWeight") - private Integer netWeight; + private String netWeight; /** 单位 **/ @JsonProperty("unit") @@ -89,11 +89,11 @@ public class PoundlistInfoVO{ /** 运费 **/ @JsonProperty("transportPrice") - private Integer transportPrice; + private String transportPrice; /** 销售价格 **/ @JsonProperty("salesPrice") - private Integer salesPrice; + private String salesPrice; /** 业务员 **/ @JsonProperty("businessId") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistListVO.java index c91c166d..22a0b125 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistListVO.java @@ -9,7 +9,6 @@ import java.sql.Time; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; -import java.math.BigDecimal; /** * * @@ -52,7 +51,7 @@ public class PoundlistListVO{ /** 销售价格 **/ @JsonProperty("salesPrice") - private Integer salesPrice; + private String salesPrice; /** 运输方式 **/ @JsonProperty("transportType") @@ -61,7 +60,7 @@ public class PoundlistListVO{ /** 运费 **/ @JsonProperty("departmentId") - private Integer departmentId; + private String departmentId; /** 车号 **/ @JsonProperty("licenseNo") @@ -80,19 +79,19 @@ public class PoundlistListVO{ /** 皮重 **/ @JsonProperty("tareWeight") - private Integer tareWeight; + private String tareWeight; /** 毛重 **/ @JsonProperty("grossWeight") - private Integer grossWeight; + private String grossWeight; /** 扣重 **/ @JsonProperty("buckleWeight") - private Integer buckleWeight; + private String buckleWeight; /** 净重 **/ @JsonProperty("netWeight") - private Integer netWeight; + private String netWeight; /** 备注 **/ @JsonProperty("remark") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistUpForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistUpForm.java index 36eb08eb..1bd571ad 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistUpForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistUpForm.java @@ -68,22 +68,22 @@ public class PoundlistUpForm{ /** 皮重 **/ @JsonProperty("tareWeight") - private Integer tareWeight; + private String tareWeight; /** 毛重 **/ @JsonProperty("grossWeight") - private Integer grossWeight; + private String grossWeight; /** 扣重 **/ @JsonProperty("buckleWeight") - private Integer buckleWeight; + private String buckleWeight; /** 净重 **/ @JsonProperty("netWeight") - private Integer netWeight; + private String netWeight; /** 单位 **/ @@ -103,12 +103,12 @@ public class PoundlistUpForm{ /** 运费 **/ @JsonProperty("transportPrice") - private Integer transportPrice; + private String transportPrice; /** 销售价格 **/ @JsonProperty("salesPrice") - private Integer salesPrice; + private String salesPrice; /** 业务员 **/ 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 bed6286b..449238c7 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 @@ -101,11 +101,11 @@ public class PurchasebackController { public ActionResult list(@RequestBody PurchasebackPagination purchasebackPagination) throws IOException { List list = purchasebackService.getList(purchasebackPagination); //处理id字段转名称，若无需转或者为空可删除 - for (PurchasebackEntity entity : list) { + /*for (PurchasebackEntity entity : list) { Map purchaseOrderIdMap = new HashMap<>(); entity.setPurchaseOrderId(generaterSwapUtil.getPopupSelectValue("383149471917185157", "id", "document_no", entity.getPurchaseOrderId(), purchaseOrderIdMap)); entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName())); - } + }*/ List listVO = JsonUtil.getJsonToList(list, PurchasebackListVO.class); for (PurchasebackListVO purchasebackVO : listVO) { PurchaseorderEntity purchaseorderEntity = purchasebackService.getPurchaseorder(purchasebackVO.getPurchaseOrderId()); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/PurchasebackEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/PurchasebackEntity.java index d59f224b..d8992336 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/PurchasebackEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/PurchasebackEntity.java @@ -89,4 +89,11 @@ public class PurchasebackEntity { @TableField("REMARK") private String remark; + @TableField(exist = false) + private String purchaseorderdocumentno; + @TableField(exist = false) + private String contractName; + @TableField(exist = false) + private String supplierName; + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/mapper/PurchasebackMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/mapper/PurchasebackMapper.java index 2341889c..43141462 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/mapper/PurchasebackMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/mapper/PurchasebackMapper.java @@ -1,8 +1,12 @@ package jnpf.purchaseback.mapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jnpf.purchaseback.entity.PurchasebackEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import jnpf.purchaseback.model.purchaseback.PurchasebackPagination; +import org.apache.ibatis.annotations.Param; /** * @@ -14,4 +18,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface PurchasebackMapper extends BaseMapper { + IPage queryByKeyword(@Param("page") Page page, @Param("purchasebackPagination") PurchasebackPagination purchasebackPagination); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackListVO.java index 1f416922..2d4bd020 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackListVO.java @@ -78,4 +78,12 @@ public class PurchasebackListVO{ /**列表子表数据 */ @JsonProperty("jg_purchaseorder") private PurchaseorderListVO jg_purchaseorder; + + + @JsonProperty("purchaseorderdocumentno") + private String purchaseorderdocumentno; + @JsonProperty("contractName") + private String contractName; + @JsonProperty("supplierName") + private String supplierName; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/impl/PurchasebackServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/impl/PurchasebackServiceImpl.java index 5661505e..0fe8bdc3 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/impl/PurchasebackServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/impl/PurchasebackServiceImpl.java @@ -55,6 +55,8 @@ public class PurchasebackServiceImpl extends ServiceImpl page=new Page<>(purchasebackPagination.getCurrentPage(), purchasebackPagination.getPageSize()); + IPage iPage = purchasebackMapper.queryByKeyword(page, purchasebackPagination); + return purchasebackPagination.setData(iPage.getRecords(),iPage.getTotal()); + /*if(StringUtil.isNotEmpty(purchasebackPagination.getDocumentNo())){ purchasebackNum++; purchasebackQueryWrapper.lambda().like(PurchasebackEntity::getDocumentNo,purchasebackPagination.getDocumentNo()); } @@ -159,7 +179,7 @@ public class PurchasebackServiceImpl extends ServiceImpl list = new ArrayList(); return purchasebackPagination.setData(list, list.size()); - } + }*/ } @Override public List getTypeList(PurchasebackPagination purchasebackPagination,String dataType){ 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 abce44f3..e843bf51 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 @@ -103,17 +103,17 @@ public class ReceiptinController { public ActionResult list(@RequestBody ReceiptinPagination receiptinPagination)throws IOException{ List list= receiptinService.getList(receiptinPagination); //处理id字段转名称，若无需转或者为空可删除 - for(ReceiptinEntity entity:list){ + /*for(ReceiptinEntity entity:list){ Map soucenoMap = new HashMap<>(); entity.setSouceno(generaterSwapUtil.getPopupSelectValue("392931756640102277","id","document_no",entity.getSouceno(),soucenoMap)); Map supplierIdMap = new HashMap<>(); entity.setSupplierId(generaterSwapUtil.getPopupSelectValue("397751667988199621","id","supplier_name",entity.getSupplierId(),supplierIdMap)); entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName())); - } + }*/ List listVO=JsonUtil.getJsonToList(list,ReceiptinListVO.class); - for(ReceiptinListVO receiptinVO:listVO){ + /*for(ReceiptinListVO receiptinVO:listVO){ } - +*/ PageListVO vo=new PageListVO(); vo.setList(listVO); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/entity/ReceiptinEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/entity/ReceiptinEntity.java index 5e41274b..4a73cc0e 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/entity/ReceiptinEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/entity/ReceiptinEntity.java @@ -104,4 +104,10 @@ public class ReceiptinEntity { @TableField(exist = false) private List receiptin_item0List; + + @TableField(exist = false) + private String purchaseorderSouceno; + + @TableField(exist = false) + private String supplier; } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/mapper/ReceiptinMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/mapper/ReceiptinMapper.java index 03fe268a..002dac72 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/mapper/ReceiptinMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/mapper/ReceiptinMapper.java @@ -1,8 +1,12 @@ package jnpf.receiptin.mapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jnpf.receiptin.entity.ReceiptinEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import jnpf.receiptin.model.receiptin.ReceiptinPagination; +import org.apache.ibatis.annotations.Param; /** * @@ -14,4 +18,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface ReceiptinMapper extends BaseMapper { + IPage queryByKeyword(@Param("page") Page page, @Param("receiptinPagination") ReceiptinPagination receiptinPagination); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinListVO.java index d84350e1..de9647bc 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinListVO.java @@ -87,5 +87,10 @@ public class ReceiptinListVO{ @JsonProperty("creatorUserName") private String creatorUserName; + @JsonProperty("purchaseorderSouceno") + private String purchaseorderSouceno; + + @JsonProperty("supplier") + private String supplier; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinPagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinPagination.java index 6b692cbb..427ab551 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinPagination.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinPagination.java @@ -3,6 +3,8 @@ package jnpf.receiptin.model.receiptin; import lombok.Data; import jnpf.base.Pagination; + +import java.util.Date; import java.util.List; /** @@ -25,6 +27,8 @@ public class ReceiptinPagination extends Pagination { private String souceno; private String supplierName; private List creatorTime; + private Date startDate; + private Date endDate; /** * 菜单id */ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/impl/ReceiptinServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/impl/ReceiptinServiceImpl.java index 3e560831..d1296458 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/impl/ReceiptinServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/impl/ReceiptinServiceImpl.java @@ -61,6 +61,8 @@ public class ReceiptinServiceImpl extends ServiceImpl getList(ReceiptinPagination receiptinPagination){ @@ -114,7 +116,32 @@ public class ReceiptinServiceImpl extends ServiceImpl PoundDateList = receiptinPagination.getCreatorTime(); + Long fir = Long.valueOf(PoundDateList.get(0)); + Long sec = Long.valueOf(PoundDateList.get(1)); + receiptinPagination.setStartDate(new Date(fir)); + receiptinPagination.setEndDate(DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); + } + if(StringUtil.isEmpty(receiptinPagination.getSidx())){ + receiptinPagination.setSidx("CREATOR_TIME"); + receiptinPagination.setSort("DESC"); + }else{ + try { + String sidx = receiptinPagination.getSidx(); + ReceiptinEntity receiptinEntity = new ReceiptinEntity(); + Field declaredField = receiptinEntity.getClass().getDeclaredField(sidx); + declaredField.setAccessible(true); + String value = declaredField.getAnnotation(TableField.class).value(); + receiptinPagination.setSidx(value); + } catch (NoSuchFieldException e) { + e.printStackTrace(); + } + } + Page page=new Page<>(receiptinPagination.getCurrentPage(), receiptinPagination.getPageSize()); + IPage iPage = receiptinMapper.queryByKeyword(page, receiptinPagination); + return receiptinPagination.setData(iPage.getRecords(),iPage.getTotal()); + /*if(StringUtil.isNotEmpty(receiptinPagination.getDocumentno())){ receiptinNum++; receiptinQueryWrapper.lambda().like(ReceiptinEntity::getDocumentno,receiptinPagination.getDocumentno()); } @@ -183,7 +210,7 @@ public class ReceiptinServiceImpl extends ServiceImpl list = new ArrayList(); return receiptinPagination.setData(list, list.size()); - } + }*/ } @Override public List getTypeList(ReceiptinPagination receiptinPagination,String dataType){ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java index d34fa1a7..b6571637 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java @@ -57,6 +57,8 @@ import java.io.InputStream; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * @@ -193,18 +195,18 @@ public class TradeuploadController { tradeuploadCrForm.setPoundlistNo(DeliveryNumber); } if (StringUtils.isNotEmpty(TareWeight)) { - tradeuploadCrForm.setTareWeight(TareWeight); + tradeuploadCrForm.setTareWeight(numberTransform(TareWeight)); } if (StringUtils.isNotEmpty(CrossWeight)) { - tradeuploadCrForm.setGrossWeight(CrossWeight); + tradeuploadCrForm.setGrossWeight(numberTransform(CrossWeight)); } if (StringUtils.isEmpty(NetWeight)) { tradeuploadCrForm.setBuckleWeight("0"); }else { - tradeuploadCrForm.setBuckleWeight(NetWeight); + tradeuploadCrForm.setBuckleWeight(numberTransform(NetWeight)); } if (StringUtils.isNotEmpty(NetWeight)) { - tradeuploadCrForm.setNetWeight(NetWeight); + tradeuploadCrForm.setNetWeight(numberTransform(NetWeight)); } UserInfo userInfo = userProvider.get(); @@ -470,7 +472,9 @@ public class TradeuploadController { //处理id字段转名称，若无需转或者为空可删除 for(TradeuploadEntity entity:list){ entity.setPoundPictures(generaterSwapUtil.getFileNameInJson(entity.getPoundPictures())); - Map materialIdMap = new HashMap<>(); + + + /*Map materialIdMap = new HashMap<>(); entity.setMaterialName(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","item_name",entity.getMaterialId(),materialIdMap)); Map customerIdMap = new HashMap<>(); entity.setCustomerName(generaterSwapUtil.getPopupSelectValue("395936123471343749","id","supplier_nm",entity.getCustomerId(),customerIdMap)); @@ -486,7 +490,7 @@ public class TradeuploadController { Map purchaseIdMap = new HashMap<>(); entity.setPurchaseName(generaterSwapUtil.getPopupSelectValue("397408984857931205","id","contract_name",entity.getPurchaseId(),purchaseIdMap)); Map supplierIdMap = new HashMap<>(); - entity.setSupplierName(generaterSwapUtil.getPopupSelectValue("382494924156735557","id","supplier_name",entity.getSupplierId(),supplierIdMap)); + entity.setSupplierName(generaterSwapUtil.getPopupSelectValue("382494924156735557","id","supplier_name",entity.getSupplierId(),supplierIdMap));*/ entity.setOriginPlace(generaterSwapUtil.provinceData(entity.getOriginPlace())); } List listVO=JsonUtil.getJsonToList(list,TradeuploadListVO.class); @@ -822,14 +826,27 @@ public class TradeuploadController { return ActionResult.success("删除成功"); } - - - - - - - - - - + public String numberTransform(String str){ + List list = new ArrayList<>(); + // 声明正则，匹配数字（1个或多个）.数字（1个或多个） + String regex = "\\d+"; + if(str.indexOf(".") > 0){ + regex = "\\d+\\.+\\d+"; + } + //String regex = "\\d+\\.+\\d+"; + // Pattern的构造方法是私有的，不可以直接创建，通过静态方法compile创建Pattern对象，查看源代码发现compile直接调用了Pattern构造函数。 + Pattern pattern = Pattern.compile(regex); + // 返回一个Matcher对象。Matcher类的构造方法也是私有的，不能随意创建，只能通过Pattern.matcher(CharSequence input)方法得到该类的实例。 + Matcher matcher = pattern.matcher(str); + // 对目标字符串进行正则匹配，通过while可以多次执行find方法，获取多次的匹配结果，代码编写方式类似于iterator.next()。 + while (matcher.find()) { + // group() 返回匹配到的字符串，结合find函数使用。 + String group = matcher.group(); + list.add(group); + } + if(list.size() == 0){ + return "0"; + } + return list.get(0); + } } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/mapper/TradeuploadMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/mapper/TradeuploadMapper.java index 6a729539..d15d5c73 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/mapper/TradeuploadMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/mapper/TradeuploadMapper.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jnpf.tradeupload.entity.TradeuploadEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import jnpf.tradeupload.model.tradeupload.TradeuploadPagination; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -21,4 +22,6 @@ import java.util.List; */ public interface TradeuploadMapper extends BaseMapper { List queryVehicle(TradeuploadEntity tradeuploadEntity); + + IPage queryByKeyword(@Param("page") Page page, @Param("tradeuploadPagination") TradeuploadPagination tradeuploadPagination); } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadPagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadPagination.java index 43209b97..24db88b3 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadPagination.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadPagination.java @@ -3,6 +3,8 @@ package jnpf.tradeupload.model.tradeupload; import lombok.Data; import jnpf.base.Pagination; + +import java.util.Date; import java.util.List; /** @@ -36,6 +38,9 @@ public class TradeuploadPagination extends Pagination { /** 车牌号 */ private String vehicleName; + + private Date startDate; + private Date endDate; /** * 菜单id */ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/impl/TradeuploadServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/impl/TradeuploadServiceImpl.java index fa74371f..92b00983 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/impl/TradeuploadServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/impl/TradeuploadServiceImpl.java @@ -108,6 +108,36 @@ public class TradeuploadServiceImpl extends ServiceImpl PoundDateList = tradeuploadPagination.getPoundDate(); + Long fir = Long.valueOf(PoundDateList.get(0)); + Long sec = Long.valueOf(PoundDateList.get(1)); + tradeuploadPagination.setStartDate(new Date(fir)); + tradeuploadPagination.setEndDate(DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59")); + } + if(StringUtil.isEmpty(tradeuploadPagination.getSidx())){ + tradeuploadPagination.setSidx("CREATOR_TIME"); + tradeuploadPagination.setSort("DESC"); + }else{ + try { + String sidx = tradeuploadPagination.getSidx(); + TradeuploadEntity tradeuploadEntity = new TradeuploadEntity(); + Field declaredField = tradeuploadEntity.getClass().getDeclaredField(sidx); + declaredField.setAccessible(true); + String value = declaredField.getAnnotation(TableField.class).value(); + tradeuploadPagination.setSidx(value); + } catch (NoSuchFieldException e) { + e.printStackTrace(); + } + } + Page page=new Page<>(tradeuploadPagination.getCurrentPage(), tradeuploadPagination.getPageSize()); + IPage iPage = tradeuploadMapper.queryByKeyword(page, tradeuploadPagination); + return tradeuploadPagination.setData(iPage.getRecords(),iPage.getTotal()); + /* + + + + if(StringUtil.isNotEmpty(tradeuploadPagination.getPoundDate())){ tradeuploadNum++; List PoundDateList = tradeuploadPagination.getPoundDate(); @@ -209,7 +239,7 @@ public class TradeuploadServiceImpl extends ServiceImpl list = new ArrayList(); return tradeuploadPagination.setData(list, list.size()); - } + }*/ } @Override public List getTypeList(TradeuploadPagination tradeuploadPagination,String dataType){ diff --git a/SC-boot/linkage-scm/src/main/resources/InvoicesMapper.xml b/SC-boot/linkage-scm/src/main/resources/InvoicesMapper.xml deleted file mode 100644 index e273bb90..00000000 --- a/SC-boot/linkage-scm/src/main/resources/InvoicesMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/SC-boot/linkage-scm/src/main/resources/PurchasebackMapper.xml b/SC-boot/linkage-scm/src/main/resources/PurchasebackMapper.xml deleted file mode 100644 index c4d65c7d..00000000 --- a/SC-boot/linkage-scm/src/main/resources/PurchasebackMapper.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/SC-boot/linkage-scm/src/main/resources/TradeuploadMapper.xml b/SC-boot/linkage-scm/src/main/resources/TradeuploadMapper.xml deleted file mode 100644 index 9f23c32f..00000000 --- a/SC-boot/linkage-scm/src/main/resources/TradeuploadMapper.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/invoices/InvoicesMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/invoices/InvoicesMapper.xml new file mode 100644 index 00000000..d308dafa --- /dev/null +++ b/SC-boot/linkage-scm/src/main/resources/mapper/invoices/InvoicesMapper.xml @@ -0,0 +1,32 @@ + + + + + + + diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/purchaseback/PurchasebackMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/purchaseback/PurchasebackMapper.xml new file mode 100644 index 00000000..98af7f21 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/resources/mapper/purchaseback/PurchasebackMapper.xml @@ -0,0 +1,20 @@ + + + + + + + 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 71129cc0..b90ac1c9 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 @@ -281,7 +281,7 @@ AND a.creator_time > #{purchaseorderPagination.startDate} AND a.creator_time <= #{purchaseorderPagination.endDate} - AND a.document_no = #{purchaseorderPagination.documentNo} + AND a.document_no LIKE CONCAT('%',#{purchaseorderPagination.documentNo},'%') AND c.contract_name LIKE CONCAT('%',#{purchaseorderPagination.purchaseName},'%') diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/receiptin/ReceiptinMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/receiptin/ReceiptinMapper.xml index f2bf5807..bdba652b 100644 --- a/SC-boot/linkage-scm/src/main/resources/mapper/receiptin/ReceiptinMapper.xml +++ b/SC-boot/linkage-scm/src/main/resources/mapper/receiptin/ReceiptinMapper.xml @@ -1,7 +1,28 @@ - + diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/tradeupload/TradeuploadMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/tradeupload/TradeuploadMapper.xml new file mode 100644 index 00000000..b79364dd --- /dev/null +++ b/SC-boot/linkage-scm/src/main/resources/mapper/tradeupload/TradeuploadMapper.xml @@ -0,0 +1,56 @@ + + + + + + + + diff --git a/SC-web/src/views/extend/paymentdoc/form.vue b/SC-web/src/views/extend/paymentdoc/form.vue index 13a2a3c7..258860fb 100644 --- a/SC-web/src/views/extend/paymentdoc/form.vue +++ b/SC-web/src/views/extend/paymentdoc/form.vue @@ -33,18 +33,18 @@ - + --> - + hasPage :pageSize="20" :disabled="true"> - --> + @@ -503,6 +503,7 @@ }) } if(data.purchaseorder && data.purchaseorder.length > 0){ + this.dataForm.supplierId = data.purchaseorder[0].supplierId this.dataForm.businessDate = new Date() this.dataForm.dueDate = new Date() var ramount = 0; diff --git a/SC-web/src/views/scm/basicInformation/invoices/Form.vue b/SC-web/src/views/scm/basicInformation/invoices/Form.vue index 2848fa6c..8605105a 100644 --- a/SC-web/src/views/scm/basicInformation/invoices/Form.vue +++ b/SC-web/src/views/scm/basicInformation/invoices/Form.vue @@ -29,7 +29,7 @@ - + @@ -230,13 +230,13 @@ - + diff --git a/SC-web/src/views/scm/basicInformation/payment/Detail.vue b/SC-web/src/views/scm/basicInformation/payment/Detail.vue index efa4b2cd..0f695aeb 100644 --- a/SC-web/src/views/scm/basicInformation/payment/Detail.vue +++ b/SC-web/src/views/scm/basicInformation/payment/Detail.vue @@ -77,6 +77,14 @@ + + + + + + + diff --git a/SC-web/src/views/scm/basicInformation/payment/Form.vue b/SC-web/src/views/scm/basicInformation/payment/Form.vue index 2bc0589d..844e7cc0 100644 --- a/SC-web/src/views/scm/basicInformation/payment/Form.vue +++ b/SC-web/src/views/scm/basicInformation/payment/Form.vue @@ -77,6 +77,14 @@ + + + + + + + @@ -259,6 +267,7 @@ collectionbank: '', requestedamount: '', duedate: '', + businessdate: '', currency: "0", settlementtype: "0", paymentno: '', @@ -282,6 +291,12 @@ trigger: 'blur' }, ], + businessdate: [{ + required: true, + message: '请选择实付日期', + trigger: 'blur' + } + ], }, paymenttypeOptions: [{ "fullName": "货款", diff --git a/SC-web/src/views/scm/basicInformation/payment/index.vue b/SC-web/src/views/scm/basicInformation/payment/index.vue index 6f55b242..a16d90c0 100644 --- a/SC-web/src/views/scm/basicInformation/payment/index.vue +++ b/SC-web/src/views/scm/basicInformation/payment/index.vue @@ -69,6 +69,7 @@ + diff --git a/SC-web/src/views/scm/basicInformation/paymentdoc/index.vue b/SC-web/src/views/scm/basicInformation/paymentdoc/index.vue index db7e9f64..376aeeb0 100644 --- a/SC-web/src/views/scm/basicInformation/paymentdoc/index.vue +++ b/SC-web/src/views/scm/basicInformation/paymentdoc/index.vue @@ -8,6 +8,11 @@ + + + + + 查询 @@ -51,6 +56,7 @@ {{ scope.row.settlementType | dynamicText(settlementTypeOptions) }} + @@ -345,7 +351,7 @@ }, fukuanHandle(id, flowState, docStatus){ if(flowState == 2){ - if(docStatus != 3){ + //if(docStatus != 3){ this.formVisible = true this.$nextTick(() => { request({ @@ -355,14 +361,14 @@ this.$refs.JNPFForm.init(res.data) }) }) - }else{ + /* }else{ this.$message({ type: 'error', message: '该订单已付款', duration: 1000 }); return - } + } */ }else{ this.$message({ diff --git a/SC-web/src/views/scm/basicInformation/paymentdoc/paymentForm.vue b/SC-web/src/views/scm/basicInformation/paymentdoc/paymentForm.vue index a0a3a863..a0a9cb91 100644 --- a/SC-web/src/views/scm/basicInformation/paymentdoc/paymentForm.vue +++ b/SC-web/src/views/scm/basicInformation/paymentdoc/paymentForm.vue @@ -81,6 +81,14 @@ + + + + + + + @@ -270,6 +278,7 @@ collectionbank: '', requestedamount: '', duedate: '', + businessdate: '', currency: "0", settlementtype: "0", paymentno: '', @@ -293,6 +302,12 @@ trigger: 'blur' }, ], + businessdate: [{ + required: true, + message: '请选择实付日期', + trigger: 'blur' + } + ], }, paymenttypeOptions: [{ "fullName": "货款", @@ -428,6 +443,7 @@ this.dataForm.collectionaccount = paymentdoc.collectionAccount this.dataForm.collectionbank = paymentdoc.colectionBank this.dataForm.duedate = paymentdoc.dueDate + this.dataForm.businessdate = paymentdoc.businessdate this.dataForm.currency = paymentdoc.currency this.dataForm.settlementtype = paymentdoc.settlementType this.dataForm.paymentno = paymentdoc.documentNo diff --git a/SC-web/src/views/scm/basicInformation/poundlist/Detail.vue b/SC-web/src/views/scm/basicInformation/poundlist/Detail.vue index c2097f8e..e3c35cd6 100644 --- a/SC-web/src/views/scm/basicInformation/poundlist/Detail.vue +++ b/SC-web/src/views/scm/basicInformation/poundlist/Detail.vue @@ -4,13 +4,20 @@ - - - - - - - - - + + + + + + - + - + - +