yunxi
/
SC-MOM
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

3.16修改

Browse Source
product
17602169347 2 years ago
parent a3d02ecfb5
commit 1e7a2571b0
58 changed files with 658 additions and 273 deletions
Show Stats Download Patch File Download Diff File

20
SC-boot/linkage-scm/src/main/java/jnpf/invoices/controller/InvoicesController.java
Unescape View File

@ -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<InvoicesEntity> list= invoicesService.getList(invoicesPagination);
//处理id字段转名称，若无需转或者为空可删除
for(InvoicesEntity entity:list){
/*for(InvoicesEntity entity:list){
Map<String,Object> purchaseorderIdMap = new HashMap<>();
entity.setPurchaseorderId(generaterSwapUtil.getPopupSelectValue("389673535976550149","id","document_no",entity.getPurchaseorderId(),purchaseorderIdMap));
Map<String,Object> contractIdMap = new HashMap<>();
entity.setContractId(generaterSwapUtil.getPopupSelectValue("389673903103979269","id","contract_name",entity.getContractId(),contractIdMap));
Map<String,Object> supplierIdMap = new HashMap<>();
entity.setSupplierId(generaterSwapUtil.getPopupSelectValue("389674191453990661","id","supplier_name",entity.getSupplierId(),supplierIdMap));
}
}*/
List<InvoicesListVO> listVO=JsonUtil.getJsonToList(list,InvoicesListVO.class);
for(InvoicesListVO invoicesVO:listVO){
}
/*for(InvoicesListVO invoicesVO:listVO){
}*/
PageListVO vo=new PageListVO();

5
SC-boot/linkage-scm/src/main/java/jnpf/invoices/mapper/InvoicesMapper.java
Unescape View File

@ -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<InvoicesEntity> {
IPage<InvoicesEntity> queryByKeyword(@Param("page") Page<InvoicesEntity> page, @Param("invoicesPagination") InvoicesPagination invoicesPagination);
}

4
SC-boot/linkage-scm/src/main/java/jnpf/invoices/model/invoices/InvoicesPagination.java
Unescape View File

@ -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<String> creatorTime;
private Date startDate;
private Date endDate;
/**
* 菜单id
*/

41
SC-boot/linkage-scm/src/main/java/jnpf/invoices/service/impl/InvoicesServiceImpl.java
Unescape View File

@ -69,7 +69,8 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
private SupplierService supplierService;
@Autowired
private PurchaseorderitemService purchaseorderitemService;
@Autowired
private InvoicesMapper invoicesMapper;
@Override
public List<InvoicesEntity> getList(InvoicesPagination invoicesPagination){
@ -141,7 +142,38 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
}
}
if(StringUtil.isNotEmpty(invoicesPagination.getDocumentNo())){
if(StringUtil.isNotEmpty(invoicesPagination.getCreatorTime())){
List<String> 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<InvoicesEntity> page=new Page<>(invoicesPagination.getCurrentPage(), invoicesPagination.getPageSize());
IPage<InvoicesEntity> 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<InvoicesMapper, InvoicesEnt
invoicesQueryWrapper.lambda().eq(InvoicesEntity::getContractId, invoicesPagination.getPurchaseName());
}
}
if(StringUtil.isNotEmpty(invoicesPagination.getCreatorTime())){
if(StringUtil.isNotEmpty(invoicesPagination.get
())){
invoicesNum++;
List<String> PoundDateList = invoicesPagination.getCreatorTime();
Long fir = Long.valueOf(PoundDateList.get(0));
@ -219,7 +252,7 @@ public class InvoicesServiceImpl extends ServiceImpl<InvoicesMapper, InvoicesEnt
}else{
List<InvoicesEntity> list = new ArrayList();
return invoicesPagination.setData(list, list.size());
}
}*/
}
@Override
public List<InvoicesEntity> getTypeList(InvoicesPagination invoicesPagination,String dataType){

5
SC-boot/linkage-scm/src/main/java/jnpf/payment/controller/PaymentController.java
Unescape View File

@ -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_item0Entity> Purchaseorder_item0List = purchaseorderitemService.GetPurchaseorder_item0List(purchaseorderitemEntity.getId());
List<PoundlistEntity> 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;

2
SC-boot/linkage-scm/src/main/java/jnpf/payment/entity/PaymentEntity.java
Unescape View File

@ -77,7 +77,7 @@ public class PaymentEntity {
private BigDecimal requestedamount;
@TableField("BUSINESSDATE")
private String businessdate;
private Date businessdate;
@TableField("DUEDATE")
private Date duedate;

4
SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentCrForm.java
Unescape View File

@ -61,6 +61,10 @@ public class PaymentCrForm {
@JsonProperty("duedate")
private Long duedate;
/** 实付日期 **/
@JsonProperty("duedate")
private Long businessdate;
/** 币别 **/
@JsonProperty("currency")
private String currency;

4
SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentInfoVO.java
Unescape View File

@ -64,6 +64,10 @@ public class PaymentInfoVO{
@JsonProperty("duedate")
private Long duedate;
/** 实付日期 **/
@JsonProperty("duedate")
private Long businessdate;
/** 币别 **/
@JsonProperty("currency")
private String currency;

4
SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentListVO.java
Unescape View File

@ -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")

3
SC-boot/linkage-scm/src/main/java/jnpf/payment/model/payment/PaymentUpForm.java
Unescape View File

@ -75,6 +75,9 @@ public class PaymentUpForm{
@JsonProperty("duedate")
private Date duedate;
/** 实付日期 **/
@JsonProperty("businessdate")
private Date businessdate;
/** 币别 **/
@JsonProperty("currency")

4
SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/controller/PaymentdocController.java
Unescape View File

@ -107,12 +107,12 @@ public class PaymentdocController {
List<PaymentdocEntity> list= paymentdocService.getList(paymentdocPagination);
//处理id字段转名称，若无需转或者为空可删除
for(PaymentdocEntity entity:list){
Map<String,Object> purchaseIdMap = new HashMap<>();
/*Map<String,Object> purchaseIdMap = new HashMap<>();
entity.setPurchaseId(generaterSwapUtil.getPopupSelectValue("389673535976550149","id","document_no",entity.getPurchaseId(),purchaseIdMap));
Map<String,Object> contractIdMap = new HashMap<>();
entity.setContractId(generaterSwapUtil.getPopupSelectValue("389673903103979269","id","contract_name",entity.getContractId(),contractIdMap));
Map<String,Object> 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<PaymentEntity> PaymentqueryWrapper = new QueryWrapper<>();
PaymentqueryWrapper.lambda().eq(PaymentEntity::getPaymentno, entity.getDocumentNo());
PaymentEntity paymentEntity = paymentService.getOne(PaymentqueryWrapper);

4
SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocListVO.java
Unescape View File

@ -45,7 +45,9 @@ public class PaymentdocListVO{
/** 供应商 **/
@JsonProperty("supplierId")
private String supplierId;
/** 供应商 **/
@JsonProperty("supplierName")
private String supplierName;
/** 付款类型 **/

2
SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/model/paymentdoc/PaymentdocPagination.java
Unescape View File

@ -18,6 +18,8 @@ public class PaymentdocPagination extends Pagination {
/** 单据编号 */
private String documentNo;
/** 供应商 */
private String supplierName;
/**
* 菜单id
*/

17
SC-boot/linkage-scm/src/main/java/jnpf/paymentdoc/service/impl/PaymentdocServiceImpl.java
Unescape View File

@ -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<PaymentdocMapper, Payment
@Autowired
private PaymentdocItem0Service paymentdocItem0Service;
@Autowired
private SupplierService supplierService;
@ -111,6 +114,18 @@ public class PaymentdocServiceImpl extends ServiceImpl<PaymentdocMapper, Payment
paymentdocQueryWrapper.lambda().like(PaymentdocEntity::getDocumentNo,paymentdocPagination.getDocumentNo());
}
if(StringUtil.isNotEmpty(paymentdocPagination.getSupplierName())){
QueryWrapper<SupplierEntity> customerQueryWrapper =new QueryWrapper<>();
customerQueryWrapper.lambda().like(SupplierEntity::getSupplierName, paymentdocPagination.getSupplierName());
customerQueryWrapper.lambda().select(SupplierEntity::getId);
List<String> 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);
}

15
SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistCrForm.java
Unescape View File

@ -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")

12
SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistInfoVO.java
Unescape View File

@ -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")

13
SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistListVO.java
Unescape View File

@ -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")

12
SC-boot/linkage-scm/src/main/java/jnpf/poundlist/model/poundlist/PoundlistUpForm.java
Unescape View File

@ -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;
/** 业务员 **/

4
SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/controller/PurchasebackController.java
Unescape View File

@ -101,11 +101,11 @@ public class PurchasebackController {
public ActionResult list(@RequestBody PurchasebackPagination purchasebackPagination) throws IOException {
List<PurchasebackEntity> list = purchasebackService.getList(purchasebackPagination);
//处理id字段转名称，若无需转或者为空可删除
for (PurchasebackEntity entity : list) {
/*for (PurchasebackEntity entity : list) {
Map<String, Object> purchaseOrderIdMap = new HashMap<>();
entity.setPurchaseOrderId(generaterSwapUtil.getPopupSelectValue("383149471917185157", "id", "document_no", entity.getPurchaseOrderId(), purchaseOrderIdMap));
entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName()));
}
}*/
List<PurchasebackListVO> listVO = JsonUtil.getJsonToList(list, PurchasebackListVO.class);
for (PurchasebackListVO purchasebackVO : listVO) {
PurchaseorderEntity purchaseorderEntity = purchasebackService.getPurchaseorder(purchasebackVO.getPurchaseOrderId());

7
SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/entity/PurchasebackEntity.java
Unescape View File

@ -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;
}

5
SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/mapper/PurchasebackMapper.java
Unescape View File

@ -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<PurchasebackEntity> {
IPage<PurchasebackEntity> queryByKeyword(@Param("page") Page<PurchasebackEntity> page, @Param("purchasebackPagination") PurchasebackPagination purchasebackPagination);
}

8
SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/model/purchaseback/PurchasebackListVO.java
Unescape View File

@ -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;
}

24
SC-boot/linkage-scm/src/main/java/jnpf/purchaseback/service/impl/PurchasebackServiceImpl.java
Unescape View File

@ -55,6 +55,8 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
@Autowired
private Purchaseback_item0Service purchaseback_item0Service;
@Autowired
private PurchasebackMapper purchasebackMapper;
@ -129,7 +131,25 @@ public class PurchasebackServiceImpl extends ServiceImpl<PurchasebackMapper, Pur
}
}
if(StringUtil.isNotEmpty(purchasebackPagination.getDocumentNo())){
if(StringUtil.isEmpty(purchasebackPagination.getSidx())){
purchasebackPagination.setSidx("CREATOR_TIME");
purchasebackPagination.setSort("DESC");
}else{
try {
String sidx = purchasebackPagination.getSidx();
PurchasebackEntity purchasebackEntity = new PurchasebackEntity();
Field declaredField = purchasebackEntity.getClass().getDeclaredField(sidx);
declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value();
purchasebackPagination.setSidx(value);
} catch (NoSuchFieldException e) {
e.printStackTrace();
}
}
Page<PurchasebackEntity> page=new Page<>(purchasebackPagination.getCurrentPage(), purchasebackPagination.getPageSize());
IPage<PurchasebackEntity> 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<PurchasebackMapper, Pur
}else{
List<PurchasebackEntity> list = new ArrayList();
return purchasebackPagination.setData(list, list.size());
}
}*/
}
@Override
public List<PurchasebackEntity> getTypeList(PurchasebackPagination purchasebackPagination,String dataType){

8
SC-boot/linkage-scm/src/main/java/jnpf/receiptin/controller/ReceiptinController.java
Unescape View File

@ -103,17 +103,17 @@ public class ReceiptinController {
public ActionResult list(@RequestBody ReceiptinPagination receiptinPagination)throws IOException{
List<ReceiptinEntity> list= receiptinService.getList(receiptinPagination);
//处理id字段转名称，若无需转或者为空可删除
for(ReceiptinEntity entity:list){
/*for(ReceiptinEntity entity:list){
Map<String,Object> soucenoMap = new HashMap<>();
entity.setSouceno(generaterSwapUtil.getPopupSelectValue("392931756640102277","id","document_no",entity.getSouceno(),soucenoMap));
Map<String,Object> supplierIdMap = new HashMap<>();
entity.setSupplierId(generaterSwapUtil.getPopupSelectValue("397751667988199621","id","supplier_name",entity.getSupplierId(),supplierIdMap));
entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName()));
}
}*/
List<ReceiptinListVO> listVO=JsonUtil.getJsonToList(list,ReceiptinListVO.class);
for(ReceiptinListVO receiptinVO:listVO){
/*for(ReceiptinListVO receiptinVO:listVO){
}
*/
PageListVO vo=new PageListVO();
vo.setList(listVO);

6
SC-boot/linkage-scm/src/main/java/jnpf/receiptin/entity/ReceiptinEntity.java
Unescape View File

@ -104,4 +104,10 @@ public class ReceiptinEntity {
@TableField(exist = false)
private List<Receiptin_item0Entity> receiptin_item0List;
@TableField(exist = false)
private String purchaseorderSouceno;
@TableField(exist = false)
private String supplier;
}

5
SC-boot/linkage-scm/src/main/java/jnpf/receiptin/mapper/ReceiptinMapper.java
Unescape View File

@ -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<ReceiptinEntity> {
IPage<ReceiptinEntity> queryByKeyword(@Param("page") Page<ReceiptinEntity> page, @Param("receiptinPagination") ReceiptinPagination receiptinPagination);
}

5
SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinListVO.java
Unescape View File

@ -87,5 +87,10 @@ public class ReceiptinListVO{
@JsonProperty("creatorUserName")
private String creatorUserName;
@JsonProperty("purchaseorderSouceno")
private String purchaseorderSouceno;
@JsonProperty("supplier")
private String supplier;
}

4
SC-boot/linkage-scm/src/main/java/jnpf/receiptin/model/receiptin/ReceiptinPagination.java
Unescape View File

@ -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<String> creatorTime;
private Date startDate;
private Date endDate;
/**
* 菜单id
*/

31
SC-boot/linkage-scm/src/main/java/jnpf/receiptin/service/impl/ReceiptinServiceImpl.java
Unescape View File

@ -61,6 +61,8 @@ public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, Receiptin
private PurchaseorderitemService purchaseorderitemService;
@Autowired
private SupplierService supplierService;
@Autowired
private ReceiptinMapper receiptinMapper;
@Override
public List<ReceiptinEntity> getList(ReceiptinPagination receiptinPagination){
@ -114,7 +116,32 @@ public class ReceiptinServiceImpl extends ServiceImpl<ReceiptinMapper, Receiptin
}
}
if(StringUtil.isNotEmpty(receiptinPagination.getDocumentno())){
if(StringUtil.isNotEmpty(receiptinPagination.getCreatorTime())){
List<String> 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<ReceiptinEntity> page=new Page<>(receiptinPagination.getCurrentPage(), receiptinPagination.getPageSize());
IPage<ReceiptinEntity> 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<ReceiptinMapper, Receiptin
}else{
List<ReceiptinEntity> list = new ArrayList();
return receiptinPagination.setData(list, list.size());
}
}*/
}
@Override
public List<ReceiptinEntity> getTypeList(ReceiptinPagination receiptinPagination,String dataType){

49
SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java
Unescape View File

@ -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<String,Object> materialIdMap = new HashMap<>();
/*Map<String,Object> materialIdMap = new HashMap<>();
entity.setMaterialName(generaterSwapUtil.getPopupSelectValue("381037852907038533","id","item_name",entity.getMaterialId(),materialIdMap));
Map<String,Object> customerIdMap = new HashMap<>();
entity.setCustomerName(generaterSwapUtil.getPopupSelectValue("395936123471343749","id","supplier_nm",entity.getCustomerId(),customerIdMap));
@ -486,7 +490,7 @@ public class TradeuploadController {
Map<String,Object> purchaseIdMap = new HashMap<>();
entity.setPurchaseName(generaterSwapUtil.getPopupSelectValue("397408984857931205","id","contract_name",entity.getPurchaseId(),purchaseIdMap));
Map<String,Object> 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<TradeuploadListVO> listVO=JsonUtil.getJsonToList(list,TradeuploadListVO.class);
@ -822,14 +826,27 @@ public class TradeuploadController {
return ActionResult.success("删除成功");
}
public String numberTransform(String str){
List<String> 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);
}
}

3
SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/mapper/TradeuploadMapper.java
Unescape View File

@ -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<TradeuploadEntity> {
List<TradeuploadEntity> queryVehicle(TradeuploadEntity tradeuploadEntity);
IPage<TradeuploadEntity> queryByKeyword(@Param("page") Page<TradeuploadEntity> page, @Param("tradeuploadPagination") TradeuploadPagination tradeuploadPagination);
}

5
SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadPagination.java
Unescape View File

@ -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
*/

32
SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/service/impl/TradeuploadServiceImpl.java
Unescape View File

@ -108,6 +108,36 @@ public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, Trade
}
}
if(StringUtil.isNotEmpty(tradeuploadPagination.getPoundDate())){
List<String> 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<TradeuploadEntity> page=new Page<>(tradeuploadPagination.getCurrentPage(), tradeuploadPagination.getPageSize());
IPage<TradeuploadEntity> iPage = tradeuploadMapper.queryByKeyword(page, tradeuploadPagination);
return tradeuploadPagination.setData(iPage.getRecords(),iPage.getTotal());
/*
if(StringUtil.isNotEmpty(tradeuploadPagination.getPoundDate())){
tradeuploadNum++;
List<String> PoundDateList = tradeuploadPagination.getPoundDate();
@ -209,7 +239,7 @@ public class TradeuploadServiceImpl extends ServiceImpl<TradeuploadMapper, Trade
}else{
List<TradeuploadEntity> list = new ArrayList();
return tradeuploadPagination.setData(list, list.size());
}
}*/
}
@Override
public List<TradeuploadEntity> getTypeList(TradeuploadPagination tradeuploadPagination,String dataType){

7
SC-boot/linkage-scm/src/main/resources/InvoicesMapper.xml
Unescape View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="jnpf.invoices.mapper.InvoicesMapper">
</mapper>

7
SC-boot/linkage-scm/src/main/resources/PurchasebackMapper.xml
Unescape View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="jnpf.purchaseback.mapper.PurchasebackMapper">
</mapper>

18
SC-boot/linkage-scm/src/main/resources/TradeuploadMapper.xml
Unescape View File

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="jnpf.tradeupload.mapper.TradeuploadMapper">
<select id="queryVehicle" resultType="jnpf.tradeupload.entity.TradeuploadEntity">
select
*
from
jg_poundlist
where
vehicle_id = #{vehicleId} and
gross_weight = #{grossWeight} and
tare_weight = #{tareWeight} and
net_weight = #{netWeight} and
creator_time = DATE_SUB(NOW(),interval 15 day)
</select>
</mapper>

32
SC-boot/linkage-scm/src/main/resources/mapper/invoices/InvoicesMapper.xml
Unescape View File

@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="jnpf.invoices.mapper.InvoicesMapper">
<select id="queryByKeyword" resultType="jnpf.invoices.entity.InvoicesEntity">
SELECT a.*,b.document_no purchaseorderId,c.contract_name contractId,d.supplier_name supplierId
from jg_invoices a
LEFT JOIN jg_purchaseorder b on a.purchaseorder_id = b.id
LEFT JOIN jg_contract c on a.contract_id = c.id
LEFT JOIN jg_supplier d on a.supplier_id = d.id
where 1=1
<if test="invoicesPagination.startDate != null and invoicesPagination.endDate != null">
AND a.creator_time &gt; #{invoicesPagination.startDate} AND a.creator_time &lt;= #{invoicesPagination.endDate}
</if>
<if test="invoicesPagination.documentNo != null and invoicesPagination.documentNo != ''">
AND a.document_no LIKE CONCAT('%',#{invoicesPagination.documentNo},'%')
</if>
<if test="invoicesPagination.souceno != null and invoicesPagination.souceno != ''">
AND b.document_no LIKE CONCAT('%',#{invoicesPagination.souceno},'%')
</if>
<if test="invoicesPagination.supplierName != null and invoicesPagination.supplierName != ''">
AND d.supplier_name LIKE CONCAT('%',#{invoicesPagination.supplierName},'%')
</if>
<if test="invoicesPagination.purchaseName != null and invoicesPagination.purchaseName != ''">
AND c.contract_name LIKE CONCAT('%',#{invoicesPagination.purchaseName},'%')
</if>
<if test="invoicesPagination.sidx != null and invoicesPagination.sidx != ''">
ORDER BY ${invoicesPagination.sidx} ${invoicesPagination.sort}
</if>
</select>
</mapper>

20
SC-boot/linkage-scm/src/main/resources/mapper/purchaseback/PurchasebackMapper.xml
Unescape View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="jnpf.purchaseback.mapper.PurchasebackMapper">
<select id="queryByKeyword" resultType="jnpf.purchaseback.entity.PurchasebackEntity">
SELECT a.*,b.document_no purchaseorderdocumentno,c.contract_name contractName,d.supplier_name supplierName
from jg_purchaseback a
LEFT JOIN jg_purchaseorder b on a.purchase_order_id = b.id
LEFT JOIN jg_contract c on b.contract_code = c.id
LEFT JOIN jg_supplier d on b.supplier_id = d.id
where 1=1
<if test="purchasebackPagination.documentNo != null and purchasebackPagination.documentNo != ''">
AND a.document_no LIKE CONCAT('%',#{purchasebackPagination.documentNo},'%')
</if>
<if test="purchasebackPagination.sidx != null and purchasebackPagination.sidx != ''">
ORDER BY ${purchasebackPagination.sidx} ${purchasebackPagination.sort}
</if>
</select>
</mapper>

2
SC-boot/linkage-scm/src/main/resources/mapper/purchaseorder/PurchaseorderMapper.xml
Unescape View File

@ -281,7 +281,7 @@
AND a.creator_time &gt; #{purchaseorderPagination.startDate} AND a.creator_time &lt;= #{purchaseorderPagination.endDate}
</if>
<if test="purchaseorderPagination.documentNo != null and purchaseorderPagination.documentNo != ''">
AND a.document_no = #{purchaseorderPagination.documentNo}
AND a.document_no LIKE CONCAT('%',#{purchaseorderPagination.documentNo},'%')
</if>
<if test="purchaseorderPagination.purchaseName != null and purchaseorderPagination.purchaseName != ''">
AND c.contract_name LIKE CONCAT('%',#{purchaseorderPagination.purchaseName},'%')

23
SC-boot/linkage-scm/src/main/resources/mapper/receiptin/ReceiptinMapper.xml
Unescape View File

@ -1,7 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="jnpf.receiptin.mapper.ReceiptinMapper">
<select id="queryByKeyword" resultType="jnpf.receiptin.entity.ReceiptinEntity">
SELECT a.*,b.document_no purchaseorderSouceno,d.supplier_name supplier
from jg_receiptin a
LEFT JOIN jg_purchaseorder b on a.souceno = b.id
LEFT JOIN jg_supplier d on a.supplier_id = d.id
where 1=1
<if test="receiptinPagination.startDate != null and receiptinPagination.endDate != null">
AND a.creator_time &gt; #{receiptinPagination.startDate} AND a.creator_time &lt;= #{receiptinPagination.endDate}
</if>
<if test="receiptinPagination.documentNo != null and receiptinPagination.documentNo != ''">
AND a.document_no LIKE CONCAT('%',#{receiptinPagination.documentNo},'%')
</if>
<if test="receiptinPagination.souceno != null and receiptinPagination.souceno != ''">
AND b.document_no LIKE CONCAT('%',#{receiptinPagination.souceno},'%')
</if>
<if test="receiptinPagination.supplierName != null and receiptinPagination.supplierName != ''">
AND d.supplier_name LIKE CONCAT('%',#{receiptinPagination.supplierName},'%')
</if>
<if test="receiptinPagination.sidx != null and receiptinPagination.sidx != ''">
ORDER BY ${receiptinPagination.sidx} ${receiptinPagination.sort}
</if>
</select>
</mapper>

56
SC-boot/linkage-scm/src/main/resources/mapper/tradeupload/TradeuploadMapper.xml
Unescape View File

@ -0,0 +1,56 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="jnpf.tradeupload.mapper.TradeuploadMapper">
<select id="queryVehicle" resultType="jnpf.tradeupload.entity.TradeuploadEntity">
select
*
from
jg_poundlist
where
vehicle_id = #{vehicleId} and
gross_weight = #{grossWeight} and
tare_weight = #{tareWeight} and
net_weight = #{netWeight} and
creator_time = DATE_SUB(NOW(),interval 15 day)
</select>
<select id="queryByKeyword" resultType="jnpf.tradeupload.entity.TradeuploadEntity">
SELECT a.*,b.ticketno vehicleName,c.supplier_name supplierName,d.supplier_nm customerName,e.item_name materialName,f.contract_name salesName,g.contract_name purchaseName,h.F_RealName businessName,i.name naturalName,g.contract_no purchaseContractNo,f.contract_no salesContractNo
from jg_poundlist a
LEFT JOIN jg_vehicle b on a.vehicle_id = b.id
LEFT JOIN jg_supplier c on a.supplier_id = c.id
LEFT JOIN jg_customer d on a.customer_id = d.id
LEFT JOIN jg_material e on a.material_id = e.id
LEFT JOIN jg_contract f on a.sales_id = f.id
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.is_examine = '0'
<if test="tradeuploadPagination.keyword != null and tradeuploadPagination.keyword != ''">
AND (b.ticketno LIKE CONCAT('%',#{tradeuploadPagination.keyword},'%') OR c.supplier_name LIKE CONCAT('%',#{tradeuploadPagination.keyword},'%') OR d.supplier_nm LIKE CONCAT('%',#{tradeuploadPagination.keyword},'%'))
</if>
<if test="tradeuploadPagination.startDate != null and tradeuploadPagination.endDate != null">
AND a.POUND_DATE &gt; #{tradeuploadPagination.startDate} AND a.POUND_DATE &lt;= #{tradeuploadPagination.endDate}
</if>
<if test="tradeuploadPagination.poundlistNo != null and tradeuploadPagination.poundlistNo != ''">
AND a.POUNDLIST_NO LIKE CONCAT('%',#{tradeuploadPagination.poundlistNo},'%')
</if>
<if test="tradeuploadPagination.materialName != null and tradeuploadPagination.materialName != ''">
AND e.item_name LIKE CONCAT('%',#{tradeuploadPagination.materialName},'%')
</if>
<if test="tradeuploadPagination.vehicleName != null and tradeuploadPagination.vehicleName != ''">
AND b.ticketno LIKE CONCAT('%',#{tradeuploadPagination.vehicleName},'%')
</if>
<if test="tradeuploadPagination.salesName != null and tradeuploadPagination.salesName != ''">
AND f.contract_name LIKE CONCAT('%',#{tradeuploadPagination.salesName},'%')
</if>
<if test="tradeuploadPagination.customerName != null and tradeuploadPagination.customerName != ''">
AND d.supplier_nm LIKE CONCAT('%',#{tradeuploadPagination.customerName},'%')
</if>
<if test="tradeuploadPagination.sidx != null and tradeuploadPagination.sidx != ''">
ORDER BY ${tradeuploadPagination.sidx} ${tradeuploadPagination.sort}
</if>
</select>
</mapper>

9
SC-web/src/views/extend/paymentdoc/form.vue
Unescape View File

@ -33,18 +33,18 @@
</popupSelect>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="8" v-if="judgeShow('supplierId')">
<el-form-item label="供应商" prop="supplierId">
<popupSelect :disabled="judgeWrite('supplierId')" v-model="dataForm.supplierId" placeholder="请选择"
<popupSelect v-model="dataForm.supplierId" placeholder="请选择"
clearable field="supplierId" interfaceId="389674191453990661" :columnOptions="supplierIdcolumnOptions"
propsValue="id" relationField="supplier_name" popupType="dialog" popupTitle="选择数据" popupWidth="800px"
hasPage :pageSize="20">
hasPage :pageSize="20" :disabled="true">
</popupSelect>
</el-form-item>
</el-col> -->
</el-col>
<el-col :span="8" v-if="judgeShow('paymentType')">
<el-form-item label="付款类型" prop="paymentType">
@ -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;

6
SC-web/src/views/scm/basicInformation/invoices/Form.vue
Unescape View File

@ -29,7 +29,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="数量" prop="quantity">
<el-form-item label="重量" prop="quantity">
<el-input-number v-model="dataForm.quantity" placeholder="数字文本" :step="1" :precision="6"
:style='{"width":"100%"}' :disabled="true">
@ -230,13 +230,13 @@
</el-input>
</template>
</el-table-column>
<el-table-column prop="invoiceQuantity" label="发票数量" width="150">
<el-table-column prop="invoiceQuantity" label="发票数量" width="200">
<template slot-scope="scope">
<!-- <el-input v-model="scope.row.invoiceQuantity" placeholder="请输入" clearable
:style='{"width":"100%"}' @change="invoiceQuantityChange">
</el-input> -->
<el-input-number v-model="scope.row.invoiceQuantity" placeholder="数字文本" :step="1"
:style='{"width":"100%"}' @change="invoiceQuantityChange">
:style='{"width":"100%"}' @change="invoiceQuantityChange" :precision="6">
</el-input-number>
</template>

8
SC-web/src/views/scm/basicInformation/payment/Detail.vue
Unescape View File

@ -77,6 +77,14 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="实付日期" prop="businessdate">
<el-date-picker v-model="dataForm.businessdate" placeholder="请选择" clearable :style='{"width":"100%"}'
type="date" format="yyyy-MM-dd" value-format="timestamp">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="币别 " prop="currency">
<el-select v-model="dataForm.currency" placeholder="请选择" clearable :style='{"width":"100%"}'>

15
SC-web/src/views/scm/basicInformation/payment/Form.vue
Unescape View File

@ -77,6 +77,14 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="实付日期" prop="businessdate">
<el-date-picker v-model="dataForm.businessdate" placeholder="请选择" clearable :style='{"width":"100%"}'
type="date" format="yyyy-MM-dd" value-format="timestamp">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="币别 " prop="currency">
<el-select v-model="dataForm.currency" placeholder="请选择" clearable :style='{"width":"100%"}'>
@ -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": "货款",

1
SC-web/src/views/scm/basicInformation/payment/index.vue
Unescape View File

@ -69,6 +69,7 @@
</template>
</el-table-column>
<el-table-column prop="duedate" label="应付日期" sortable width="140" align="center" />
<el-table-column prop="businessdate" label="实付日期" sortable width="140" align="center" />
<el-table-column prop="paymentamount" label="付款金额" sortable width="140" align="center" />
<el-table-column prop="requestedamount" label="申请金额" sortable width="140" align="center" />
<el-table-column prop="paymentaccount" label="付款账户" sortable width="140" align="center" />

12
SC-web/src/views/scm/basicInformation/paymentdoc/index.vue
Unescape View File

@ -8,6 +8,11 @@
<el-input v-model="query.documentNo" placeholder="请输入" clearable> </el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="供应商">
<el-input v-model="query.supplierName" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
@ -51,6 +56,7 @@
{{ scope.row.settlementType | dynamicText(settlementTypeOptions) }}
</template>
</el-table-column>
<el-table-column prop="supplierName" label="供应商" width="200" align="center" sortable="custom" />
<el-table-column prop="ramount" label="申请金额" width="150" align="center" sortable="custom" />
<el-table-column prop="paymentAmount" label="付款金额" width="150" align="center" sortable="custom" />
<el-table-column prop="unpaymentAmount" label="未付款金额" width="150" align="center" sortable="custom" />
@ -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({

16
SC-web/src/views/scm/basicInformation/paymentdoc/paymentForm.vue
Unescape View File

@ -81,6 +81,14 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="实付日期" prop="businessdate">
<el-date-picker v-model="dataForm.businessdate" placeholder="请选择" clearable :style='{"width":"100%"}'
type="date" format="yyyy-MM-dd" value-format="timestamp">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="币别 " prop="currency">
<el-select v-model="dataForm.currency" placeholder="请选择" clearable :style='{"width":"100%"}'>
@ -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

49
SC-web/src/views/scm/basicInformation/poundlist/Detail.vue
Unescape View File

@ -4,13 +4,20 @@
<el-row :gutter="15" class="">
<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right">
<template v-if="!loading">
<el-col :span="24">
<el-col :span="12">
<el-form-item label="磅单上传" prop="poundPictures">
<JNPF-UploadImg v-model="dataForm.poundPictures" :fileSize="500" sizeUnit="MB" :limit="1" :disabled="true">
</JNPF-UploadImg>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="车辆图片" prop="vehiclePictures">
<JNPF-UploadImg v-model="dataForm.vehiclePictures" :fileSize="500" sizeUnit="MB" :limit="9">
</JNPF-UploadImg>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="物料名称" prop="materialId">
<popupSelect v-model="dataForm.materialId" placeholder="请选择物料名称" clearable field="materialId"
@ -63,7 +70,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="采购价格" prop="purchasePrice">
<el-input-number v-model="dataForm.purchasePrice" :style='{"width":"100%"}'></el-input-number>
<el-input-number v-model="dataForm.purchasePrice" :style='{"width":"100%"}' :precision="6"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
@ -79,40 +86,32 @@
<el-col :span="6">
<el-form-item label="收货价格" prop="collectPrice">
<el-input-number v-model="dataForm.collectPrice" :style='{"width":"100%"}'></el-input-number>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="车辆图片" prop="vehiclePictures">
<JNPF-UploadImg v-model="dataForm.vehiclePictures" :fileSize="500" sizeUnit="MB" :limit="9">
</JNPF-UploadImg>
<el-input-number v-model="dataForm.collectPrice" :style='{"width":"100%"}' :precision="6"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="销售价格" prop="salesPrice">
<el-input-number v-model="dataForm.salesPrice" :style='{"width":"100%"}'></el-input-number>
<el-input-number v-model="dataForm.salesPrice" :style='{"width":"100%"}' :precision="6"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="皮重" prop="tareWeight">
<el-input-number v-model="dataForm.tareWeight" :style='{"width":"100%"}'></el-input-number>
<el-form-item label="毛重" prop="grossWeight">
<el-input-number v-model="dataForm.grossWeight" :style='{"width":"100%"}' :precision="6"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="毛重" prop="grossWeight">
<el-input-number v-model="dataForm.grossWeight" :style='{"width":"100%"}'></el-input-number>
<el-form-item label="皮重" prop="tareWeight">
<el-input-number v-model="dataForm.tareWeight" :style='{"width":"100%"}' :precision="6"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="扣重" prop="buckleWeight">
<el-input-number v-model="dataForm.buckleWeight" :style='{"width":"100%"}'></el-input-number>
<el-input-number v-model="dataForm.buckleWeight" :style='{"width":"100%"}' :precision="6"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="净重" prop="netWeight">
<el-input-number v-model="dataForm.netWeight" :style='{"width":"100%"}'></el-input-number>
<el-input-number v-model="dataForm.netWeight" :style='{"width":"100%"}' :precision="6"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
@ -159,7 +158,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="运费" prop="transportPrice">
<el-input-number v-model="dataForm.transportPrice" :style='{"width":"100%"}'></el-input-number>
<el-input-number v-model="dataForm.transportPrice" :style='{"width":"100%"}' :precision="6"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
@ -169,7 +168,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="业务员" prop="businessId">
<el-form-item label="业务员1" prop="businessId">
<popupSelect v-model="dataForm.businessId" placeholder="请选择业务员" clearable field="businessId"
interfaceId="ebcc44be142e43b795c0d769abd6d25a" :columnOptions="businessIdcolumnOptions"
propsValue="F_Id" relationField="F_RealName" popupType="dialog" popupTitle="选择数据" popupWidth="800px"
@ -179,8 +178,8 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="自然人" prop="naturalId">
<popupSelect v-model="dataForm.naturalId" placeholder="请选择自然人" clearable field="naturalId"
<el-form-item label="业务员2" prop="naturalId">
<popupSelect v-model="dataForm.naturalId" placeholder="请选择业务员2" clearable field="naturalId"
interfaceId="395933800510599301" :columnOptions="naturalIdcolumnOptions" propsValue="id"
relationField="name" popupType="dialog" popupTitle="选择数据" popupWidth="800px" hasPage :pageSize="20">
@ -434,13 +433,13 @@
"value": "positionName"
}],
naturalIdcolumnOptions: [{
"label": "自然人名称",
"label": "业务员2名称",
"value": "name"
}, {
"label": "自然人手机号",
"label": "业务员2手机号",
"value": "contact"
}, {
"label": "自然人地址",
"label": "业务员2地址",
"value": "adress"
}, ],

53
SC-web/src/views/scm/basicInformation/poundlist/Form.vue
Unescape View File

@ -4,13 +4,20 @@
<el-row :gutter="15" class="">
<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right">
<template v-if="!loading">
<el-col :span="24">
<el-col :span="12">
<el-form-item label="磅单上传" prop="poundPictures">
<JNPF-UploadImg v-model="dataForm.poundPictures" :fileSize="500" sizeUnit="MB" :limit="9" :disabled="true">
</JNPF-UploadImg>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="车辆图片" prop="vehiclePictures">
<JNPF-UploadImg v-model="dataForm.vehiclePictures" :fileSize="500" sizeUnit="MB" :limit="9">
</JNPF-UploadImg>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="物料名称" prop="materialId">
<popupSelect v-model="dataForm.materialId" placeholder="请选择物料名称" clearable field="materialId"
@ -63,7 +70,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="采购价格" prop="purchasePrice">
<el-input-number v-model="dataForm.purchasePrice" :style='{"width":"100%"}'></el-input-number>
<el-input-number v-model="dataForm.purchasePrice" :style='{"width":"100%"}' :precision="6"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
@ -79,40 +86,32 @@
<el-col :span="6">
<el-form-item label="收货价格" prop="collectPrice">
<el-input-number v-model="dataForm.collectPrice" :style='{"width":"100%"}'></el-input-number>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="车辆图片" prop="vehiclePictures">
<JNPF-UploadImg v-model="dataForm.vehiclePictures" :fileSize="500" sizeUnit="MB" :limit="9">
</JNPF-UploadImg>
<el-input-number v-model="dataForm.collectPrice" :style='{"width":"100%"}' :precision="6"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="皮重" prop="tareWeight">
<el-input-number v-model="dataForm.tareWeight" :style='{"width":"100%"}'></el-input-number>
<el-form-item label="毛重" prop="grossWeight">
<el-input-number v-model="dataForm.grossWeight" :style='{"width":"100%"}' :precision="6"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="毛重" prop="grossWeight">
<el-input-number v-model="dataForm.grossWeight" :style='{"width":"100%"}'></el-input-number>
<el-form-item label="皮重" prop="tareWeight">
<el-input-number v-model="dataForm.tareWeight" :style='{"width":"100%"}' :precision="6"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="扣重" prop="buckleWeight">
<el-input-number v-model="dataForm.buckleWeight" :style='{"width":"100%"}'></el-input-number>
<el-input-number v-model="dataForm.buckleWeight" :style='{"width":"100%"}' :precision="6"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="净重" prop="netWeight">
<el-input-number v-model="dataForm.netWeight" :style='{"width":"100%"}'></el-input-number>
<el-input-number v-model="dataForm.netWeight" :style='{"width":"100%"}' :precision="6"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="销售价格" prop="salesPrice">
<el-input-number v-model="dataForm.salesPrice" :style='{"width":"100%"}'></el-input-number>
<el-input-number v-model="dataForm.salesPrice" :style='{"width":"100%"}' :precision="6"></el-input-number>
</el-form-item>
</el-col>
@ -160,7 +159,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="运费" prop="transportPrice">
<el-input-number v-model="dataForm.transportPrice" :style='{"width":"100%"}'></el-input-number>
<el-input-number v-model="dataForm.transportPrice" :style='{"width":"100%"}' :precision="6"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
@ -170,8 +169,8 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="业务员" prop="businessId">
<popupSelect v-model="dataForm.businessId" placeholder="请选择业务员" clearable field="businessId"
<el-form-item label="业务员1" prop="businessId">
<popupSelect v-model="dataForm.businessId" placeholder="请选择业务员1" clearable field="businessId"
interfaceId="ebcc44be142e43b795c0d769abd6d25a" :columnOptions="businessIdcolumnOptions"
propsValue="F_Id" relationField="F_RealName" popupType="dialog" popupTitle="选择数据" popupWidth="800px"
hasPage :pageSize="20" :bissId="dataForm.businessId">
@ -180,8 +179,8 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="自然人" prop="naturalId">
<popupSelect v-model="dataForm.naturalId" placeholder="请选择自然人" clearable field="naturalId"
<el-form-item label="业务员2" prop="naturalId">
<popupSelect v-model="dataForm.naturalId" placeholder="请选择业务员2" clearable field="naturalId"
interfaceId="395933800510599301" :columnOptions="naturalIdcolumnOptions" propsValue="id"
relationField="name" popupType="dialog" popupTitle="选择数据" popupWidth="800px" hasPage :pageSize="20">
@ -432,13 +431,13 @@
"value": "positionName"
}],
naturalIdcolumnOptions: [{
"label": "自然人名称",
"label": "业务员2名称",
"value": "name"
}, {
"label": "自然人手机号",
"label": "业务员2手机号",
"value": "contact"
}, {
"label": "自然人地址",
"label": "业务员2地址",
"value": "adress"
}, ],
@ -476,7 +475,6 @@
},
customerSelect2(a, b) {
this.dataForm.supplierId = b.code;
debugger
},
handleAvatarSuccess(res, file) {
this.imageUrl = URL.createObjectURL(file.raw);
@ -620,7 +618,6 @@
},
request2() {
var _data = this.dataList()
debugger
if (!this.dataForm.id) {
request({
url: '/api/tradeupload/Tradeupload',

86
SC-web/src/views/scm/basicInformation/poundlist/index.vue
Unescape View File

@ -112,7 +112,7 @@
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c :hasNO="false"
@selection-change="handleSelectionChange" border>
@selection-change="handleSelectionChange" border show-summary :summary-method="getSummaries">
<el-table-column type="index" width="50" label="序号" fixed="left" align="center" />
<el-table-column prop="vehicleName" label="车号" fixed="left" sortable width="120" align="center" />
<el-table-column prop="purchaseStatus" label="采购状态" sortable width="100" align="center" >
@ -126,20 +126,19 @@
</template>
</el-table-column>
<el-table-column prop="materialName" label="物料名称" sortable width="150" align="center" />
<el-table-column prop="settlement" sortable label="结算重量" width="100" align="center" />
<el-table-column prop="purchasePrice" sortable label="采购单价" width="100" align="center" />
<el-table-column prop="salesPrice" sortable label="销售价格" width="100" align="center" />
<el-table-column prop="collectPrice" sortable label="收货价格" width="100" align="center" />
<el-table-column prop="grossWeight" sortable label="毛重" width="100" align="center" />
<el-table-column prop="tareWeight" sortable label="皮重" width="100" align="center" />
<el-table-column prop="netWeight" sortable label="净重" width="100" align="center" />
<el-table-column prop="buckleWeight" sortable label="扣重" width="100" align="center" />
<el-table-column prop="unit" label="单位" sortable width="100" align="center" >
<template slot-scope="scope">
{{ scope.row.unit | dynamicText(unitOptions) }}
</template>
</el-table-column>
<el-table-column prop="grossWeight" sortable label="毛重" width="100" align="center" />
<el-table-column prop="tareWeight" sortable label="皮重" width="100" align="center" />
<el-table-column prop="netWeight" sortable label="净重" width="100" align="center" />
<el-table-column prop="buckleWeight" sortable label="扣重" width="100" align="center" />
<el-table-column prop="settlement" sortable label="结算重量" width="100" align="center" />
<el-table-column prop="purchasePrice" sortable label="采购单价" width="100" align="center" />
<el-table-column prop="salesPrice" sortable label="销售价格" width="100" align="center" />
<el-table-column prop="collectPrice" sortable label="收货价格" width="100" align="center" />
<el-table-column prop="poundlistNo" label="磅单号" width="200" align="center" sortable />
<el-table-column prop="customerName" label="客户名称" sortable width="150" align="center" />
<el-table-column prop="salesName" label="销售合同" sortable width="150" align="center" />
@ -151,16 +150,12 @@
{{ scope.row.advance | dynamicText(advanceOptions) }}
</template>
</el-table-column>
<el-table-column prop="creatorTime" label="创建时间" width="200" align="center" sortable
/>
<el-table-column prop="inputDate" sortable label="进项票日期" width="150" align="center" />
<el-table-column prop="outputDate" sortable label="销项票日期" width="150" align="center" />
<el-table-column prop="payDate" sortable label="付款日期" width="150" align="center" />
<el-table-column prop="paymentDate" sortable label="回款日期" width="150" align="center" />
<el-table-column prop="poundDate" sortable label="磅单日期" width="150" align="center" />
<el-table-column prop="inputDateStr" sortable label="进项票日期" width="150" align="center" />
<el-table-column prop="outputDateStr" sortable label="销项票日期" width="150" align="center" />
<el-table-column prop="payDateStr" sortable label="付款日期" width="150" align="center" />
<el-table-column prop="paymentDateStr" sortable label="回款日期" width="150" align="center" />
<el-table-column prop="poundDateStr" sortable label="磅单日期" width="150" align="center" />
<el-table-column prop="creatorTimeStr" sortable label="创建日期" width="150" align="center" />
<el-table-column prop="businessName" sortable label="业务员" width="150" align="center" />
<el-table-column label="是否开进项票" width="120" sortable prop="isInvoicing" align="center" >
<template slot-scope="scope">
@ -213,7 +208,7 @@
</span>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="100" align="center">
<el-table-column label="操作" fixed="right" width="150" align="center">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row.id)">编辑
</el-button>
@ -230,8 +225,7 @@
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<JNPF-Form2 v-if="formVisible2" ref="JNPFForm2" @refresh="refresh2" />
<JNPF-Form3 v-if="formVisible3" ref="JNPFForm3" @refresh="refresh3" />
<JNPF-Form4 v-if="formVisible" ref="JNPFForm4" @refresh="refresh" />
<JNPF-Form4 v-if="formVisible4" ref="JNPFForm4" @refresh="refresh4" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
</div>
@ -244,7 +238,6 @@
} from '@/api/systemData/dictionary'
import JNPFForm from './Form'
import JNPFForm2 from './PurchaseOrderForm'
import JNPFForm3 from './PurchaseOrderForm'
import JNPFForm4 from './salesForm'
import ExportBox from './ExportBox'
import {
@ -256,7 +249,6 @@
components: {
JNPFForm,
JNPFForm2,
JNPFForm3,
JNPFForm4,
ExportBox,
Detail
@ -287,6 +279,7 @@
formVisible: false,
formVisible2: false,
formVisible3: false,
formVisible4: false,
exportBoxVisible: false,
columnList: [{
prop: 'licenseNo',
@ -472,6 +465,31 @@
this.initData()
},
methods: {
getSummaries(param) {
const { columns, data } = param;
const sums = [];
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计';
return;
}
const values = data.map(item => Number(item[column.property]));
if (!values.every(value => isNaN(value)) && (index === 7 || index === 8 || index === 9 || index === 10|| index === 11)) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
return prev + curr;
} else {
return prev;
}
}, 0);
} else {
sums[index] = '';
}
});
return sums;
},
goDetail(id) {
this.detailVisible = true
this.$nextTick(() => {
@ -501,15 +519,17 @@
}).then(res => {
var _list = [];
for (let i = 0; i < res.data.list.length; i++) {
res.data.list[i].inputDate = res.data.list[i].inputDate ? res.data.list[i].inputDate.substring(0,
res.data.list[i].inputDateStr = res.data.list[i].inputDate ? res.data.list[i].inputDate.substring(0,
10) : '';
res.data.list[i].outputDate = res.data.list[i].outputDate ? res.data.list[i].outputDate
res.data.list[i].outputDateStr = res.data.list[i].outputDate ? res.data.list[i].outputDate
.substring(0, 10) : '';
res.data.list[i].payDateStr = res.data.list[i].payDate ? res.data.list[i].payDate
.substring(0, 10) : '';
res.data.list[i].payDate = res.data.list[i].payDate ? res.data.list[i].payDate
res.data.list[i].paymentDateStr = res.data.list[i].paymentDate ? res.data.list[i].paymentDate
.substring(0, 10) : '';
res.data.list[i].paymentDate = res.data.list[i].paymentDate ? res.data.list[i].paymentDate
res.data.list[i].poundDateStr = res.data.list[i].poundDate ? res.data.list[i].poundDate
.substring(0, 10) : '';
res.data.list[i].poundDate = res.data.list[i].poundDate ? res.data.list[i].poundDate
res.data.list[i].creatorTimeStr = res.data.list[i].creatorTime ? res.data.list[i].creatorTime
.substring(0, 10) : '';
let _data = res.data.list[i];
_list.push(_data)
@ -623,7 +643,7 @@
}
if (list.length>0) {
// this.list = _list
this.formVisible = true
this.formVisible4 = true
this.$nextTick(() => {
this.$refs.JNPFForm4.init(list)
})
@ -734,6 +754,10 @@
refresh3(isrRefresh) {
this.formVisible3 = false
if (isrRefresh) this.reset()
},
refresh4(isrRefresh) {
this.formVisible4 = false
if (isrRefresh) this.reset()
},
reset() {
for (let key in this.query) {

13
SC-web/src/views/scm/basicInformation/purchaseback/index.vue
Unescape View File

@ -43,8 +43,9 @@
@selection-change="handleSelectionChange" border>
<el-table-column type="index" width="50" label="序号" fixed="left" align="center" />
<el-table-column prop="documentNo" label="单据编号" width="200" align="center"sortable fixed="left" />
<el-table-column prop="jg_purchaseorder.contractName" label="合同名称" width="200" align="center"sortable/>
<el-table-column prop="jg_purchaseorder.supplierName" label="供应商名称" width="200" align="center"sortable/>
<el-table-column prop="purchaseorderdocumentno" label="来源单号" width="200" align="center"sortable/>
<el-table-column prop="contractName" label="合同名称" width="200" align="center"sortable/>
<el-table-column prop="supplierName" label="供应商名称" width="200" align="center"sortable/>
<el-table-column prop="refundAmount" label="退货金额" width="120" align="center"sortable/>
<el-table-column prop="actualAmount" label="实退金额" width="120" align="center"sortable/>
@ -131,11 +132,15 @@
label: '单据编号'
},
{
prop: 'jg_purchaseorder.contractName',
prop: 'purchaseorderdocumentno',
label: '来源单号'
},
{
prop: 'contractName',
label: '合同名称'
},
{
prop: 'jg_purchaseorder.supplierName',
prop: 'supplierName',
label: '供应商名称'
},
{

2
SC-web/src/views/scm/basicInformation/purchaseorder/InvoicesForm.vue
Unescape View File

@ -215,7 +215,7 @@
</el-input>
</template>
</el-table-column>
<el-table-column prop="invoiceQuantity" label="发票数量" width="150">
<el-table-column prop="invoiceQuantity" label="发票数量" width="200">
<template slot-scope="scope">
<el-input-number v-model="scope.row.invoiceQuantity" placeholder="数字文本" :step="1" :precision="6" :style='{"width":"100%"}' @change="invoiceQuantityChange(scope.row)">
</el-input-number>

14
SC-web/src/views/scm/basicInformation/purchaseorder/index.vue
Unescape View File

@ -522,8 +522,10 @@
})
return
}
var supplierIdArr = [];
var statusFlag = true;
for(var i=0;i<this.multipleSelectionItem.length;i++){
supplierIdArr.push(this.multipleSelectionItem[i].supplierId);
if(this.multipleSelectionItem[i].status != '2'){
statusFlag = false;
}
@ -536,10 +538,14 @@
})
return
}
for(var i=0;i<this.multipleSelectionItem.length;i++){
if(this.multipleSelectionItem[i].status != '2'){
statusFlag = false;
}
var newSupplierIdArr = [...new Set(supplierIdArr)]; //利用了Set结构不能接收重复数据的特点
if(newSupplierIdArr.length != 1){
this.$message({
type: 'error',
message: '所选数据供应商需一致',
duration: 1000
});
return
}
const ids = this.multipleSelection.join()
request({

8
SC-web/src/views/scm/basicInformation/receiptin/index.vue
Unescape View File

@ -70,7 +70,7 @@
@selection-change="handleSelectionChange" border>
<el-table-column type="index" width="50" label="序号" fixed="left" align="center" />
<el-table-column prop="documentno" label="单据编号" sortable width="200" align="center" fixed="left" />
<el-table-column prop="supplierId" label="供应商" sortable width="220" align="center" fixed="left" />
<el-table-column prop="supplier" label="供应商" sortable width="220" align="center" fixed="left" />
<el-table-column prop="receiptamount" label="入库金额" sortable width="120" align="center" />
<el-table-column prop="receiptnum" label="入库数量" sortable width="120" align="center" />
<el-table-column prop="currency" label="币别" sortable width="80" align="center">
@ -79,7 +79,7 @@
</template>
</el-table-column>
<el-table-column prop="warehousingdate" sortable label="入库日期" width="120" align="center" />
<el-table-column prop="souceno" sortable label="来源单号" width="200" align="center" />
<el-table-column prop="purchaseorderSouceno" sortable label="来源单号" width="200" align="center" />
<el-table-column prop="type" sortable label="业务类型" width="120" align="center">
<template slot-scope="scope">
{{ scope.row.type | dynamicText(typeOptions) }}
@ -162,7 +162,7 @@
label: '单据编号'
},
{
prop: 'suppliername',
prop: 'supplier',
label: '供应商名称'
},
{
@ -182,7 +182,7 @@
label: '入库日期'
},
{
prop: 'souceno',
prop: 'purchaseorderSouceno',
label: '来源单号'
},
{

30
SC-web/src/views/scm/basicInformation/tradeupload/Detail.vue
Unescape View File

@ -60,27 +60,27 @@
</el-col>
<el-col :span="6">
<el-form-item label="销售价格" prop="salesPrice">
<el-input-number v-model="dataForm.salesPrice" :style='{"width":"100%"}'></el-input-number>
<el-input-number v-model="dataForm.salesPrice" :style='{"width":"100%"}' :precision="6"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="皮重" prop="tareWeight">
<el-input-number v-model="dataForm.tareWeight" :style='{"width":"100%"}'></el-input-number>
<el-form-item label="毛重" prop="grossWeight">
<el-input-number v-model="dataForm.grossWeight" :style='{"width":"100%"}' @change="grossWeightChange" :precision="6"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="毛重" prop="grossWeight">
<el-input-number v-model="dataForm.grossWeight" :style='{"width":"100%"}' @change="grossWeightChange"></el-input-number>
<el-form-item label="皮重" prop="tareWeight">
<el-input-number v-model="dataForm.tareWeight" :style='{"width":"100%"}' :precision="6"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="扣重" prop="buckleWeight">
<el-input-number v-model="dataForm.buckleWeight" :style='{"width":"100%"}'></el-input-number>
<el-input-number v-model="dataForm.buckleWeight" :style='{"width":"100%"}' :precision="6"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="净重" prop="netWeight">
<el-input-number v-model="dataForm.netWeight" :style='{"width":"100%"}'></el-input-number>
<el-input-number v-model="dataForm.netWeight" :style='{"width":"100%"}' :precision="6"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
@ -125,7 +125,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="运费" prop="transportPrice">
<el-input-number v-model="dataForm.transportPrice" :style='{"width":"100%"}'></el-input-number>
<el-input-number v-model="dataForm.transportPrice" :style='{"width":"100%"}' :precision="6"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
@ -135,8 +135,8 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="业务员" prop="businessId">
<popupSelect v-model="dataForm.businessId" placeholder="请选择业务员" clearable field="businessId"
<el-form-item label="业务员1" prop="businessId">
<popupSelect v-model="dataForm.businessId" placeholder="请选择业务员1" clearable field="businessId"
interfaceId="ebcc44be142e43b795c0d769abd6d25a" :columnOptions="businessIdcolumnOptions"
propsValue="F_Id" relationField="F_RealName" popupType="dialog" popupTitle="选择数据" popupWidth="800px"
hasPage :pageSize="20" :bissId="dataForm.businessId">
@ -145,8 +145,8 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="自然人" prop="naturalId">
<popupSelect v-model="dataForm.naturalId" placeholder="请选择自然人" clearable field="naturalId"
<el-form-item label="业务员2" prop="naturalId">
<popupSelect v-model="dataForm.naturalId" placeholder="请选择业务员2" clearable field="naturalId"
interfaceId="395933800510599301" :columnOptions="naturalIdcolumnOptions" propsValue="id"
relationField="name" popupType="dialog" popupTitle="选择数据" popupWidth="800px" hasPage :pageSize="20">
@ -390,13 +390,13 @@
"value": "positionName"
}],
naturalIdcolumnOptions: [{
"label": "自然人名称",
"label": "业务员2名称",
"value": "name"
}, {
"label": "自然人手机号",
"label": "业务员2手机号",
"value": "contact"
}, {
"label": "自然人地址",
"label": "业务员2地址",
"value": "adress"
}, ],

41
SC-web/src/views/scm/basicInformation/tradeupload/Form.vue
Unescape View File

@ -60,27 +60,27 @@
</el-col>
<el-col :span="6">
<el-form-item label="销售价格" prop="salesPrice">
<el-input-number v-model="dataForm.salesPrice" :style='{"width":"100%"}'></el-input-number>
<el-input-number v-model="dataForm.salesPrice" :style='{"width":"100%"}' :precision="6"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="皮重" prop="tareWeight">
<el-input-number v-model="dataForm.tareWeight" :style='{"width":"100%"}'></el-input-number>
<el-form-item label="毛重" prop="grossWeight">
<el-input-number v-model="dataForm.grossWeight" :style='{"width":"100%"}' @change="grossWeightChange" :precision="6"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="毛重" prop="grossWeight">
<el-input-number v-model="dataForm.grossWeight" :style='{"width":"100%"}' @change="grossWeightChange"></el-input-number>
<el-form-item label="皮重" prop="tareWeight">
<el-input-number v-model="dataForm.tareWeight" :style='{"width":"100%"}' :precision="6"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="扣重" prop="buckleWeight">
<el-input-number v-model="dataForm.buckleWeight" :style='{"width":"100%"}'></el-input-number>
<el-input-number v-model="dataForm.buckleWeight" :style='{"width":"100%"}' :precision="6"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="净重" prop="netWeight">
<el-input-number v-model="dataForm.netWeight" :style='{"width":"100%"}'></el-input-number>
<el-input-number v-model="dataForm.netWeight" :style='{"width":"100%"}' :precision="6"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
@ -125,7 +125,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="运费" prop="transportPrice">
<el-input-number v-model="dataForm.transportPrice" :style='{"width":"100%"}'></el-input-number>
<el-input-number v-model="dataForm.transportPrice" :style='{"width":"100%"}' :precision="6"></el-input-number>
</el-form-item>
</el-col>
@ -137,8 +137,8 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="业务员" prop="businessId">
<popupSelect v-model="dataForm.businessId" placeholder="请选择业务员" clearable field="businessId"
<el-form-item label="业务员1" prop="businessId">
<popupSelect v-model="dataForm.businessId" placeholder="请选择业务员1" clearable field="businessId"
interfaceId="ebcc44be142e43b795c0d769abd6d25a" :columnOptions="businessIdcolumnOptions"
propsValue="F_Id" relationField="F_RealName" popupType="dialog" popupTitle="选择数据" popupWidth="800px"
hasPage :pageSize="20" :bissId="dataForm.businessId">
@ -147,8 +147,8 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="自然人" prop="naturalId">
<popupSelect v-model="dataForm.naturalId" placeholder="请选择自然人" clearable field="naturalId"
<el-form-item label="业务员2" prop="naturalId">
<popupSelect v-model="dataForm.naturalId" placeholder="请选择业务员2" clearable field="naturalId"
interfaceId="395933800510599301" :columnOptions="naturalIdcolumnOptions" propsValue="id"
relationField="name" popupType="dialog" popupTitle="选择数据" popupWidth="800px" hasPage :pageSize="20">
@ -389,13 +389,13 @@
"value": "positionName"
}],
naturalIdcolumnOptions: [{
"label": "自然人名称",
"label": "业务员2名称",
"value": "name"
}, {
"label": "自然人手机号",
"label": "业务员2手机号",
"value": "contact"
}, {
"label": "自然人地址",
"label": "业务员2地址",
"value": "adress"
}, ],
@ -556,6 +556,9 @@
});
} else {
this.clearData(this.dataForm)
this.dataForm.businessId = this.$store.state.user.userInfo.userId;
this.dataForm.businessName = this.$store.state.user.userInfo.userName;
this.dataForm.poundDate = new Date();
}
});
this.$store.commit('generator/UPDATE_RELATION_DATA', {})
@ -572,7 +575,7 @@
if(grossWeight < tareWeight + buckleWeight + netWeight){
this.$message({
message: '毛重不得小于皮重+扣重+净重',
type: 'success',
type: 'error',
duration: 1000
})
return
@ -580,7 +583,7 @@
if(buckleWeight >= netWeight){
this.$message({
message: '扣重不得大于净重',
type: 'success',
type: 'error',
duration: 1000
})
return
@ -588,7 +591,7 @@
if(buckleWeight >= grossWeight){
this.$message({
message: '扣重不得大于毛重',
type: 'success',
type: 'error',
duration: 1000
})
return
@ -596,7 +599,7 @@
if(netWeight <= 0){
this.$message({
message: '净重必须大于0',
type: 'success',
type: 'error',
duration: 1000
})
return

32
SC-web/src/views/scm/basicInformation/tradeupload/Form2.vue
Unescape View File

@ -70,32 +70,32 @@
</el-col>
<el-col :span="6">
<el-form-item label="采购价格" prop="purchasePrice">
<el-input-number v-model="dataForm.purchasePrice" :style='{"width":"100%"}'></el-input-number>
<el-input-number v-model="dataForm.purchasePrice" :style='{"width":"100%"}' :precision="6"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="销售价格" prop="salesPrice">
<el-input-number v-model="dataForm.salesPrice" :style='{"width":"100%"}'></el-input-number>
<el-input-number v-model="dataForm.salesPrice" :style='{"width":"100%"}' :precision="6"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="皮重" prop="tareWeight">
<el-input-number v-model="dataForm.tareWeight" :style='{"width":"100%"}'></el-input-number>
<el-form-item label="毛重" prop="grossWeight">
<el-input-number v-model="dataForm.grossWeight" :style='{"width":"100%"}' :precision="6"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="毛重" prop="grossWeight">
<el-input-number v-model="dataForm.grossWeight" :style='{"width":"100%"}'></el-input-number>
<el-form-item label="皮重" prop="tareWeight">
<el-input-number v-model="dataForm.tareWeight" :style='{"width":"100%"}' :precision="6"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="扣重" prop="buckleWeight">
<el-input-number v-model="dataForm.buckleWeight" :style='{"width":"100%"}'></el-input-number>
<el-input-number v-model="dataForm.buckleWeight" :style='{"width":"100%"}' :precision="6"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="净重" prop="netWeight">
<el-input-number v-model="dataForm.netWeight" :style='{"width":"100%"}'></el-input-number>
<el-input-number v-model="dataForm.netWeight" :style='{"width":"100%"}' :precision="6"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
@ -152,7 +152,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="运费" prop="transportPrice">
<el-input-number v-model="dataForm.transportPrice" :style='{"width":"100%"}'></el-input-number>
<el-input-number v-model="dataForm.transportPrice" :style='{"width":"100%"}' :precision="6"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="6">
@ -162,8 +162,8 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="业务员" prop="businessId">
<popupSelect v-model="dataForm.businessId" placeholder="请选择业务员" clearable field="businessId"
<el-form-item label="业务员1" prop="businessId">
<popupSelect v-model="dataForm.businessId" placeholder="请选择业务员1" clearable field="businessId"
interfaceId="ebcc44be142e43b795c0d769abd6d25a" :columnOptions="businessIdcolumnOptions"
propsValue="F_Id" relationField="F_RealName" popupType="dialog" popupTitle="选择数据" popupWidth="800px"
hasPage :pageSize="20" :bissId="dataForm.businessId">
@ -172,8 +172,8 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="自然人" prop="naturalId">
<popupSelect v-model="dataForm.naturalId" placeholder="请选择自然人" clearable field="naturalId"
<el-form-item label="业务员2" prop="naturalId">
<popupSelect v-model="dataForm.naturalId" placeholder="请选择业务员2" clearable field="naturalId"
interfaceId="395933800510599301" :columnOptions="naturalIdcolumnOptions" propsValue="id"
relationField="name" popupType="dialog" popupTitle="选择数据" popupWidth="800px" hasPage :pageSize="20">
@ -420,13 +420,13 @@
"value": "F_FullName"
}, ],
naturalIdcolumnOptions: [{
"label": "自然人名称",
"label": "业务员2名称",
"value": "name"
}, {
"label": "自然人手机号",
"label": "业务员2手机号",
"value": "contact"
}, {
"label": "自然人地址",
"label": "业务员2地址",
"value": "adress"
}, ],

Write Preview
Loading…
Cancel
Save