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

销售订单问题

Browse Source
product
杨世强 2 years ago
parent e133116c15
commit 666a9261d8
25 changed files with 252 additions and 54 deletions
Show Stats Download Patch File Download Diff File

6
SC-boot/linkage-scm/src/main/java/jnpf/poundlist/controller/PoundlistController.java
Unescape View File

@ -96,8 +96,14 @@ public class PoundlistController {
PoundlistEntity poundlistEntity = poundlistService.getOne(queryWrapper);
if (ObjectUtils.isNotEmpty(poundlistEntity)) {
ContractFileEntity entity = contractFileService.getInfo(poundlistEntity.getSalesId());
if (entity!=null && StringUtils.isNotEmpty(entity.getContractNo())) {
poundlistEntity.setContractNo(entity.getContractNo());
}
poundlistEntity.setDocumentNo(generaterSwapUtil.getBillNumber("salesOrder", false));
poundlistEntity.setRate("0");
if (poundlistEntity.getSalesPrice()!=null) {
poundlistEntity.setUnitPrice(poundlistEntity.getSalesPrice());
}
list.add(poundlistEntity);
}
}

8
SC-boot/linkage-scm/src/main/java/jnpf/poundlist/entity/PoundlistEntity.java
Unescape View File

@ -213,4 +213,12 @@ public class PoundlistEntity {
private String purchaseContractNo;
@TableField(exist = false)
private String documentNo;
@TableField(exist = false)
private String rate;
@TableField(exist = false)
private BigDecimal unitPrice;
@TableField(exist = false)
private BigDecimal noPrice;
@TableField(exist = false)
private BigDecimal price;
}

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

@ -87,4 +87,11 @@ public class SalebackEntity {
@TableField("STATUS")
private String status;
@TableField(exist = false)
private String contractName;
@TableField(exist = false)
private String customerName;
@TableField(exist = false)
private String saledocumentNo;
}

8
SC-boot/linkage-scm/src/main/java/jnpf/saleback/mapper/SalebackMapper.java
Unescape View File

@ -1,8 +1,14 @@
package jnpf.saleback.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jnpf.saleback.entity.SalebackEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import jnpf.saleback.model.saleback.SalebackPagination;
import jnpf.saleorder.entity.SaleorderitemEntity;
import jnpf.saleorder.model.saleorderitem.SaleorderitemPagination;
import org.apache.ibatis.annotations.Param;
/**
*
@ -13,5 +19,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* 日期： 2023-01-13
*/
public interface SalebackMapper extends BaseMapper<SalebackEntity> {
IPage<SalebackEntity> querySaleBack(@Param("page") Page<SalebackEntity> page, @Param("salebackPagination") SalebackPagination salebackPagination);
}

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

@ -3,6 +3,7 @@
package jnpf.saleback.model.saleback;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import java.sql.Time;
import java.util.Date;
@ -74,6 +75,13 @@ public class SalebackListVO{
@JsonProperty("creatorUserName")
private String creatorUserName;
@TableField(exist = false)
private String contractName;
@TableField(exist = false)
private String customerName;
@TableField(exist = false)
private String saledocumentNo;
//
// /**列表子表数据 */
// @JsonProperty("jg_salesorder")

9
SC-boot/linkage-scm/src/main/java/jnpf/saleback/model/saleback/SalebackPagination.java
Unescape View File

@ -3,6 +3,8 @@ package jnpf.saleback.model.saleback;
import lombok.Data;
import jnpf.base.Pagination;
import java.util.Date;
import java.util.List;
/**
@ -18,6 +20,13 @@ public class SalebackPagination extends Pagination {
/** 单据编号 */
private String documentNo;
private String saledocumentNo;
private String status;
private Date startDate;
private Date endDate;
/**
* 菜单id
*/

9
SC-boot/linkage-scm/src/main/java/jnpf/saleback/service/impl/SalebackServiceImpl.java
Unescape View File

@ -54,6 +54,8 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
@Autowired
private Saleback_item0Service saleback_item0Service;
@Autowired SalebackMapper salebackMapper;
@ -134,14 +136,9 @@ public class SalebackServiceImpl extends ServiceImpl<SalebackMapper, SalebackEnt
e.printStackTrace();
}
}
if((total>0 && AllIdList.size()>0) || total==0){
Page<SalebackEntity> page=new Page<>(salebackPagination.getCurrentPage(), salebackPagination.getPageSize());
IPage<SalebackEntity> userIPage=this.page(page, salebackQueryWrapper);
IPage<SalebackEntity> userIPage=salebackMapper.querySaleBack(page, salebackPagination);
return salebackPagination.setData(userIPage.getRecords(),userIPage.getTotal());
}else{
List<SalebackEntity> list = new ArrayList();
return salebackPagination.setData(list, list.size());
}
}
@Override
public List<SalebackEntity> getTypeList(SalebackPagination salebackPagination,String dataType){

16
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderitemController.java
Unescape View File

@ -392,18 +392,14 @@ public class SaleorderitemController {
List<SaleorderitemEntity> list= saleorderitemService.getList(saleorderitemPagination);
//处理id字段转名称，若无需转或者为空可删除
for(SaleorderitemEntity entity:list){
Map<String,Object> contractCodeMap = new HashMap<>();
entity.setContractId(generaterSwapUtil.getPopupSelectValue("391146878474963333","id","contract_name",entity.getContractId(),contractCodeMap));
Map<String,Object> costomerCodeMap = new HashMap<>();
entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("398016916830126469","id","supplier_nm",entity.getCustomerId(),costomerCodeMap));
// Map<String,Object> contractCodeMap = new HashMap<>();
// entity.setContractId(generaterSwapUtil.getPopupSelectValue("391146878474963333","id","contract_name",entity.getContractId(),contractCodeMap));
// Map<String,Object> costomerCodeMap = new HashMap<>();
// entity.setCustomerId(generaterSwapUtil.getPopupSelectValue("398016916830126469","id","supplier_nm",entity.getCustomerId(),costomerCodeMap));
entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName()));
// entity.setCreatorTime(generaterSwapUtil.userSelectValue(entity.getCreatorTime()));
}
List<SaleorderitemListVO> listVO=JsonUtil.getJsonToList(list,SaleorderitemListVO.class);
for(SaleorderitemListVO saleorderitemVO:listVO){
}
PageListVO vo=new PageListVO();
vo.setList(listVO);
PaginationVO page=JsonUtil.getJsonToBean(saleorderitemPagination,PaginationVO.class);
@ -723,7 +719,7 @@ public class SaleorderitemController {
jg_receiptoutModelList = JsonUtil.getJsonToList(list, ReceiptoutsoitemModel.class);
for (ReceiptoutsoitemModel jg_receiptoutModel : jg_receiptoutModelList) {
jg_receiptoutModel.setDocumentNo(jg_receiptoutList.get(0).getDocumentNo());
jg_receiptoutModel.setIssueDate(jg_receiptoutList.get(0).getIssueDate().getTime());
jg_receiptoutModel.setIssueDate(jg_receiptoutList.get(0).getIssueDate());
Map<String,Object> vehicleIdMap = new HashMap<>();
jg_receiptoutModel.setVehicleId(generaterSwapUtil.getPopupSelectValue("398732963950472005","id","ticketno",jg_receiptoutModel.getVehicleId(),vehicleIdMap));
Map<String,Object> materialIdMap = new HashMap<>();
@ -771,6 +767,8 @@ public class SaleorderitemController {
for(PaymentsoitemModel jg_paymentModel : jg_paymentModelList){
}
vo.setPaymentsoitemList(jg_paymentModelList);
List<PoundlistEntity> poundlist = saleorderitemService.GetPoundlistList(id);
vo.setPoundlistentityList(poundlist);
//附表数据转换

12
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SaleorderitemEntity.java
Unescape View File

@ -87,8 +87,8 @@ public class SaleorderitemEntity {
// @TableField("CONTRACT_CODE")
// private String contractCode;
@TableField("CONTRACT_NAME")
private String contractName;
// @TableField("CONTRACT_NAME")
// private String contractName;
@TableField("CONTRACT_NO")
private String contractNo;
@ -96,8 +96,8 @@ public class SaleorderitemEntity {
// @TableField("COSTOMER_CODE")
// private String costomerCode;
@TableField("COSTOMER_NAME")
private String costomerName;
// @TableField("COSTOMER_NAME")
// private String costomerName;
@TableField("NUM")
private BigDecimal num;
@ -170,5 +170,9 @@ public class SaleorderitemEntity {
@TableField(exist = false)
private BigDecimal amount;
@TableField(exist = false)
private String contractName;
@TableField(exist = false)
private String customerName;
}

10
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SaleorderitemMapper.java
Unescape View File

@ -1,8 +1,16 @@
package jnpf.saleorder.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jnpf.poundlist.entity.PoundlistEntity;
import jnpf.poundlist.model.poundlist.PoundlistPagination;
import jnpf.saleorder.entity.SaleorderitemEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import jnpf.saleorder.model.saleorderitem.SaleorderitemPagination;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
*
@ -13,5 +21,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* 日期： 2023-02-22
*/
public interface SaleorderitemMapper extends BaseMapper<SaleorderitemEntity> {
IPage<SaleorderitemEntity> querySalesOrder(@Param("page") Page<SaleorderitemEntity> page, @Param("saleorderitemPagination") SaleorderitemPagination saleorderitemPagination);
PoundlistEntity queryPoundlist(String poundlistId);
}

4
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/Arinvoices_item0soitemModel.java
Unescape View File

@ -1,5 +1,6 @@
package jnpf.saleorder.model.saleorderitem;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.List;
import java.util.Date;
@ -47,8 +48,9 @@ public class Arinvoices_item0soitemModel {
private String invoiceStatus;
/** 开票日期 **/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonProperty("invoiceDate")
private Long invoiceDate;
private Date invoiceDate;
/** 开票人 **/
@JsonProperty("creatorUserName")
private String creatorUserName;

4
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/CollectionsoitemModel.java
Unescape View File

@ -1,5 +1,6 @@
package jnpf.saleorder.model.saleorderitem;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.List;
import java.util.Date;
@ -23,8 +24,9 @@ public class CollectionsoitemModel {
private String documentNo;
/** 收款时间 **/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonProperty("businessDate")
private Long businessDate;
private Date businessDate;
/** 收款金额 **/
@JsonProperty("amountCollected")
private String amountCollected;

4
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/PaymentsoitemModel.java
Unescape View File

@ -1,5 +1,6 @@
package jnpf.saleorder.model.saleorderitem;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.List;
import java.util.Date;
@ -23,8 +24,9 @@ public class PaymentsoitemModel {
private String documentno;
/** 付款日期 **/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonProperty("duedate")
private Long duedate;
private Date duedate;
/** 付款金额 **/
@JsonProperty("paymentamount")
private String paymentamount;

4
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/ReceiptoutsoitemModel.java
Unescape View File

@ -1,6 +1,7 @@
package jnpf.saleorder.model.saleorderitem;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.List;
import java.util.Date;
@ -24,8 +25,9 @@ public class ReceiptoutsoitemModel {
private String documentNo;
/** 出库日期 **/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonProperty("issueDate")
private Long issueDate;
private Date issueDate;
/** 车牌号 **/
@JsonProperty("vehicleId")
private String vehicleId;

4
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemInfoVO.java
Unescape View File

@ -4,6 +4,7 @@
package jnpf.saleorder.model.saleorderitem;
import com.baomidou.mybatisplus.annotation.TableField;
import jnpf.poundlist.entity.PoundlistEntity;
import jnpf.saleorder.model.saleorderitem.Salesorder_item0Model;
import jnpf.saleorder.model.saleorderitem.ReceiptoutsoitemModel;
import jnpf.saleorder.model.saleorderitem.Arinvoices_item0soitemModel;
@ -124,4 +125,7 @@ public class SaleorderitemInfoVO{
/** 客户id**/
@TableField("customerId")
private String customerId;
@TableField(exist = false)
private List<PoundlistEntity> poundlistentityList;
}

5
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemListVO.java
Unescape View File

@ -113,5 +113,10 @@ public class SaleorderitemListVO{
@TableField("customerId")
private String customerId;
@TableField(exist = false)
private String contractName;
@TableField(exist = false)
private String customerName;
}

9
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SaleorderitemPagination.java
Unescape View File

@ -3,6 +3,8 @@ package jnpf.saleorder.model.saleorderitem;
import lombok.Data;
import jnpf.base.Pagination;
import java.util.Date;
import java.util.List;
/**
@ -22,7 +24,12 @@ public class SaleorderitemPagination extends Pagination {
/** 单据状态 */
private String status;
/** 单据状态 */
private String contractName;
private String customerName;
private Date startDate;
private Date endDate;
private List<String> creatorTime;
/**
* 菜单id

4
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorderitem/SalesbacksoitemModel.java
Unescape View File

@ -1,5 +1,6 @@
package jnpf.saleorder.model.saleorderitem;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.List;
import java.util.Date;
@ -23,8 +24,9 @@ public class SalesbacksoitemModel {
private String documentNo;
/** 退货日期 **/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonProperty("creatorTime")
private Long creatorTime;
private Date creatorTime;
/** 退货数量 **/
@JsonProperty("refundNum")
private String refundNum;

2
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/SaleorderitemService.java
Unescape View File

@ -1,6 +1,7 @@
package jnpf.saleorder.service;
import com.baomidou.mybatisplus.extension.service.IService;
import jnpf.poundlist.entity.PoundlistEntity;
import jnpf.receiptout.entity.Receiptout_item0Entity;
import jnpf.saleorder.entity.*;
import jnpf.saleorder.model.saleorderitem.SaleorderitemPagination;
@ -37,6 +38,7 @@ public interface SaleorderitemService extends IService<SaleorderitemEntity> {
List<CollectionsoitemEntity> GetCollectionsoitemList(String id);
List<SalesbacksoitemEntity> GetSalesbacksoitemList(String id);
List<PaymentsoitemEntity> GetPaymentsoitemList(String id);
List<PoundlistEntity> GetPoundlistList(String id);
List<Receiptout_item0Entity> getReceiptout(String id);

52
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java
Unescape View File

@ -1,6 +1,8 @@
package jnpf.saleorder.service.impl;
import jnpf.arinvoices.entity.ArinvoicesEntity;
import jnpf.poundlist.entity.PoundlistEntity;
import jnpf.poundlist.service.PoundlistService;
import jnpf.receiptout.entity.Receiptout_item0Entity;
import jnpf.receiptout.service.Receiptout_item0Service;
import jnpf.saleorder.entity.*;
@ -21,10 +23,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
import java.util.stream.Collectors;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.beans.factory.annotation.Autowired;
@ -33,6 +33,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import java.text.SimpleDateFormat;
import jnpf.util.*;
import javax.annotation.Resource;
import java.util.*;
/**
@ -73,6 +75,10 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
private PaymentsoitemService paymentsoitemService;
@Autowired
private Receiptout_item0Service receiptout_item0Service;
@Resource
private SaleorderitemMapper saleorderitemMapper;
@Autowired
private PoundlistService poundlistService;
@ -257,14 +263,9 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
e.printStackTrace();
}
}
if((total>0 && AllIdList.size()>0) || total==0){
Page<SaleorderitemEntity> page=new Page<>(saleorderitemPagination.getCurrentPage(), saleorderitemPagination.getPageSize());
IPage<SaleorderitemEntity> userIPage=this.page(page, saleorderitemQueryWrapper);
IPage<SaleorderitemEntity> userIPage=saleorderitemMapper.querySalesOrder(page, saleorderitemPagination);
return saleorderitemPagination.setData(userIPage.getRecords(),userIPage.getTotal());
}else{
List<SaleorderitemEntity> list = new ArrayList();
return saleorderitemPagination.setData(list, list.size());
}
}
@Override
public List<SaleorderitemEntity> getTypeList(SaleorderitemPagination saleorderitemPagination,String dataType){
@ -483,7 +484,7 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
@Override
public List<ReceiptoutsoitemEntity> GetReceiptoutsoitemList(String id){
QueryWrapper<ReceiptoutsoitemEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(ReceiptoutsoitemEntity::getSalesId, id);
queryWrapper.lambda().eq(ReceiptoutsoitemEntity::getSourceNo, id);
return receiptoutsoitemService.list(queryWrapper);
}
@Override
@ -511,6 +512,35 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
return paymentsoitemService.list(queryWrapper);
}
@Override
public List<PoundlistEntity> GetPoundlistList(String id) {
QueryWrapper<Salesorder_item0Entity> saleQueryWrapper = new QueryWrapper<>();
saleQueryWrapper.lambda().eq(Salesorder_item0Entity::getSalesOrderId,id);
List<Salesorder_item0Entity> list = salesorder_item0Service.list(saleQueryWrapper);
List<PoundlistEntity> poundlistEntityList = new ArrayList<>();
if (list.size()>0) {
for (Salesorder_item0Entity entity : list) {
PoundlistEntity poundlistEntity = saleorderitemMapper.queryPoundlist(entity.getPoundlistId());
if (ObjectUtils.isNotEmpty(poundlistEntity)){
if (StringUtils.isNotEmpty(entity.getRate())){
poundlistEntity.setRate(entity.getRate());
}
if (entity.getUnitPrice()!=null){
poundlistEntity.setUnitPrice(entity.getUnitPrice());
}
if (entity.getNoPrice()!=null){
poundlistEntity.setNoPrice(entity.getNoPrice());
}
if (entity.getPrice()!=null){
poundlistEntity.setPrice(entity.getPrice());
}
poundlistEntityList.add(poundlistEntity);
}
}
}
return poundlistEntityList;
}
@Override
public List<Receiptout_item0Entity> getReceiptout(String id) {
QueryWrapper<Receiptout_item0Entity> queryWrapper = new QueryWrapper<>();

29
SC-boot/linkage-scm/src/main/resources/mapper/saleback/SalebackMapper.xml
Unescape View File

@ -0,0 +1,29 @@
<?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.saleback.mapper.SalebackMapper">
<select id="querySaleBack" resultType="jnpf.saleback.entity.SalebackEntity">
select
a.*,
b.document_no saledocumentNo,
c.contract_name contractName,
d.supplier_nm customerName
from
jg_salesback a
LEFT JOIN jg_salesorder b on a.sales_order_id = b.id
LEFT JOIN jg_contract c on b.contract_id = c.id
LEFT JOIN jg_customer d on b.customer_id = d.id
where 1 = 1
<if test="salebackPagination.documentNo != null and salebackPagination.documentNo != ''">
and a.document_no LIKE CONCAT('%',#{salebackPagination.documentNo},'%')
</if>
<if test="salebackPagination.saledocumentNo != null and salebackPagination.saledocumentNo != ''">
and b.document_no LIKE CONCAT('%',#{salebackPagination.saledocumentNo},'%')
</if>
<if test="salebackPagination.status != null and salebackPagination.status != ''">
and a.status LIKE CONCAT('%',#{salebackPagination.status},'%')
</if>
<if test="salebackPagination.startDate != null and salebackPagination.endDate != null">
and a.creator_time &gt; #{salebackPagination.startDate} AND a.POUND_DATE &lt;= #{salebackPagination.endDate}
</if>
</select>
</mapper>

51
SC-boot/linkage-scm/src/main/resources/mapper/salesorderitem/SaleorderMapper.xml
Unescape View File

@ -2,6 +2,57 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="jnpf.saleorder.mapper.SaleorderitemMapper">
<select id="querySalesOrder" resultType="jnpf.saleorder.entity.SaleorderitemEntity">
SELECT
a.*,
b.contract_name contractName,
c.supplier_nm customerName
FROM
jg_salesorder a
left join jg_contract b on a.contract_id = b.id
left join jg_customer c on a.customer_id = c.id
where 1=1
<if test="saleorderitemPagination.documentNo != null and saleorderitemPagination.documentNo != ''">
and a.document_no LIKE CONCAT('%',#{saleorderitemPagination.documentNo},'%')
</if>
<if test="saleorderitemPagination.status != null and saleorderitemPagination.status != ''">
and a.status LIKE CONCAT('%',#{saleorderitemPagination.status},'%')
</if>
<if test="saleorderitemPagination.contractName != null and saleorderitemPagination.contractName != ''">
and b.contract_name LIKE CONCAT('%',#{saleorderitemPagination.contractName},'%')
</if>
<if test="saleorderitemPagination.customerName != null and saleorderitemPagination.customerName != ''">
and c.supplier_nm LIKE CONCAT('%',#{saleorderitemPagination.customerName},'%')
</if>
<if test="saleorderitemPagination.startDate != null and saleorderitemPagination.endDate != null">
and a.creator_time &gt; #{saleorderitemPagination.startDate} AND a.POUND_DATE &lt;= #{saleorderitemPagination.endDate}
</if>
</select>
<select id="queryPoundlist" resultType="jnpf.poundlist.entity.PoundlistEntity">
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
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.id = #{poundlistId}
</select>
</mapper>

17
SC-web/src/views/scm/basicInformation/poundlist/salesForm.vue
Unescape View File

@ -928,19 +928,16 @@
var amount = 0;
var advance = 0;
var notPrice = 0;
var rate = 0;
for (let i = 0;i<list.length; i++){
this.dataForm.salesorder_item0List[i].unitPrice = list[i].salesPrice;
// this.dataForm.salesorder_item0List[i].unitPrice = list[i].salesPrice;
this.dataForm.salesorder_item0List[i].poundlistId = list[i].id;
this.dataForm.salesorder_item0List[i].price = list[i].salesPrice*list[i].settlement;
// this.rateOptions.find((item) => {
// if (rate == item.id) {
// this.dataForm.salesorder_item0List[i].rate = item.fullName
// debugger
// this.dataForm.salesorder_item0List[i].noPrice = this.dataForm.salesorder_item0List[i].price*(100-item.fullName)/100
// notPrice = notPrice + parseFloat(this.dataForm.salesorder_item0List[i].noPrice)
// }
// })
this.rateOptions.find((item) => {
if (this.dataForm.salesorder_item0List[i].rate == item.id) {
this.dataForm.salesorder_item0List[i].noPrice = this.dataForm.salesorder_item0List[i].price*(100-item.fullName)/100
notPrice = notPrice + parseFloat(this.dataForm.salesorder_item0List[i].noPrice)
}
})
if (list[i].advance == 1){
advance = advance + list[i].salesPrice*list[i].settlement;
}

4
SC-web/src/views/scm/basicInformation/saleback/index.vue
Unescape View File

@ -40,7 +40,7 @@
<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="salesOrderId" label="销售订单" width="200" align="center"sortable fixed="left"
<el-table-column prop="saledocumentNo" label="销售订单" width="200" align="center"sortable fixed="left"
/>
<!-- <el-table-column prop="jg_salesorder.contractName" label="合同名称" width="120"sortable align="center"-->
<!-- />-->
@ -130,7 +130,7 @@
exportBoxVisible: false,
columnList: [
{ prop: 'documentNo', label: '单据编号' },
{ prop: 'salesOrderId', label: '销售订单' },
{ prop: 'saledocumentNo', label: '销售订单' },
// { prop: 'jg_salesorder.contractName', label: '合同名称' },
// { prop: 'jg_salesorder.costomerName', label: '客户名称' },
{ prop: 'refundAmount', label: '退款金额' },

18
SC-web/src/views/scm/basicInformation/saleorder/index.vue
Unescape View File

@ -9,6 +9,16 @@
<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.contractName" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="客户">
<el-input v-model="query.customerName" placeholder="请输入" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="单据状态 ">
<el-select v-model="query.status" placeholder="请选择"
@ -68,9 +78,9 @@
/>
<el-table-column prop="erpNo" label="ERP订单号" width="0" align="center"
/>
<el-table-column prop="contractId" label="合同名称" width="0" align="center"
<el-table-column prop="contractName" label="合同名称" width="0" align="center"
/>
<el-table-column prop="customerId" label="客户名称" width="0" align="center"
<el-table-column prop="customerName" label="客户名称" width="0" align="center"
/>
<el-table-column prop="price" label="金额" width="0" align="center"
/>
@ -167,8 +177,8 @@ width="150" >
columnList: [
{prop: 'documentNo', label: '单据编号'},
{prop: 'erpNo', label: 'ERP订单号'},
{prop: 'contractId', label: '合同名称'},
{prop: 'customerId', label: '客户名称'},
{prop: 'contractName', label: '合同名称'},
{prop: 'customerName', label: '客户名称'},
{prop: 'price', label: '金额'},
{prop: 'num', label: '重量'},
{prop: 'currency', label: '币别'},

Write Preview
Loading…
Cancel
Save