Merge remote-tracking branch 'origin/master'

# Conflicts:
#	jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/index.vue
jg-waiwang-pro
胡川虎 3 months ago
commit 132dcec6cb

@ -113,6 +113,7 @@ springdoc:
# password: 123456
config:
yunguaninterfaceurl: http://172.16.1.50:8020
kkFileUrl: http://127.0.0.1:30090/FileServer/ #kkfile文件预览服务地址
ApiDomain: http://127.0.0.1:30000 #后端域名(文档预览中使用)
FrontDomain: http://127.0.0.1:3000 #前端域名(文档预览中使用)

@ -113,6 +113,7 @@ springdoc:
# password: 123456
config:
yunguaninterfaceurl: http://172.16.8.54:8020
kkFileUrl: http://127.0.0.1:30090/FileServer/ #kkfile文件预览服务地址
ApiDomain: http://127.0.0.1:40000 #后端域名(文档预览中使用)
FrontDomain: http://127.0.0.1:9000 #前端域名(文档预览中使用)

@ -116,6 +116,7 @@ springdoc:
# password: 123456
config:
yunguaninterfaceurl: http://172.16.1.50:8020
kkFileUrl: http://127.0.0.1:30090/FileServer/ #kkfile文件预览服务地址
ApiDomain: http://127.0.0.1:50000 #后端域名(文档预览中使用)
FrontDomain: http://127.0.0.1:3000 #前端域名(文档预览中使用)

@ -0,0 +1,7 @@
<?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.mapper.SubjectBasicExclusiveMapper">
</mapper>

@ -124,11 +124,11 @@
<select id="saleOutBoundByYunGuan" resultType="jnpf.model.yunguan.YunguanSaleOutBoundModel">
SELECT
a.id AS OUT_ID,
aa.id AS OUT_ID,
e.f_en_code AS COMP_ID,
f.f_en_code AS DEPT_ID,
a.document_no AS PROD_ZL,
aa.order_line as CK_ORDER,
concat(a.document_no,'-',LPAD(aa.order_line,3,0)) as CK_ORDER,
IF(a.warehousing_outbound_type = 1,c.code,m.code) as SAL_ORDER,
IF(a.warehousing_outbound_type = 1,d.code,q.code) as CUS_ID,
IF(a.warehousing_outbound_type = 1,d.name,q.name) as CUS_NAME,
@ -156,7 +156,7 @@
'' as ESB_MESSAGE,
IF(a.warehousing_outbound_type = 1,LPAD(n.ord_ln,3,0),LPAD(o.ord_ln,3,0)) as SAL_LINE,
aa.batch_number as BATCH_ID,
IF(ad.code,concat(ad.code,'-',LPAD(ad.ord_ln,3,0)),concat(ac.business_order_no,'-',LPAD(ab.ord_ln,3,0))) as PUR_ORDER
IF(ad.code is not null ,concat(ad.code,'-',LPAD(ad.ord_ln,3,0)),concat(ac.business_order_no,'-',LPAD(ab.ord_ln,3,0))) as PUR_ORDER
FROM
jg_warehousing_outbound a
RIGHT JOIN jg_warehousing_outbound_product aa ON a.id = aa.warehousing_outbound_id AND aa.f_delete_mark is null

@ -26,7 +26,7 @@
<result column="code" property="code"/>
<result column="name" property="name"/>
<result column="contractName" property="contractName"/>
<result column="ordLn" property="ordLn"/>
<result column="ord_ln" property="ordLn"/>
@ -41,30 +41,23 @@
<select id="queryOutboundProductPurchase" resultMap="OutboundProduct">
SELECT
a.*,
b.batch_no,
c.receipt_code AS deliveryCode,
d.CODE,
e.NAME,
g.contract_name AS contractName,
b.ord_ln AS ordLn
b.*,
e.CODE,
f.NAME,
g.contract_number AS contractName,
c.ord_ln AS ordLnPurchase
FROM
jg_warehousing_outbound_product a
LEFT JOIN jg_delivery_product_relation b ON a.batch_number = b.batch_no
LEFT JOIN jg_receipt_order c ON b.order_id = c.id
LEFT JOIN jg_business_order d ON c.business_id = d.id
LEFT JOIN jg_subject_basic e ON d.first_subject_basic_id = e.id
LEFT JOIN jg_contract g ON d.contract_id = g.id
LEFT JOIN jg_warehousing_outbound h ON a.warehousing_outbound_id = h.id
LEFT JOIN jg_cw_account_storage i ON h.document_no = i.document_no
jg_warehousing_outbound a
LEFT JOIN jg_warehousing_outbound_product b ON a.id = b.warehousing_outbound_id
LEFT JOIN jg_delivery_product_relation c ON b.batch_number = c.batch_no
LEFT JOIN jg_receipt_order d ON c.order_id = d.id
LEFT JOIN jg_business_order e ON d.business_id = e.id
LEFT JOIN jg_subject_basic f ON e.first_subject_basic_id = f.id
LEFT JOIN jg_contract g ON e.contract_id = g.id
WHERE
i.account_id = #{id}
AND b.business_type = '1'
AND a.ord_ln =#{ordLn}
a.id = #{id}
AND c.business_type = '1'
AND a.f_delete_mark IS NULL
GROUP BY
a.ord_ln
</select>
</mapper>

@ -358,7 +358,7 @@
<select id="purchaseInBoundByYunGuan" resultType="jnpf.model.yunguan.YunguanPurchaseInBoundModel">
SELECT
a.id AS ID,
aa.id AS ID,
e.f_en_code AS COMP_CD,
IF(a.warehousing_storage_type = '1',h.kucun_org_code,q.kucun_org_code) AS INV_ORG_CD,
IF(a.warehousing_storage_type = '1',h.kucun_org_name,q.kucun_org_name) AS INV_ORG_NM,

@ -0,0 +1,16 @@
package jnpf.mapper;
import jnpf.entity.SubjectBasicExclusiveEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* subjectBasicExclusive
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-07-31
*/
public interface SubjectBasicExclusiveMapper extends BaseMapper<SubjectBasicExclusiveEntity> {
}

@ -19,5 +19,5 @@ public interface WarehousingOutboundProductMapper extends BaseMapper<Warehousing
List<WarehousingOutboundProductEntity> queryOutboundProduct(String id);
List<WarehousingOutboundProductEntity> queryOutboundProductPurchase(@Param("id") String id, @Param("ordLn") String ordLn);
List<WarehousingOutboundProductEntity> queryOutboundProductPurchase(@Param("id") String id);
}

@ -0,0 +1,35 @@
package jnpf.service;
import jnpf.model.subjectbasicexclusive.*;
import jnpf.entity.*;
import java.util.*;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
/**
* subjectBasicExclusive
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-07-31
*/
public interface SubjectBasicExclusiveService extends IService<SubjectBasicExclusiveEntity> {
List<SubjectBasicExclusiveEntity> getList(SubjectBasicExclusivePagination subjectBasicExclusivePagination);
List<SubjectBasicExclusiveEntity> getTypeList(SubjectBasicExclusivePagination subjectBasicExclusivePagination,String dataType);
SubjectBasicExclusiveEntity getInfo(String id);
void delete(SubjectBasicExclusiveEntity entity);
void create(SubjectBasicExclusiveEntity entity);
boolean update(String id, SubjectBasicExclusiveEntity entity);
//子表方法
//副表数据方法
String checkForm(SubjectBasicExclusiveForm form,int i);
void saveOrUpdate(SubjectBasicExclusiveForm subjectBasicExclusiveForm,String id, boolean isSave) throws Exception;
}

@ -17,6 +17,6 @@ public interface WarehousingOutboundProductService extends IService<WarehousingO
QueryWrapper<WarehousingOutboundProductEntity> getChild(WarehousingOutboundPagination pagination,QueryWrapper<WarehousingOutboundProductEntity> warehousingOutboundProductQueryWrapper);
List<WarehousingOutboundProductEntity> queryOutboundProductInfo(String id);
List<WarehousingOutboundProductEntity> queryOutboundProductPurchase(String id,String ordLn);
List<WarehousingOutboundProductEntity> queryOutboundProductPurchase(String id);
}

@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
import jnpf.base.ActionResult;
import jnpf.entity.*;
import jnpf.mapper.CwsettlementMapper;
import jnpf.mapper.DeliveryProductRelationMapper;
import jnpf.mapper.WarehousingOutboundProductMapper;
import jnpf.model.yunguan.YunguanPurchaseSettlementModel;
import jnpf.model.yunguan.YunguanPurchaseSettlementProductModel;
@ -23,12 +24,15 @@ import jnpf.database.model.superQuery.ConditionJsonModel;
import jnpf.database.model.superQuery.SuperQueryConditionModel;
import java.lang.reflect.Field;
import com.baomidou.mybatisplus.annotation.TableField;
import java.math.RoundingMode;
import java.util.regex.Pattern;
import jnpf.model.QueryModel;
import java.util.stream.Collectors;
import jnpf.base.model.ColumnDataModel;
import jnpf.util.wxutil.HttpUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import jnpf.database.model.superQuery.SuperJsonModel;
@ -100,6 +104,16 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
private SettlementRelationPurchaseService settlementRelationPurchaseService;
@Resource
private SettlementRelationSaleService settlementRelationSaleService;
@Resource
private DeliveryProductRelationMapper deliveryProductRelationMapper;
@Autowired
private BusinessOrderService businessOrderService;
@Autowired
private BusinessOrderProductRelationalService businessOrderProductRelationalService;
@Autowired
private BusinessLineService businessLineService;
@Value("${config.yunguaninterfaceurl}")
private String yunguaninterfaceurl;
@Override
public List<CwsettlementEntity> getList(CwsettlementPagination cwsettlementPagination){
@ -1049,108 +1063,184 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
}
cwsettlementsummaryService.saveOrUpdate(tableField207.get(i));
if (entity.getType().equals("1") && entity.getBusinessLine().equals("550709408384942213")){
if (entity.getType().equals("1") && entity.getBusinessLine().equals("550709408384942213")) {
if(!isSave){
if (!isSave) {
QueryWrapper<SettlementRelationPurchaseEntity> settlementRelationPurchaseEntityQueryWrapper = new QueryWrapper<>();
settlementRelationPurchaseEntityQueryWrapper.lambda().eq(SettlementRelationPurchaseEntity::getPurchaseSettlementCode, entity.getCode());
settlementRelationPurchaseService.remove(settlementRelationPurchaseEntityQueryWrapper);
}
SettlementRelationPurchaseEntity settlementRelationPurchaseEntity=new SettlementRelationPurchaseEntity();
//采购结算
QueryWrapper<CwaccountstorageEntity> cwaccountstorageQueryWrapper=new QueryWrapper<>();
cwaccountstorageQueryWrapper.lambda().eq(CwaccountstorageEntity::getAccountId,cwsettlementForm.getCwsettlementaccountList().get(0).getAccountId());
List<CwaccountstorageEntity> cwaccountstorageEntityList=cwaccountstorageService.list(cwaccountstorageQueryWrapper);
if (cwaccountstorageEntityList!=null && cwaccountstorageEntityList.size()>0){
//入库单的采购订单
QueryWrapper<WarehousingStorageEntity> warehousingStorageQueryWrapper=new QueryWrapper<>();
warehousingStorageQueryWrapper.lambda().eq(WarehousingStorageEntity::getDocumentNo,cwaccountstorageEntityList.get(0).getDocumentNo());
List<WarehousingStorageEntity> warehousingStorageEntityList=warehousingStorageService.list(warehousingStorageQueryWrapper);
if (warehousingStorageEntityList!=null && warehousingStorageEntityList.size()>0){
//收货单
QueryWrapper<ReceiptOrderEntity> receiptOrderEntityQueryWrapper=new QueryWrapper<>();
receiptOrderEntityQueryWrapper.lambda().eq(ReceiptOrderEntity::getId,warehousingStorageEntityList.get(0).getWarehousingId());
List<ReceiptOrderEntity> receiptOrderEntities=receiptOrderService.list(receiptOrderEntityQueryWrapper);
if (receiptOrderEntities!=null && receiptOrderEntities.size()>0){
settlementRelationPurchaseEntity.setPurchaseSettlementCode(entity.getCode()); //采购结算单
settlementRelationPurchaseEntity.setReceiptCode(receiptOrderEntities.get(0).getReceiptCode()); //收货单
settlementRelationPurchaseEntity.setContract(cwsettlementForm.getCwsettlementaccountList().get(0).getContractCode());
settlementRelationPurchaseEntity.setPurchaseCode(warehousingStorageEntityList.get(0).getBusinessOrderNo());
settlementRelationPurchaseEntity.setOrdLn( tableField207.get(i).getOrdLn()); //订单行
settlementRelationPurchaseEntity.setSettlementSum( tableField207.get(i).getSettlementSum()); //结算量
settlementRelationPurchaseEntity.setSettlementPrice( tableField207.get(i).getSettlementPrice()); //单价量
settlementRelationPurchaseEntity.setSettlementCount( tableField207.get(i).getSettlementSubtotal()); //单价量
SubjectbasicEntity subjectbasicEntity =subjectbasicService.getInfo(cwsettlementForm.getCwsettlementsubjectList().get(0).getSubjectId());
settlementRelationPurchaseEntity.setSupplier(subjectbasicEntity.getName());
settlementRelationPurchaseEntity.setPurchaseBusinessLine(entity.getBusinessLine());
settlementRelationPurchaseEntity.setPaymentAmount(cwsettlementForm.getPaymentAmount()); //已付款金额
// settlementRelationPurchaseEntity.setPurchaseBusinessLine(cwsettlementForm.getBusinessLine());
settlementRelationPurchaseService.saveOrUpdate(settlementRelationPurchaseEntity);
}
SettlementRelationPurchaseEntity settlementRelationPurchaseEntity = new SettlementRelationPurchaseEntity();
settlementRelationPurchaseEntity.setId(RandomUtil.uuId());
settlementRelationPurchaseEntity.setPurchaseSettlementCode(entity.getCode()); //采购结算单
QueryWrapper<WarehousingStorageEntity> warehousingStorageQueryWrapper = new QueryWrapper<>();
warehousingStorageQueryWrapper.lambda().eq(WarehousingStorageEntity::getDocumentNo, tableField207.get(i).getDocmentNo());
warehousingStorageQueryWrapper.lambda().isNull(WarehousingStorageEntity::getDeleteMark);
WarehousingStorageEntity warehousingStorageEntity = warehousingStorageService.getOne(warehousingStorageQueryWrapper);
if (ObjectUtil.isNotEmpty(warehousingStorageEntity)) {
ReceiptOrderEntity receiptOrderEntity = receiptOrderService.getInfo(warehousingStorageEntity.getWarehousingId());
if (ObjectUtil.isNotEmpty(receiptOrderEntity)) {
settlementRelationPurchaseEntity.setReceiptCode(receiptOrderEntity.getReceiptCode()); //收货单
}
}
}else if(entity.getType().equals("2") && entity.getBusinessLine().equals("550709408384942213")){
if(!isSave){
QueryWrapper<SettlementRelationSaleEntity> settlementRelationPurchaseEntityQueryWrapper = new QueryWrapper<>();
settlementRelationPurchaseEntityQueryWrapper.lambda().eq(SettlementRelationSaleEntity::getSettlementCode, entity.getCode());
settlementRelationSaleService.remove(settlementRelationPurchaseEntityQueryWrapper);
QueryWrapper<BusinessOrderEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(BusinessOrderEntity::getCode,tableField207.get(i).getBusinessCode());
queryWrapper.lambda().isNull(BusinessOrderEntity::getDeleteMark);
BusinessOrderEntity businessOrderEntity = businessOrderService.getOne(queryWrapper);
if (ObjectUtil.isNotEmpty(businessOrderEntity)) {
//采购合同编号
ContractLEntity contractLEntity = contractLService.getInfo(businessOrderEntity.getContractId());
if (ObjectUtil.isNotEmpty(contractLEntity)) {
settlementRelationPurchaseEntity.setContract(contractLEntity.getContractNumber()); //合同号
}
settlementRelationPurchaseEntity.setPurchaseCode(businessOrderEntity.getCode()); //采购单号
settlementRelationPurchaseEntity.setOrdLn(tableField207.get(i).getOrdLn()); //订单行
settlementRelationPurchaseEntity.setSettlementSum(tableField207.get(i).getSettlementSum()); //结算量
settlementRelationPurchaseEntity.setSettlementPrice(tableField207.get(i).getSettlementPrice()); //单价量
settlementRelationPurchaseEntity.setSettlementCount(tableField207.get(i).getSettlementSubtotal()); //单价量
SubjectbasicEntity subjectbasicEntity = subjectbasicService.getInfo(businessOrderEntity.getFirstSubjectBasicId());
if (ObjectUtil.isNotEmpty(subjectbasicEntity)) {
settlementRelationPurchaseEntity.setSupplier(subjectbasicEntity.getName());
}
BusinessLineEntity businessLineEntity = businessLineService.getInfo(businessOrderEntity.getBusinessLineId());
if (ObjectUtil.isNotEmpty(businessLineEntity)) {
settlementRelationPurchaseEntity.setPurchaseBusinessLine(businessLineEntity.getName());
}
settlementRelationPurchaseEntity.setPaymentAmount(cwsettlementForm.getPaymentAmount()); //已付款金额
settlementRelationPurchaseService.saveOrUpdate(settlementRelationPurchaseEntity);
}
SettlementRelationSaleEntity settlementRelationSaleEntity=new SettlementRelationSaleEntity();
//销售结算
//入库单的采购订单
List<WarehousingOutboundProductEntity> warehousingOutboundProductList =warehousingOutboundProductService.queryOutboundProductPurchase(cwsettlementForm.getCwsettlementaccountList().get(0).getAccountId(), tableField207.get(i).getOrdLn());
if (warehousingOutboundProductList!=null && warehousingOutboundProductList.size()>0){
settlementRelationSaleEntity.setPurchaseCode(warehousingOutboundProductList.get(0).getCode()); //采购订单
settlementRelationSaleEntity.setContract(warehousingOutboundProductList.get(0).getContractName()); //采购合同
settlementRelationSaleEntity.setSupplier(warehousingOutboundProductList.get(0).getName()); //供应商
settlementRelationSaleEntity.setOrdLn(warehousingOutboundProductList.get(0).getOrdLn()); //供应商
// for (CwsettlementaccountModel model : cwsettlementForm.getCwsettlementaccountList()) {
//
// //采购结算
// QueryWrapper<CwaccountstorageEntity> cwaccountstorageQueryWrapper = new QueryWrapper<>();
// cwaccountstorageQueryWrapper.lambda().eq(CwaccountstorageEntity::getAccountId, model.getAccountId());
// cwaccountstorageQueryWrapper.lambda().isNull(CwaccountstorageEntity::getDeleteMark);
// List<CwaccountstorageEntity> cwaccountstorageEntityList = cwaccountstorageService.list(cwaccountstorageQueryWrapper);
// for (CwaccountstorageEntity cwaccountstorage : cwaccountstorageEntityList) {
// //入库单的采购订单
// QueryWrapper<WarehousingStorageEntity> warehousingStorageQueryWrapper = new QueryWrapper<>();
// warehousingStorageQueryWrapper.lambda().eq(WarehousingStorageEntity::getDocumentNo, cwaccountstorage.getDocumentNo());
// warehousingStorageQueryWrapper.lambda().isNull(WarehousingStorageEntity::getDeleteMark);
// List<WarehousingStorageEntity> warehousingStorageEntityList = warehousingStorageService.list(warehousingStorageQueryWrapper);
// if (warehousingStorageEntityList != null && warehousingStorageEntityList.size() > 0) {
// //收货单
// QueryWrapper<ReceiptOrderEntity> receiptOrderEntityQueryWrapper = new QueryWrapper<>();
// receiptOrderEntityQueryWrapper.lambda().eq(ReceiptOrderEntity::getId, warehousingStorageEntityList.get(0).getWarehousingId());
// receiptOrderEntityQueryWrapper.lambda().isNull(ReceiptOrderEntity::getDeleteMark);
// List<ReceiptOrderEntity> receiptOrderEntities = receiptOrderService.list(receiptOrderEntityQueryWrapper);
// if (receiptOrderEntities != null && receiptOrderEntities.size() > 0) {
// //采购订单
// BusinessOrderEntity businessOrderEntity = businessOrderService.getInfo(receiptOrderEntities.get(0).getBusinessId());
// if (ObjectUtil.isNotEmpty(businessOrderEntity)) {
// //采购订单子表
// QueryWrapper<BusinessOrderProductRelationalEntity> businessOrderSonQueryWrapper = new QueryWrapper<>();
// businessOrderSonQueryWrapper.lambda().eq(BusinessOrderProductRelationalEntity::getBusinessOrderId, businessOrderEntity.getId());
// businessOrderSonQueryWrapper.lambda().isNull(BusinessOrderProductRelationalEntity::getDeleteMark);
// List<BusinessOrderProductRelationalEntity> businessOrderProductRelationalEntityList = businessOrderProductRelationalService.list(businessOrderSonQueryWrapper);
// for (BusinessOrderProductRelationalEntity businessSon : businessOrderProductRelationalEntityList) {
// settlementRelationPurchaseEntity.setId(RandomUtil.uuId());
// settlementRelationPurchaseEntity.setPurchaseSettlementCode(entity.getCode()); //采购结算单
// settlementRelationPurchaseEntity.setReceiptCode(receiptOrderEntities.get(0).getReceiptCode()); //收货单
// //采购合同编号
// ContractLEntity contractLEntity = contractLService.getInfo(businessOrderEntity.getContractId());
// if (ObjectUtil.isNotEmpty(contractLEntity)) {
// settlementRelationPurchaseEntity.setContract(contractLEntity.getContractNumber());
// }
// settlementRelationPurchaseEntity.setPurchaseCode(businessOrderEntity.getCode());
// settlementRelationPurchaseEntity.setOrdLn(businessSon.getOrdLn()); //订单行
// settlementRelationPurchaseEntity.setSettlementSum(tableField207.get(i).getSettlementSum()); //结算量
// settlementRelationPurchaseEntity.setSettlementPrice(tableField207.get(i).getSettlementPrice()); //单价量
// settlementRelationPurchaseEntity.setSettlementCount(tableField207.get(i).getSettlementSubtotal()); //单价量
// SubjectbasicEntity subjectbasicEntity = subjectbasicService.getInfo(businessOrderEntity.getFirstSubjectBasicId());
// if (ObjectUtil.isNotEmpty(subjectbasicEntity)) {
// settlementRelationPurchaseEntity.setSupplier(subjectbasicEntity.getName());
// }
// BusinessLineEntity businessLineEntity = businessLineService.getInfo(businessOrderEntity.getBusinessLineId());
// if (ObjectUtil.isNotEmpty(businessLineEntity)) {
// settlementRelationPurchaseEntity.setPurchaseBusinessLine(businessLineEntity.getName());
// }
// settlementRelationPurchaseEntity.setPaymentAmount(cwsettlementForm.getPaymentAmount()); //已付款金额
// settlementRelationPurchaseService.saveOrUpdate(settlementRelationPurchaseEntity);
// }
// }
//
// }
//
// }
//
// }
// }
}
}
}
// throw new NullPointerException();
if(entity.getType().equals("2") && entity.getBusinessLine().equals("550709408384942213")){
QueryWrapper<CwaccountstorageEntity> cwaccountstorageQueryWrapper=new QueryWrapper<>();
cwaccountstorageQueryWrapper.lambda().eq(CwaccountstorageEntity::getAccountId,cwsettlementForm.getCwsettlementaccountList().get(0).getAccountId());
List<CwaccountstorageEntity> cwaccountstorageEntityList=cwaccountstorageService.list(cwaccountstorageQueryWrapper);
if (cwaccountstorageEntityList!=null && cwaccountstorageEntityList.size()>0){
//销售结算
QueryWrapper<WarehousingOutboundEntity> warehousingOutboundQueryWrapper=new QueryWrapper<>();
warehousingOutboundQueryWrapper.lambda().eq(WarehousingOutboundEntity::getDocumentNo,cwaccountstorageEntityList.get(0).getDocumentNo());
List<WarehousingOutboundEntity> warehousingOutboundEntityList=warehousingOutboundService.list(warehousingOutboundQueryWrapper);
if (warehousingOutboundEntityList!=null && warehousingOutboundEntityList.size()>0){
//收货单
QueryWrapper<DeliveryOrderEntity> deliveryOrderQueryWrapper=new QueryWrapper<>();
deliveryOrderQueryWrapper.lambda().eq(DeliveryOrderEntity::getId,warehousingOutboundEntityList.get(0).getWarehousingId());
List<DeliveryOrderEntity> deliveryOrderEntityList=deliveryOrderService.list(deliveryOrderQueryWrapper);
if (deliveryOrderEntityList!=null && deliveryOrderEntityList.size()>0){
settlementRelationSaleEntity.setSettlementCode(entity.getCode()); //销售结算单
settlementRelationSaleEntity.setDeliveryCode(deliveryOrderEntityList.get(0).getDeliveryCode()); //发货单
settlementRelationSaleEntity.setSaleContract(cwsettlementForm.getCwsettlementaccountList().get(0).getContractCode());
settlementRelationSaleEntity.setSaleCode(warehousingOutboundEntityList.get(0).getBusinessOrderNo());
settlementRelationSaleEntity.setSaleOrdLn( tableField207.get(i).getOrdLn()); //订单行
settlementRelationSaleEntity.setSaleSettlementSum( tableField207.get(i).getSettlementSum()); //结算量
settlementRelationSaleEntity.setSettlementPrice( tableField207.get(i).getSettlementPrice()); //单价量
settlementRelationSaleEntity.setSettlementCount( tableField207.get(i).getSettlementSubtotal()); //单价量
SubjectbasicEntity subjectbasicEntity =subjectbasicService.getInfo(cwsettlementForm.getCwsettlementsubjectList().get(0).getSubjectId());
settlementRelationSaleEntity.setCustomer(subjectbasicEntity.getName());
settlementRelationSaleEntity.setPurchaseBusinessLine(entity.getBusinessLine());
settlementRelationSaleEntity.setPaymentAmount(cwsettlementForm.getPaymentAmount()); //已收款金额
if(!isSave){
QueryWrapper<SettlementRelationSaleEntity> settlementRelationPurchaseEntityQueryWrapper = new QueryWrapper<>();
settlementRelationPurchaseEntityQueryWrapper.lambda().eq(SettlementRelationSaleEntity::getSettlementCode, entity.getCode());
settlementRelationSaleService.remove(settlementRelationPurchaseEntityQueryWrapper);
}
for (CwsettlementaccountModel model : cwsettlementForm.getCwsettlementaccountList()) {
//销售结算
QueryWrapper<CwaccountstorageEntity> cwaccountstorageQueryWrapper = new QueryWrapper<>();
cwaccountstorageQueryWrapper.lambda().eq(CwaccountstorageEntity::getAccountId, model.getAccountId());
List<CwaccountstorageEntity> cwaccountstorageEntityList = cwaccountstorageService.list(cwaccountstorageQueryWrapper);
for (CwaccountstorageEntity cwaccountstorageEntity : cwaccountstorageEntityList) {
QueryWrapper<WarehousingOutboundEntity> warehousingOutboundQueryWrapper = new QueryWrapper<>();
warehousingOutboundQueryWrapper.lambda().eq(WarehousingOutboundEntity::getDocumentNo, cwaccountstorageEntity.getDocumentNo());
List<WarehousingOutboundEntity> warehousingOutboundEntityList = warehousingOutboundService.list(warehousingOutboundQueryWrapper);
if (warehousingOutboundEntityList != null && warehousingOutboundEntityList.size() > 0) {
//发货单
DeliveryOrderEntity deliveryOrderEntity = deliveryOrderService.getInfo(warehousingOutboundEntityList.get(0).getWarehousingId());
if (ObjectUtil.isNotEmpty(deliveryOrderEntity)) {
BusinessOrderEntity businessOrderEntity = businessOrderService.getInfo(deliveryOrderEntity.getBusinessId());
List<WarehousingOutboundProductEntity> warehousingOutboundProductList = warehousingOutboundProductService.queryOutboundProductPurchase(warehousingOutboundEntityList.get(0).getId());
for (WarehousingOutboundProductEntity warehousingOutboundProductEntity : warehousingOutboundProductList) {
SettlementRelationSaleEntity settlementRelationSaleEntity=new SettlementRelationSaleEntity();
settlementRelationSaleEntity.setId(RandomUtil.uuId());
settlementRelationSaleEntity.setPurchaseCode(warehousingOutboundProductEntity.getCode()); //采购订单
settlementRelationSaleEntity.setContract(warehousingOutboundProductEntity.getContractName()); //采购合同编号
settlementRelationSaleEntity.setSupplier(warehousingOutboundProductEntity.getName()); //供应商
settlementRelationSaleEntity.setOrdLn(warehousingOutboundProductEntity.getOrdLnPurchase()); //供应商
settlementRelationSaleEntity.setSettlementCode(entity.getCode()); //销售结算单
settlementRelationSaleEntity.setDeliveryCode(deliveryOrderEntity.getDeliveryCode()); //发货单
if (ObjectUtil.isNotEmpty(businessOrderEntity)){
settlementRelationSaleEntity.setSaleCode(businessOrderEntity.getCode());
ContractLEntity contractLEntity = contractLService.getInfo(businessOrderEntity.getContractId());
SubjectbasicEntity subjectbasicEntity = subjectbasicService.getInfo(businessOrderEntity.getFirstSubjectBasicId());
BusinessLineEntity businessLineEntity = businessLineService.getInfo(businessOrderEntity.getBusinessLineId());
if (ObjectUtil.isNotEmpty(contractLEntity)){
settlementRelationSaleEntity.setSaleContract(contractLEntity.getContractNumber());//合同号
}
if(ObjectUtil.isNotEmpty(subjectbasicEntity)) {
settlementRelationSaleEntity.setCustomer(subjectbasicEntity.getName());//客户
}
if (ObjectUtil.isNotEmpty(businessLineEntity)){
settlementRelationSaleEntity.setPurchaseBusinessLine(businessLineEntity.getName());//业务线
}
}
settlementRelationSaleEntity.setSaleOrdLn(warehousingOutboundProductEntity.getOrdLn()); //销售订单行
QueryWrapper<CwsettlementsummaryEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(CwsettlementsummaryEntity::getSettlementId,entity.getId());
queryWrapper.lambda().eq(CwsettlementsummaryEntity::getBusinessCode,businessOrderEntity.getCode());
queryWrapper.lambda().eq(CwsettlementsummaryEntity::getOrdLn,warehousingOutboundProductEntity.getOrdLn());
CwsettlementsummaryEntity cwsettlementsummaryEntity = cwsettlementsummaryService.getOne(queryWrapper);
if (ObjectUtil.isNotEmpty(cwsettlementsummaryEntity)) {
settlementRelationSaleEntity.setSaleSettlementSum(warehousingOutboundProductEntity.getOutboundNumber());
settlementRelationSaleEntity.setSettlementSum(warehousingOutboundProductEntity.getOutboundNumber()); //结算量
settlementRelationSaleEntity.setSettlementPrice(cwsettlementsummaryEntity.getSettlementPrice()); //单价量
settlementRelationSaleEntity.setSettlementCount(cwsettlementsummaryEntity.getSettlementPrice().multiply(warehousingOutboundProductEntity.getOutboundNumber()).setScale(2, RoundingMode.HALF_UP)); //结算金额
}
settlementRelationSaleEntity.setPaymentAmount(cwsettlementForm.getPaymentAmount()); //已收款金额
settlementRelationSaleService.saveOrUpdate(settlementRelationSaleEntity);
}
}
settlementRelationSaleService.saveOrUpdate(settlementRelationSaleEntity);
}
}
}
}
@ -1232,7 +1322,7 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
yunguanSaleSettlementProductModel.setERR_MESSAGE("");
yunguanSaleSettlementProductModelList.add(yunguanSaleSettlementProductModel);
}
JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/actLine", "POST", JsonUtil.getObjectToString(yunguanSaleSettlementProductModelList));
JSONObject purchaseCode = HttpUtil.httpRequest(yunguaninterfaceurl+"/fggj/pur/actLine", "POST", JsonUtil.getObjectToString(yunguanSaleSettlementProductModelList));
if (ObjectUtil.isNotEmpty(purchaseCode)){
if (purchaseCode.get("code").equals("200")) {
cwsettlementEntity.setErpMark(purchaseCode.get("code").toString());
@ -1319,7 +1409,7 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
yunguanSaleSettlementModel.setESB_DTM(null);
yunguanSaleSettlementModel.setESB_MESSAGE("");
yunguanSaleSettlementModel.setLINE_SUM(cwsettlementEntity.getCwsettlementsummaryList().size());
JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/actHead", "POST", JsonUtil.getObjectToString(yunguanSaleSettlementModel));
JSONObject purchaseCode = HttpUtil.httpRequest(yunguaninterfaceurl+"/fggj/pur/actHead", "POST", JsonUtil.getObjectToString(yunguanSaleSettlementModel));
if (ObjectUtil.isNotEmpty(purchaseCode)){
if (purchaseCode.get("code").equals("200")) {
cwsettlementEntity.setErpMark(purchaseCode.get("code").toString());
@ -1418,7 +1508,7 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
yunguanSaleSettlementProductModel.setCK_ORDER(cwsettlementsummaryModel.getDocmentNo());
yunguanSaleSettlementProductModelList.add(yunguanSaleSettlementProductModel);
}
JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/invLine", "POST", JsonUtil.getObjectToString(yunguanSaleSettlementProductModelList));
JSONObject purchaseCode = HttpUtil.httpRequest(yunguaninterfaceurl+"/fggj/sal/invLine", "POST", JsonUtil.getObjectToString(yunguanSaleSettlementProductModelList));
if (ObjectUtil.isNotEmpty(purchaseCode)){
if (purchaseCode.get("code").equals("200")) {
cwsettlementEntity.setErpMark(purchaseCode.get("code").toString());
@ -1506,7 +1596,7 @@ public class CwsettlementServiceImpl extends ServiceImpl<CwsettlementMapper, Cws
yunguanSaleSettlementModel.setCONSDR_USER(cwsettlementEntity.getLastModifyUserId());
yunguanSaleSettlementModel.setCONSDR_DATE(cwsettlementEntity.getLastModifyTime());
yunguanSaleSettlementModel.setLINE_SUM(cwsettlementEntity.getCwsettlementsummaryList().size());
JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/invHead", "POST", JsonUtil.getObjectToString(yunguanSaleSettlementModel));
JSONObject purchaseCode = HttpUtil.httpRequest(yunguaninterfaceurl+"/fggj/sal/invHead", "POST", JsonUtil.getObjectToString(yunguanSaleSettlementModel));
if (ObjectUtil.isNotEmpty(purchaseCode)){
if (purchaseCode.get("code").equals("200")) {
cwsettlementEntity.setErpMark(purchaseCode.get("code").toString());

@ -0,0 +1,296 @@
package jnpf.service.impl;
import jnpf.entity.*;
import jnpf.mapper.SubjectBasicExclusiveMapper;
import jnpf.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.model.subjectbasicexclusive.*;
import java.math.BigDecimal;
import cn.hutool.core.util.ObjectUtil;
import jnpf.permission.model.authorize.AuthorizeConditionModel;
import jnpf.util.GeneraterSwapUtil;
import jnpf.database.model.superQuery.SuperQueryJsonModel;
import jnpf.database.model.superQuery.ConditionJsonModel;
import jnpf.database.model.superQuery.SuperQueryConditionModel;
import java.lang.reflect.Field;
import com.baomidou.mybatisplus.annotation.TableField;
import java.util.regex.Pattern;
import jnpf.model.QueryModel;
import java.util.stream.Collectors;
import jnpf.base.model.ColumnDataModel;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import jnpf.database.model.superQuery.SuperJsonModel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import java.text.SimpleDateFormat;
import jnpf.util.*;
import java.util.*;
import jnpf.base.UserInfo;
import jnpf.permission.entity.UserEntity;
/**
*
* subjectBasicExclusive
* V3.5
* https://www.jnpfsoft.com
* JNPF
* 2024-07-31
*/
@Service
public class SubjectBasicExclusiveServiceImpl extends ServiceImpl<SubjectBasicExclusiveMapper, SubjectBasicExclusiveEntity> implements SubjectBasicExclusiveService{
@Autowired
private GeneraterSwapUtil generaterSwapUtil;
@Autowired
private UserProvider userProvider;
@Override
public List<SubjectBasicExclusiveEntity> getList(SubjectBasicExclusivePagination subjectBasicExclusivePagination){
return getTypeList(subjectBasicExclusivePagination,subjectBasicExclusivePagination.getDataType());
}
/** 列表查询 */
@Override
public List<SubjectBasicExclusiveEntity> getTypeList(SubjectBasicExclusivePagination subjectBasicExclusivePagination,String dataType){
String userId=userProvider.get().getUserId();
List<String> AllIdList =new ArrayList();
List<List<String>> intersectionList =new ArrayList<>();
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
String columnData = !isPc ? SubjectBasicExclusiveConstant.getAppColumnData() : SubjectBasicExclusiveConstant.getColumnData();
ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class);
String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList());
int total=0;
int subjectBasicExclusiveNum =0;
QueryWrapper<SubjectBasicExclusiveEntity> subjectBasicExclusiveQueryWrapper=new QueryWrapper<>();
List<String> allSuperIDlist = new ArrayList<>();
String superOp ="";
if (ObjectUtil.isNotEmpty(subjectBasicExclusivePagination.getSuperQueryJson())){
List<String> allSuperList = new ArrayList<>();
List<List<String>> intersectionSuperList = new ArrayList<>();
String queryJson = subjectBasicExclusivePagination.getSuperQueryJson();
SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class);
int superNum = 0;
QueryWrapper<SubjectBasicExclusiveEntity> subjectBasicExclusiveSuperWrapper = new QueryWrapper<>();
subjectBasicExclusiveSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(subjectBasicExclusiveSuperWrapper,SubjectBasicExclusiveEntity.class,queryJson,"0"));
int subjectBasicExclusiveNum1 = subjectBasicExclusiveSuperWrapper.getExpression().getNormal().size();
if (subjectBasicExclusiveNum1>0){
List<String> subjectBasicExclusiveList =this.list(subjectBasicExclusiveSuperWrapper).stream().map(SubjectBasicExclusiveEntity::getId).collect(Collectors.toList());
allSuperList.addAll(subjectBasicExclusiveList);
intersectionSuperList.add(subjectBasicExclusiveList);
superNum++;
}
superOp = superNum > 0 ? superJsonModel.getMatchLogic() : "";
//and or
if(superOp.equalsIgnoreCase("and")){
allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList);
}else{
allSuperIDlist = allSuperList;
}
}
List<String> allRuleIDlist = new ArrayList<>();
String ruleOp ="";
if (ObjectUtil.isNotEmpty(ruleJson)){
List<String> allRuleList = new ArrayList<>();
List<List<String>> intersectionRuleList = new ArrayList<>();
SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class);
int ruleNum = 0;
QueryWrapper<SubjectBasicExclusiveEntity> subjectBasicExclusiveSuperWrapper = new QueryWrapper<>();
subjectBasicExclusiveSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(subjectBasicExclusiveSuperWrapper,SubjectBasicExclusiveEntity.class,ruleJson,"0"));
int subjectBasicExclusiveNum1 = subjectBasicExclusiveSuperWrapper.getExpression().getNormal().size();
if (subjectBasicExclusiveNum1>0){
List<String> subjectBasicExclusiveList =this.list(subjectBasicExclusiveSuperWrapper).stream().map(SubjectBasicExclusiveEntity::getId).collect(Collectors.toList());
allRuleList.addAll(subjectBasicExclusiveList);
intersectionRuleList.add(subjectBasicExclusiveList);
ruleNum++;
}
ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : "";
//and or
if(ruleOp.equalsIgnoreCase("and")){
allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList);
}else{
allRuleIDlist = allRuleList;
}
}
boolean pcPermission = true;
boolean appPermission = false;
if(isPc && pcPermission){
if (!userProvider.get().getIsAdministrator()){
Object subjectBasicExclusiveObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(subjectBasicExclusiveQueryWrapper,SubjectBasicExclusiveEntity.class,subjectBasicExclusivePagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(subjectBasicExclusiveObj)){
return new ArrayList<>();
} else {
subjectBasicExclusiveQueryWrapper = (QueryWrapper<SubjectBasicExclusiveEntity>)subjectBasicExclusiveObj;
if( subjectBasicExclusiveQueryWrapper.getExpression().getNormal().size()>0){
subjectBasicExclusiveNum++;
}
}
}
}
if(!isPc && appPermission){
if (!userProvider.get().getIsAdministrator()){
Object subjectBasicExclusiveObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(subjectBasicExclusiveQueryWrapper,SubjectBasicExclusiveEntity.class,subjectBasicExclusivePagination.getMenuId(),"0"));
if (ObjectUtil.isEmpty(subjectBasicExclusiveObj)){
return new ArrayList<>();
} else {
subjectBasicExclusiveQueryWrapper = (QueryWrapper<SubjectBasicExclusiveEntity>)subjectBasicExclusiveObj;
if( subjectBasicExclusiveQueryWrapper.getExpression().getNormal().size()>0){
subjectBasicExclusiveNum++;
}
}
}
}
if(isPc){
if(ObjectUtil.isNotEmpty(subjectBasicExclusivePagination.getMouth())){
subjectBasicExclusiveNum++;
List MouthList = JsonUtil.getJsonToList(subjectBasicExclusivePagination.getMouth(),String.class);
Long fir = Long.valueOf(String.valueOf(MouthList.get(0)));
Long sec = Long.valueOf(String.valueOf(MouthList.get(1)));
subjectBasicExclusiveQueryWrapper.lambda().ge(SubjectBasicExclusiveEntity::getMouth, new Date(fir))
.le(SubjectBasicExclusiveEntity::getMouth, DateUtil.stringToDate(DateUtil.daFormatYmd(sec) + " 23:59:59"));
}
if(ObjectUtil.isNotEmpty(subjectBasicExclusivePagination.getFirstSubject())){
subjectBasicExclusiveNum++;
String value = subjectBasicExclusivePagination.getFirstSubject() instanceof List ?
JsonUtil.getObjectToString(subjectBasicExclusivePagination.getFirstSubject()) :
String.valueOf(subjectBasicExclusivePagination.getFirstSubject());
subjectBasicExclusiveQueryWrapper.lambda().like(SubjectBasicExclusiveEntity::getFirstSubject,value);
}
if(ObjectUtil.isNotEmpty(subjectBasicExclusivePagination.getType())){
subjectBasicExclusiveNum++;
String value = subjectBasicExclusivePagination.getFirstSubject() instanceof List ?
JsonUtil.getObjectToString(subjectBasicExclusivePagination.getType()) :
String.valueOf(subjectBasicExclusivePagination.getType());
subjectBasicExclusiveQueryWrapper.lambda().like(SubjectBasicExclusiveEntity::getType,value);
}
}
List<String> intersection = generaterSwapUtil.getIntersection(intersectionList);
if (total>0){
if (intersection.size()==0){
intersection.add("jnpfNullList");
}
subjectBasicExclusiveQueryWrapper.lambda().in(SubjectBasicExclusiveEntity::getId, intersection);
}
//是否有高级查询
if (StringUtil.isNotEmpty(superOp)){
if (allSuperIDlist.size()==0){
allSuperIDlist.add("jnpfNullList");
}
List<String> finalAllSuperIDlist = allSuperIDlist;
subjectBasicExclusiveQueryWrapper.lambda().and(t->t.in(SubjectBasicExclusiveEntity::getId, finalAllSuperIDlist));
}
//是否有数据过滤查询
if (StringUtil.isNotEmpty(ruleOp)){
if (allRuleIDlist.size()==0){
allRuleIDlist.add("jnpfNullList");
}
List<String> finalAllRuleIDlist = allRuleIDlist;
subjectBasicExclusiveQueryWrapper.lambda().and(t->t.in(SubjectBasicExclusiveEntity::getId, finalAllRuleIDlist));
}
//假删除标志
subjectBasicExclusiveQueryWrapper.lambda().isNull(SubjectBasicExclusiveEntity::getDeleteMark);
//排序
if(StringUtil.isEmpty(subjectBasicExclusivePagination.getSidx())){
subjectBasicExclusiveQueryWrapper.lambda().orderByDesc(SubjectBasicExclusiveEntity::getId);
}else{
try {
String sidx = subjectBasicExclusivePagination.getSidx();
String[] strs= sidx.split("_name");
SubjectBasicExclusiveEntity subjectBasicExclusiveEntity = new SubjectBasicExclusiveEntity();
Field declaredField = subjectBasicExclusiveEntity.getClass().getDeclaredField(strs[0]);
declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value();
subjectBasicExclusiveQueryWrapper="asc".equals(subjectBasicExclusivePagination.getSort().toLowerCase())?subjectBasicExclusiveQueryWrapper.orderByAsc(value):subjectBasicExclusiveQueryWrapper.orderByDesc(value);
} catch (NoSuchFieldException e) {
e.printStackTrace();
}
}
if("0".equals(dataType)){
if((total>0 && AllIdList.size()>0) || total==0){
Page<SubjectBasicExclusiveEntity> page=new Page<>(subjectBasicExclusivePagination.getCurrentPage(), subjectBasicExclusivePagination.getPageSize());
IPage<SubjectBasicExclusiveEntity> userIPage=this.page(page, subjectBasicExclusiveQueryWrapper);
return subjectBasicExclusivePagination.setData(userIPage.getRecords(),userIPage.getTotal());
}else{
List<SubjectBasicExclusiveEntity> list = new ArrayList();
return subjectBasicExclusivePagination.setData(list, list.size());
}
}else{
return this.list(subjectBasicExclusiveQueryWrapper);
}
}
@Override
public SubjectBasicExclusiveEntity getInfo(String id){
QueryWrapper<SubjectBasicExclusiveEntity> queryWrapper=new QueryWrapper<>();
queryWrapper.lambda().eq(SubjectBasicExclusiveEntity::getId,id);
return this.getOne(queryWrapper);
}
@Override
public void create(SubjectBasicExclusiveEntity entity){
this.save(entity);
}
@Override
public boolean update(String id, SubjectBasicExclusiveEntity entity){
return this.updateById(entity);
}
@Override
public void delete(SubjectBasicExclusiveEntity entity){
if(entity!=null){
this.removeById(entity.getId());
}
}
/** 验证表单唯一字段,正则,非空 i-0新增-1修改*/
@Override
public String checkForm(SubjectBasicExclusiveForm form,int i) {
boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0");
String id="";
String countRecover = "";
if (isUp){
id = form.getId();
}
//主表字段验证
if(StringUtil.isEmpty(form.getFirstSubject())){
return "一级供应商不能为空";
}
return countRecover;
}
/**
* ()
* @param id
* @param subjectBasicExclusiveForm
* @return
*/
@Override
@Transactional
public void saveOrUpdate(SubjectBasicExclusiveForm subjectBasicExclusiveForm,String id, boolean isSave) throws Exception{
UserInfo userInfo=userProvider.get();
UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId());
subjectBasicExclusiveForm = JsonUtil.getJsonToBean(
generaterSwapUtil.swapDatetime(SubjectBasicExclusiveConstant.getFormData(),subjectBasicExclusiveForm),SubjectBasicExclusiveForm.class);
SubjectBasicExclusiveEntity entity = JsonUtil.getJsonToBean(subjectBasicExclusiveForm, SubjectBasicExclusiveEntity.class);
if(isSave){
String mainId = RandomUtil.uuId() ;
entity.setId(mainId);
entity.setVersion(0);
}else{
}
this.saveOrUpdate(entity);
}
}

@ -151,6 +151,7 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
}
List<String> allRuleIDlist = new ArrayList<>();
String ruleOp ="";
ruleJson= null;
if (ObjectUtil.isNotEmpty(ruleJson)){
List<String> allRuleList = new ArrayList<>();
List<List<String>> intersectionRuleList = new ArrayList<>();
@ -536,7 +537,8 @@ public class VoucherServiceImpl extends ServiceImpl<VoucherMapper, VoucherEntity
Field declaredField = voucherEntity.getClass().getDeclaredField(strs[0]);
declaredField.setAccessible(true);
String value = declaredField.getAnnotation(TableField.class).value();
voucherQueryWrapper="asc".equals(voucherPagination.getSort().toLowerCase())?voucherQueryWrapper.orderByAsc(value):voucherQueryWrapper.orderByDesc(value);
// voucherQueryWrapper="asc".equals(voucherPagination.getSort().toLowerCase())?voucherQueryWrapper.orderByAsc(value):voucherQueryWrapper.orderByDesc(value);
voucherPagination.setSidx("a."+value);
} catch (NoSuchFieldException e) {
e.printStackTrace();
}

@ -68,7 +68,7 @@ public class WarehousingOutboundProductServiceImpl extends ServiceImpl<Warehousi
}
@Override
public List<WarehousingOutboundProductEntity> queryOutboundProductPurchase(String id, String ordLn) {
return warehousingOutboundProductMapper.queryOutboundProductPurchase(id,ordLn);
public List<WarehousingOutboundProductEntity> queryOutboundProductPurchase(String id) {
return warehousingOutboundProductMapper.queryOutboundProductPurchase(id);
}
}

@ -22,12 +22,15 @@ import jnpf.database.model.superQuery.ConditionJsonModel;
import jnpf.database.model.superQuery.SuperQueryConditionModel;
import java.lang.reflect.Field;
import com.baomidou.mybatisplus.annotation.TableField;
import java.math.RoundingMode;
import java.util.regex.Pattern;
import jnpf.model.QueryModel;
import java.util.stream.Collectors;
import jnpf.base.model.ColumnDataModel;
import jnpf.util.wxutil.HttpUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import jnpf.database.model.superQuery.SuperJsonModel;
@ -93,6 +96,10 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl<WarehousingOutbo
private DeliveryRelationService deliveryRelationService;
@Resource
private ReceiptOrderService receiptOrderService;
@Autowired
private BusinessLineService businessLineService;
@Value("${config.yunguaninterfaceurl}")
private String yunguaninterfaceurl;
@Override
public List<WarehousingOutboundEntity> getList(WarehousingOutboundPagination warehousingOutboundPagination){
return getTypeList(warehousingOutboundPagination,warehousingOutboundPagination.getDataType());
@ -735,9 +742,14 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl<WarehousingOutbo
if (deliveryOrderForm.getDeliveryProductRelationList()!=null){
//统计发货数量
BigDecimal countNum = BigDecimal.ZERO;
//发货关系表,最后一次相减得出含税小计
int size = 0;
BigDecimal SaleAmountCount = BigDecimal.ZERO;
BigDecimal SaleTaxCount = BigDecimal.ZERO;
// List<WarehousingStorageProductEntity> tableField119 = JsonUtil.getJsonToList(receiptOrderForm.getDeliveryProductRelationList(),WarehousingStorageProductEntity.class);
for(DeliveryProductRelationModel entitys : deliveryOrderForm.getDeliveryProductRelationList()){
countNum = countNum.add(entitys.getDeliveryNum());
SaleTaxCount = SaleTaxCount.add(entitys.getTaxCount());
WarehousingOutboundProductEntity warehousingOutboundProductEntity = new WarehousingOutboundProductEntity();
warehousingOutboundProductEntity.setId(RandomUtil.uuId());
warehousingOutboundProductEntity.setWarehousingOutboundId(entity.getId());
@ -766,10 +778,13 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl<WarehousingOutbo
if (ObjectUtil.isNotEmpty(businessOrderEntitySale)){
deliveryRelationEntity.setSaleCode(businessOrderEntitySale.getCode()); //订单
ContractLEntity contractLEntity = contractLService.getInfo(businessOrderEntitySale.getContractId());
BusinessLineEntity businessLineEntity = businessLineService.getInfo(businessOrderEntitySale.getBusinessLineId());
if (ObjectUtil.isNotEmpty(contractLEntity)){
deliveryRelationEntity.setSaleContract(contractLEntity.getContractNumber()); //合同
}
deliveryRelationEntity.setBusinessLine(businessOrderEntitySale.getBusinessLineId());//业务线
if (ObjectUtil.isNotEmpty(businessLineEntity)) {
deliveryRelationEntity.setBusinessLine(businessLineEntity.getName());//业务线
}
SubjectbasicEntity subjectbasicEntity=subjectbasicService.getInfo(businessOrderEntitySale.getFirstSubjectBasicId());
if (ObjectUtil.isNotEmpty(subjectbasicEntity)){
deliveryRelationEntity.setCustomer(subjectbasicEntity.getName()); //客户
@ -778,31 +793,32 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl<WarehousingOutbo
deliveryRelationEntity.setSaleOrdLn(entitys.getOrdLn()); //订单行号
deliveryRelationEntity.setDeliveryNum(entitys.getDeliveryNum()); //数量
deliveryRelationEntity.setSalePrice(entitys.getReturnUnit());//采购单价
deliveryRelationEntity.setSaleCount(entitys.getTaxCount()); //金额
// deliveryRelationEntity.setDeliveryCode(deliveryOrder.getDeliveryCode());
if (size == deliveryOrderForm.getDeliveryProductRelationList().size()-1){
deliveryRelationEntity.setSaleCount(SaleTaxCount.subtract(SaleAmountCount));
}else {
deliveryRelationEntity.setSaleCount(entitys.getReturnUnit().multiply(entitys.getDeliveryNum()).setScale(2, RoundingMode.HALF_UP)); //金额
SaleAmountCount = SaleAmountCount.add(deliveryRelationEntity.getSaleCount());
}
size++;
QueryWrapper<DeliveryProductRelationEntity> queryWrapper=new QueryWrapper<>();
queryWrapper.lambda().eq(DeliveryProductRelationEntity::getBusinessType,"1");
queryWrapper.lambda().eq(DeliveryProductRelationEntity::getBatchNo,entitys.getBatchNo());
List<DeliveryProductRelationEntity> deliveryProductRelationEntities=deliveryProductRelationService.list(queryWrapper);
if (deliveryProductRelationEntities!=null && deliveryProductRelationEntities.size()>0){
// DeliveryOrderEntity deliveryOrderEntity =deliveryOrderService.getInfo( deliveryProductRelationEntities.get(0).getOrderId());
QueryWrapper<ReceiptOrderEntity> receiptOrderEntityQueryWrapper=new QueryWrapper<>();
receiptOrderEntityQueryWrapper.lambda().eq(ReceiptOrderEntity::getId,deliveryProductRelationEntities.get(0).getOrderId());
List<ReceiptOrderEntity> deliveryOrderEntityList=receiptOrderService.list(receiptOrderEntityQueryWrapper);
ReceiptOrderEntity receiptOrderEntity = receiptOrderService.getInfo(deliveryProductRelationEntities.get(0).getOrderId());
deliveryRelationEntity.setPurchaseOrdLn(deliveryProductRelationEntities.get(0).getOrdLn()); //采购订单行
//销售收货采购对应
BusinessOrderEntity businessOrderEntity1 = businessOrderService.getInfo(deliveryOrderEntityList.get(0).getBusinessId());
BusinessOrderEntity businessOrderEntity1 = businessOrderService.getInfo(receiptOrderEntity.getBusinessId());
if (ObjectUtil.isNotEmpty(businessOrderEntity1)){
deliveryRelationEntity.setPurchaseCode(businessOrderEntity1.getCode()); //订单
ContractLEntity contractLEntity = contractLService.getInfo(businessOrderEntity1.getContractId());
if (ObjectUtil.isNotEmpty(contractLEntity)){
deliveryRelationEntity.setPurchaseContract(contractLEntity.getContractNumber()); //合同
}
deliveryRelationEntity.setBusinessLine(businessOrderEntity1.getBusinessLineId());//业务线
// deliveryRelationEntity.setBusinessLine(businessOrderEntity1.getBusinessLineId());//业务线
SubjectbasicEntity subjectbasicEntity=subjectbasicService.getInfo(businessOrderEntity1.getFirstSubjectBasicId());
if (ObjectUtil.isNotEmpty(subjectbasicEntity)){
deliveryRelationEntity.setSupplier(subjectbasicEntity.getName()); //供应商
@ -998,20 +1014,20 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl<WarehousingOutbo
warehousingOutboundPoundlistService.saveOrUpdate(entitys);
}
}
// if (entity.getWarehousingOutboundType().equals("12")){
// List<YunguanSaleOutBoundModel> yunguanSaleOutBoundModelList = warehousingOutboundMapper.saleOutBoundByYunGuan(entity.getId());
// if (yunguanSaleOutBoundModelList != null && yunguanSaleOutBoundModelList.size()>0) {
// JSONObject saleCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/stoOurRecs", "POST", JsonUtil.getObjectToString(yunguanSaleOutBoundModelList));
// if (ObjectUtil.isNotEmpty(saleCode)){
// entity.setErpMark(saleCode.get("code").toString());
// entity.setErpMassage(saleCode.get("errmsg").toString());
// }else {
// entity.setErpMark("N");
// entity.setErpMassage("ESB返回为空");
// }
// this.saveOrUpdate(entity);
// }
// }
if (entity.getWarehousingOutboundType().equals("12")){
List<YunguanSaleOutBoundModel> yunguanSaleOutBoundModelList = warehousingOutboundMapper.saleOutBoundByYunGuan(entity.getId());
if (yunguanSaleOutBoundModelList != null && yunguanSaleOutBoundModelList.size()>0) {
JSONObject saleCode = HttpUtil.httpRequest(yunguaninterfaceurl+"/fggj/sal/stoOurRecs", "POST", JsonUtil.getObjectToString(yunguanSaleOutBoundModelList));
if (ObjectUtil.isNotEmpty(saleCode)){
entity.setErpMark(saleCode.get("code").toString());
entity.setErpMassage(saleCode.get("errmsg").toString());
}else {
entity.setErpMark("N");
entity.setErpMassage("ESB返回为空");
}
this.saveOrUpdate(entity);
}
}
}
@Override

@ -4,10 +4,7 @@ import baiduUtils.BeanMergeUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import jnpf.entity.*;
import jnpf.mapper.CwaccountvoucherMapper;
import jnpf.mapper.VoucherMapper;
import jnpf.mapper.WarehousingNotificationMapper;
import jnpf.mapper.WarehousingStorageMapper;
import jnpf.mapper.*;
import jnpf.model.receiptorder.DeliveryProductRelationModel;
import jnpf.model.receiptorder.ReceiptOrderForm;
import jnpf.model.receiptrelation.ReceiptRelationForm;
@ -34,6 +31,7 @@ import jnpf.util.wxutil.HttpUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import jnpf.database.model.superQuery.SuperJsonModel;
@ -100,6 +98,10 @@ public class WarehousingStorageServiceImpl extends ServiceImpl<WarehousingStorag
private SubjectbasicService subjectbasicService;
@Resource
private ReceiptRelationService receiptRelationService;
@Resource
private BusinessLineMapper businessLineMapper;
@Value("${config.yunguaninterfaceurl}")
private String yunguaninterfaceurl;
@Override
public List<WarehousingStorageEntity> getList(WarehousingStoragePagination warehousingStoragePagination){
return getTypeList(warehousingStoragePagination,warehousingStoragePagination.getDataType());
@ -931,7 +933,10 @@ public class WarehousingStorageServiceImpl extends ServiceImpl<WarehousingStorag
if (ObjectUtil.isNotEmpty(contractLEntity)){
receiptRelationEntity.setPurchaseContract(contractLEntity.getContractNumber()); //合同
}
receiptRelationEntity.setBusinessLine(businessOrderEntity1.getBusinessLineId());//业务线
BusinessLineEntity businessLineEntity = businessLineMapper.selectById(businessOrderEntity1.getBusinessLineId());
if (ObjectUtil.isNotEmpty(businessLineEntity)) {
receiptRelationEntity.setBusinessLine(businessLineEntity.getName());//业务线名称
}
SubjectbasicEntity subjectbasicEntity=subjectbasicService.getInfo(businessOrderEntity1.getFirstSubjectBasicId());
if (ObjectUtil.isNotEmpty(subjectbasicEntity)){
receiptRelationEntity.setSupplier(subjectbasicEntity.getName()); //供应商
@ -1005,7 +1010,7 @@ public class WarehousingStorageServiceImpl extends ServiceImpl<WarehousingStorag
}
}
//WarehousingStoragePoundlist子表数据新增修改
if (receiptOrderForm.getDeliveryVoucherRelationList()!=null){
if (receiptOrderForm.getDeliveryVoucherRelationList()!=null && receiptOrderForm.getDeliveryVoucherRelationList().size()>0){
List<WarehousingStoragePoundlistEntity> tableField114 = JsonUtil.getJsonToList(receiptOrderForm.getDeliveryVoucherRelationList(),WarehousingStoragePoundlistEntity.class);
for(WarehousingStoragePoundlistEntity entitys : tableField114){
entitys.setId(RandomUtil.uuId());
@ -1033,20 +1038,20 @@ public class WarehousingStorageServiceImpl extends ServiceImpl<WarehousingStorag
warehousingStoragePoundlistService.saveOrUpdate(entitys);
}
}
// if (entity.getWarehousingStorageType().equals("15")){
// List<YunguanPurchaseInBoundModel> yunguanPurchaseInBoundModelList = warehousingStorageMapper.purchaseInBoundByYunGuan(entity.getId());
// if (yunguanPurchaseInBoundModelList != null && yunguanPurchaseInBoundModelList.size()>0) {
// JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/stoIn", "POST", JsonUtil.getObjectToString(yunguanPurchaseInBoundModelList));
// if (ObjectUtil.isNotEmpty(purchaseCode)){
// entity.setErpMark(purchaseCode.get("code").toString());
// entity.setErpMassage(purchaseCode.get("errmsg").toString());
// }else{
// entity.setErpMark("N");
// entity.setErpMassage("ESB返回为空");
// }
// this.saveOrUpdate(entity);
// }
// }
if (entity.getWarehousingStorageType().equals("15")){
List<YunguanPurchaseInBoundModel> yunguanPurchaseInBoundModelList = warehousingStorageMapper.purchaseInBoundByYunGuan(entity.getId());
if (yunguanPurchaseInBoundModelList != null && yunguanPurchaseInBoundModelList.size()>0) {
JSONObject purchaseCode = HttpUtil.httpRequest(yunguaninterfaceurl+"/fggj/pur/stoIn", "POST", JsonUtil.getObjectToString(yunguanPurchaseInBoundModelList));
if (ObjectUtil.isNotEmpty(purchaseCode)){
entity.setErpMark(purchaseCode.get("code").toString());
entity.setErpMassage(purchaseCode.get("errmsg").toString());
}else{
entity.setErpMark("N");
entity.setErpMassage("ESB返回为空");
}
this.saveOrUpdate(entity);
}
}
}

@ -28,6 +28,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
@ -130,7 +131,8 @@ public class BusinessOrderController {
private CwsettlementController cwsettlementController;
@Autowired
private CwsettlementService cwsettlementService;
@Value("${config.yunguaninterfaceurl}")
private String yunguaninterfaceurl;
/**
*
*
@ -635,55 +637,55 @@ public class BusinessOrderController {
}else if(StringUtils.isNotEmpty(entity.getBusinessType()) && entity.getBusinessType().equals("2") && entity.getDeliveryType().equals("2")){
entity.setStatus("4");//销售单直送审核通过后状态改为待出库
}
// if (entity.getBusinessType().equals("1")) {
// YunguanPurchaseOrderModel purchaseOrder = businessOrderService.queryPurchaseOrderByYunGuanInfo(id);
// if (ObjectUtil.isNotEmpty(purchaseOrder)) {
// JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/ordHead", "POST", JsonUtil.getObjectToString(purchaseOrder));
// if (ObjectUtil.isNotEmpty(purchaseCode)){
// if (purchaseCode.get("code").equals("200")) {
// List<YunguanPurchaseOrderProductModel> purchaseOrderProduct = businessOrderService.queryPurchaseOrderProductByYunGuanInfo(id);
// JSONObject purchaseProductCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/ordLine", "POST", JsonUtil.getObjectToString(purchaseOrderProduct));
// if(ObjectUtil.isNotEmpty(purchaseCode)){
// entity.setErpMark(purchaseProductCode.get("code").toString());
// entity.setErpMassage(purchaseProductCode.get("errmsg").toString());
// }else{
// entity.setErpMark("N");
// entity.setErpMassage("ESB返回为空");
// }
// }else {
// entity.setErpMark(purchaseCode.get("code").toString());
// entity.setErpMassage(purchaseCode.get("errmsg").toString());
// }
// }else {
// entity.setErpMark("N");
// entity.setErpMassage("ESB返回为空");
// }
// }
// }else if (entity.getBusinessType().equals("2")){
// YunguanSaleOrderModel saleOrder = businessOrderService.querySaleOrderByYunGuanInfo(id);
// if (ObjectUtil.isNotEmpty(saleOrder)){
// JSONObject saleCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/ordHead", "POST", JsonUtil.getObjectToString(saleOrder));
// if (ObjectUtil.isNotEmpty(saleCode)) {
// if (saleCode.get("code").equals("200")) {
// List<YunguanSaleOrderProductModel> saleOrderProduct = businessOrderService.querySaleOrderProductByYunGuanInfo(id);
// JSONObject saleProductCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/ordLine", "POST", JsonUtil.getObjectToString(saleOrderProduct));
// if (ObjectUtil.isNotEmpty(saleProductCode)){
// entity.setErpMark(saleCode.get("code").toString());
// entity.setErpMassage(saleCode.get("errmsg").toString());
// }else{
// entity.setErpMark("N");
// entity.setErpMassage("ESB返回为空");
// }
// }else{
// entity.setErpMark(saleCode.get("code").toString());
// entity.setErpMassage(saleCode.get("errmsg").toString());
// }
// }else {
// entity.setErpMark("N");
// entity.setErpMassage("ESB返回为空");
// }
// }
// }
if (entity.getBusinessType().equals("1")) {
YunguanPurchaseOrderModel purchaseOrder = businessOrderService.queryPurchaseOrderByYunGuanInfo(id);
if (ObjectUtil.isNotEmpty(purchaseOrder)) {
JSONObject purchaseCode = HttpUtil.httpRequest(yunguaninterfaceurl+"/fggj/pur/ordHead", "POST", JsonUtil.getObjectToString(purchaseOrder));
if (ObjectUtil.isNotEmpty(purchaseCode)){
if (purchaseCode.get("code").equals("200")) {
List<YunguanPurchaseOrderProductModel> purchaseOrderProduct = businessOrderService.queryPurchaseOrderProductByYunGuanInfo(id);
JSONObject purchaseProductCode = HttpUtil.httpRequest(yunguaninterfaceurl+"/fggj/pur/ordLine", "POST", JsonUtil.getObjectToString(purchaseOrderProduct));
if(ObjectUtil.isNotEmpty(purchaseCode)){
entity.setErpMark(purchaseProductCode.get("code").toString());
entity.setErpMassage(purchaseProductCode.get("errmsg").toString());
}else{
entity.setErpMark("N");
entity.setErpMassage("ESB返回为空");
}
}else {
entity.setErpMark(purchaseCode.get("code").toString());
entity.setErpMassage(purchaseCode.get("errmsg").toString());
}
}else {
entity.setErpMark("N");
entity.setErpMassage("ESB返回为空");
}
}
}else if (entity.getBusinessType().equals("2")){
YunguanSaleOrderModel saleOrder = businessOrderService.querySaleOrderByYunGuanInfo(id);
if (ObjectUtil.isNotEmpty(saleOrder)){
JSONObject saleCode = HttpUtil.httpRequest(yunguaninterfaceurl+"/fggj/sal/ordHead", "POST", JsonUtil.getObjectToString(saleOrder));
if (ObjectUtil.isNotEmpty(saleCode)) {
if (saleCode.get("code").equals("200")) {
List<YunguanSaleOrderProductModel> saleOrderProduct = businessOrderService.querySaleOrderProductByYunGuanInfo(id);
JSONObject saleProductCode = HttpUtil.httpRequest(yunguaninterfaceurl+"/fggj/sal/ordLine", "POST", JsonUtil.getObjectToString(saleOrderProduct));
if (ObjectUtil.isNotEmpty(saleProductCode)){
entity.setErpMark(saleCode.get("code").toString());
entity.setErpMassage(saleCode.get("errmsg").toString());
}else{
entity.setErpMark("N");
entity.setErpMassage("ESB返回为空");
}
}else{
entity.setErpMark(saleCode.get("code").toString());
entity.setErpMassage(saleCode.get("errmsg").toString());
}
}else {
entity.setErpMark("N");
entity.setErpMassage("ESB返回为空");
}
}
}
businessOrderService.saveOrUpdate(entity);
}
}
@ -1518,11 +1520,11 @@ public class BusinessOrderController {
YunguanPurchaseOrderModel purchaseOrder = businessOrderService.queryPurchaseOrderByYunGuanInfo(id);
if (ObjectUtil.isNotEmpty(purchaseOrder)) {
BusinessOrderEntity businessOrderEntity = businessOrderService.getInfo(id);
JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/ordHead", "POST", JsonUtil.getObjectToString(purchaseOrder));
JSONObject purchaseCode = HttpUtil.httpRequest(yunguaninterfaceurl+"/fggj/pur/ordHead", "POST", JsonUtil.getObjectToString(purchaseOrder));
if (ObjectUtil.isNotEmpty(purchaseCode)){
if (purchaseCode.get("code").equals("200")){
List<YunguanPurchaseOrderProductModel> purchaseOrderProduct = businessOrderService.queryPurchaseOrderProductByYunGuanInfo(id);
JSONObject purchaseProductCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/ordLine", "POST", JsonUtil.getObjectToString(purchaseOrderProduct));
JSONObject purchaseProductCode = HttpUtil.httpRequest(yunguaninterfaceurl+"/fggj/pur/ordLine", "POST", JsonUtil.getObjectToString(purchaseOrderProduct));
if (ObjectUtil.isNotEmpty(purchaseProductCode)) {
if (purchaseProductCode.get("code").equals("200")) {
businessOrderEntity.setErpMark(purchaseCode.get("code").toString());
@ -1558,11 +1560,11 @@ public class BusinessOrderController {
YunguanSaleOrderModel saleOrder = businessOrderService.querySaleOrderByYunGuanInfo(id);
if (ObjectUtil.isNotEmpty(saleOrder)){
BusinessOrderEntity businessOrderEntity = businessOrderService.getInfo(id);
JSONObject saleCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/ordHead", "POST", JsonUtil.getObjectToString(saleOrder));
JSONObject saleCode = HttpUtil.httpRequest(yunguaninterfaceurl+"/fggj/sal/ordHead", "POST", JsonUtil.getObjectToString(saleOrder));
if (ObjectUtil.isNotEmpty(saleCode)) {
if (saleCode.get("code").equals("200")) {
List<YunguanSaleOrderProductModel> saleOrderProduct = businessOrderService.querySaleOrderProductByYunGuanInfo(id);
JSONObject saleProductCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/ordLine", "POST", JsonUtil.getObjectToString(saleOrderProduct));
JSONObject saleProductCode = HttpUtil.httpRequest(yunguaninterfaceurl+"/fggj/sal/ordLine", "POST", JsonUtil.getObjectToString(saleOrderProduct));
if (ObjectUtil.isNotEmpty(saleProductCode)) {
if (saleProductCode.get("code").equals("200")) {
businessOrderEntity.setErpMark(saleCode.get("code").toString());
@ -1598,7 +1600,7 @@ public class BusinessOrderController {
List<YunguanPurchaseInBoundModel> yunguanPurchaseInBoundModelList = warehousingStorageService.purchaseInBoundByYunGuan(id);
if (yunguanPurchaseInBoundModelList != null && yunguanPurchaseInBoundModelList.size()>0) {
WarehousingStorageEntity warehousingStorageEntity = warehousingStorageService.getInfo(id);
JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/stoIn", "POST", JsonUtil.getObjectToString(yunguanPurchaseInBoundModelList));
JSONObject purchaseCode = HttpUtil.httpRequest(yunguaninterfaceurl+"/fggj/pur/stoIn", "POST", JsonUtil.getObjectToString(yunguanPurchaseInBoundModelList));
if (ObjectUtil.isNotEmpty(purchaseCode)){
if (purchaseCode.get("code").equals("200")) {
warehousingStorageEntity.setErpMark(purchaseCode.get("code").toString());
@ -1622,7 +1624,7 @@ public class BusinessOrderController {
List<YunguanSaleOutBoundModel> yunguanSaleOutBoundModelList = warehousingOutboundService.saleOutBoundByYunGuan(id);
if (yunguanSaleOutBoundModelList != null && yunguanSaleOutBoundModelList.size()>0) {
WarehousingOutboundEntity warehousingOutboundEntity = warehousingOutboundService.getInfo(id);
JSONObject saleCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/stoOurRecs", "POST", JsonUtil.getObjectToString(yunguanSaleOutBoundModelList));
JSONObject saleCode = HttpUtil.httpRequest(yunguaninterfaceurl+"/fggj/sal/stoOurRecs", "POST", JsonUtil.getObjectToString(yunguanSaleOutBoundModelList));
if (ObjectUtil.isNotEmpty(saleCode)){
if (saleCode.get("code").equals("200")) {
warehousingOutboundEntity.setErpMark(saleCode.get("code").toString());
@ -1647,7 +1649,7 @@ public class BusinessOrderController {
List<YunguanProductProcessModel> yunguanProductProcessModelList1 = workOrderService.queryWorkOrderPrimaryByYunguan(id);
yunguanProductProcessModelList.addAll(yunguanProductProcessModelList1);
WorkOrderEntity workOrderEntity = workOrderService.getInfo(id);
JSONObject workOrderCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/prod/proditem", "POST", JsonUtil.getObjectToString(yunguanProductProcessModelList));
JSONObject workOrderCode = HttpUtil.httpRequest(yunguaninterfaceurl+"/fggj/prod/proditem", "POST", JsonUtil.getObjectToString(yunguanProductProcessModelList));
if (ObjectUtil.isNotEmpty(workOrderCode)){
if (workOrderCode.get("code").equals("200")) {
workOrderEntity.setErpMark(workOrderCode.get("code").toString());

@ -648,32 +648,32 @@ public class CwsettlementController {
}
cwsettlementForm.setCreatorUserId(entity.getCreatorUserId());
cwsettlementService.saveOrUpdate(cwsettlementForm,id,false);
// FlowTaskEntity flowTaskEntity = flowTaskService.getById(id);
// if (flowTaskEntity!=null){
// QueryWrapper<FlowTaskNodeEntity> flowTaskNodeEntityQueryWrapper = new QueryWrapper<>();
// flowTaskNodeEntityQueryWrapper.lambda().eq(FlowTaskNodeEntity::getNodeCode, flowTaskEntity.getThisStepId());
// flowTaskNodeEntityQueryWrapper.lambda().eq(FlowTaskNodeEntity::getTaskId, flowTaskEntity.getId());
// List<FlowTaskNodeEntity> flowTaskNodeEntityList = flowTaskNodeService.list(flowTaskNodeEntityQueryWrapper);
// if(flowTaskNodeEntityList != null && flowTaskNodeEntityList.size()>0 && "end".equals(flowTaskNodeEntityList.get(0).getNodeNext())) {
// ActionResult entity1 = this.info(id);
// Map<String, Object> map = (Map<String, Object>) entity1.getData();
// CwsettlementEntity cwsettlementEntity = BeanUtil.mapToBean(map, CwsettlementEntity.class, new CopyOptions());
// //推送结算单到运管
// if(ObjectUtil.equals(entity.getType(), "2")){
// //销售
// boolean headFlag = cwsettlementService.pushSaleHeadYunguan(cwsettlementEntity);
// if(headFlag){
// boolean lineFlag = cwsettlementService.pushSaleLineYunguan(cwsettlementEntity);
// }
// }else{
// //采购
// boolean headFlag = cwsettlementService.pushPurchaseHeadYunguan(cwsettlementEntity);
// if(headFlag){
// boolean lineFlag = cwsettlementService.pushPurchaseLineYunguan(cwsettlementEntity);
// }
// }
// }
// }
FlowTaskEntity flowTaskEntity = flowTaskService.getById(id);
if (flowTaskEntity!=null){
QueryWrapper<FlowTaskNodeEntity> flowTaskNodeEntityQueryWrapper = new QueryWrapper<>();
flowTaskNodeEntityQueryWrapper.lambda().eq(FlowTaskNodeEntity::getNodeCode, flowTaskEntity.getThisStepId());
flowTaskNodeEntityQueryWrapper.lambda().eq(FlowTaskNodeEntity::getTaskId, flowTaskEntity.getId());
List<FlowTaskNodeEntity> flowTaskNodeEntityList = flowTaskNodeService.list(flowTaskNodeEntityQueryWrapper);
if(flowTaskNodeEntityList != null && flowTaskNodeEntityList.size()>0 && "end".equals(flowTaskNodeEntityList.get(0).getNodeNext())) {
ActionResult entity1 = this.info(id);
Map<String, Object> map = (Map<String, Object>) entity1.getData();
CwsettlementEntity cwsettlementEntity = BeanUtil.mapToBean(map, CwsettlementEntity.class, new CopyOptions());
//推送结算单到运管
if(ObjectUtil.equals(entity.getType(), "2")){
//销售
boolean headFlag = cwsettlementService.pushSaleHeadYunguan(cwsettlementEntity);
if(headFlag){
boolean lineFlag = cwsettlementService.pushSaleLineYunguan(cwsettlementEntity);
}
}else{
//采购
boolean headFlag = cwsettlementService.pushPurchaseHeadYunguan(cwsettlementEntity);
if(headFlag){
boolean lineFlag = cwsettlementService.pushPurchaseLineYunguan(cwsettlementEntity);
}
}
}
}
}catch(Exception e){
return ActionResult.fail("修改数据失败");
}

@ -0,0 +1,337 @@
package jnpf.controller;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jnpf.base.ActionResult;
import jnpf.base.UserInfo;
import jnpf.exception.DataException;
import jnpf.permission.entity.UserEntity;
import jnpf.service.*;
import jnpf.entity.*;
import jnpf.util.*;
import jnpf.model.subjectbasicexclusive.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.*;
import jnpf.annotation.JnpfField;
import jnpf.base.vo.PageListVO;
import jnpf.base.vo.PaginationVO;
import jnpf.base.vo.DownloadVO;
import jnpf.config.ConfigValueUtil;
import jnpf.base.entity.ProvinceEntity;
import java.io.IOException;
import java.util.stream.Collectors;
import jnpf.engine.entity.FlowTaskEntity;
import jnpf.exception.WorkFlowException;
import org.springframework.web.multipart.MultipartFile;
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.ExcelImportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.ImportParams;
import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Workbook;
import java.io.File;
import jnpf.onlinedev.model.ExcelImFieldModel;
import jnpf.onlinedev.model.OnlineImport.ImportDataModel;
import jnpf.onlinedev.model.OnlineImport.ImportFormCheckUniqueModel;
import jnpf.onlinedev.model.OnlineImport.ExcelImportModel;
import jnpf.onlinedev.model.OnlineImport.VisualImportModel;
import cn.xuyanwu.spring.file.storage.FileInfo;
import lombok.Cleanup;
import jnpf.model.visualJson.config.HeaderModel;
import jnpf.base.model.ColumnDataModel;
import jnpf.base.util.VisualUtils;
import org.springframework.transaction.annotation.Transactional;
/**
* subjectBasicExclusive
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-07-31
*/
@Slf4j
@RestController
@Tag(name = "subjectBasicExclusive" , description = "scm")
@RequestMapping("/api/scm/SubjectBasicExclusive")
public class SubjectBasicExclusiveController {
@Autowired
private GeneraterSwapUtil generaterSwapUtil;
@Autowired
private UserProvider userProvider;
@Autowired
private SubjectBasicExclusiveService subjectBasicExclusiveService;
@Autowired
private ConfigValueUtil configValueUtil;
/**
*
*
* @param subjectBasicExclusivePagination
* @return
*/
@Operation(summary = "获取列表")
@PostMapping("/getList")
public ActionResult list(@RequestBody SubjectBasicExclusivePagination subjectBasicExclusivePagination)throws IOException{
List<SubjectBasicExclusiveEntity> list= subjectBasicExclusiveService.getList(subjectBasicExclusivePagination);
List<Map<String, Object>> realList=new ArrayList<>();
for (SubjectBasicExclusiveEntity entity : list) {
Map<String, Object> subjectBasicExclusiveMap=JsonUtil.entityToMap(entity);
subjectBasicExclusiveMap.put("id", subjectBasicExclusiveMap.get("id"));
//副表数据
//子表数据
realList.add(subjectBasicExclusiveMap);
}
//数据转换
realList = generaterSwapUtil.swapDataList(realList, SubjectBasicExclusiveConstant.getFormData(), SubjectBasicExclusiveConstant.getColumnData(), subjectBasicExclusivePagination.getModuleId(),false);
//返回对象
PageListVO vo = new PageListVO();
vo.setList(realList);
PaginationVO page = JsonUtil.getJsonToBean(subjectBasicExclusivePagination, PaginationVO.class);
vo.setPagination(page);
return ActionResult.success(vo);
}
/**
*
*
* @param subjectBasicExclusiveForm
* @return
*/
@PostMapping()
@Operation(summary = "创建")
public ActionResult create(@RequestBody @Valid SubjectBasicExclusiveForm subjectBasicExclusiveForm) {
String b = subjectBasicExclusiveService.checkForm(subjectBasicExclusiveForm,0);
if (StringUtil.isNotEmpty(b)){
return ActionResult.fail(b );
}
try{
subjectBasicExclusiveService.saveOrUpdate(subjectBasicExclusiveForm, null ,true);
}catch(Exception e){
return ActionResult.fail("新增数据失败");
}
return ActionResult.success("创建成功");
}
/**
* Excel
*
* @return
*/
@Operation(summary = "导出Excel")
@PostMapping("/Actions/Export")
public ActionResult Export(@RequestBody SubjectBasicExclusivePagination subjectBasicExclusivePagination) throws IOException {
if (StringUtil.isEmpty(subjectBasicExclusivePagination.getSelectKey())){
return ActionResult.fail("请选择导出字段");
}
List<SubjectBasicExclusiveEntity> list= subjectBasicExclusiveService.getList(subjectBasicExclusivePagination);
List<Map<String, Object>> realList=new ArrayList<>();
for (SubjectBasicExclusiveEntity entity : list) {
Map<String, Object> subjectBasicExclusiveMap=JsonUtil.entityToMap(entity);
subjectBasicExclusiveMap.put("id", subjectBasicExclusiveMap.get("id"));
//副表数据
//子表数据
realList.add(subjectBasicExclusiveMap);
}
//数据转换
realList = generaterSwapUtil.swapDataList(realList, SubjectBasicExclusiveConstant.getFormData(), SubjectBasicExclusiveConstant.getColumnData(), subjectBasicExclusivePagination.getModuleId(),false);
String[]keys=!StringUtil.isEmpty(subjectBasicExclusivePagination.getSelectKey())?subjectBasicExclusivePagination.getSelectKey():new String[0];
UserInfo userInfo=userProvider.get();
DownloadVO vo=this.creatModelExcel(configValueUtil.getTemporaryFilePath(),realList,keys,userInfo);
return ActionResult.success(vo);
}
/**
*
*/
public DownloadVO creatModelExcel(String path,List<Map<String, Object>>list,String[]keys,UserInfo userInfo){
DownloadVO vo=DownloadVO.builder().build();
List<ExcelExportEntity> entitys=new ArrayList<>();
if(keys.length>0){
for(String key:keys){
switch(key){
case "firstSubject" :
entitys.add(new ExcelExportEntity("一级供应商" ,"firstSubject"));
break;
case "isExclusive" :
entitys.add(new ExcelExportEntity("是否为独家采购" ,"isExclusive"));
break;
case "mouth" :
entitys.add(new ExcelExportEntity("月份" ,"mouth"));
break;
case "subjects" :
entitys.add(new ExcelExportEntity("一级供应商主要客户名称" ,"subjects"));
break;
case "mouthAmount" :
entitys.add(new ExcelExportEntity("一级供应商月开票金额" ,"mouthAmount"));
break;
case "settlementAmount" :
entitys.add(new ExcelExportEntity("一级供应商月结算金额" ,"settlementAmount"));
break;
case "rateAmount" :
entitys.add(new ExcelExportEntity("我公司月采购金额占比" ,"rateAmount"));
break;
default:
break;
}
}
}
ExportParams exportParams = new ExportParams(null, "表单信息");
exportParams.setType(ExcelType.XSSF);
try{
@Cleanup Workbook workbook = new HSSFWorkbook();
if (entitys.size()>0){
if (list.size()==0){
list.add(new HashMap<>());
}
//去除空数据
List<Map<String, Object>> dataList = new ArrayList<>();
for (Map<String, Object> map : list) {
int i = 0;
for (String key : keys) {
//子表
if (key.toLowerCase().startsWith("tablefield")) {
String tableField = key.substring(0, key.indexOf("-" ));
String field = key.substring(key.indexOf("-" ) + 1);
Object o = map.get(tableField);
if (o != null) {
List<Map<String, Object>> childList = (List<Map<String, Object>>) o;
for (Map<String, Object> childMap : childList) {
if (childMap.get(field) != null) {
i++;
}
}
}
} else {
Object o = map.get(key);
if (o != null) {
i++;
}
}
}
if (i > 0) {
dataList.add(map);
}
}
//复杂表头-表头和数据处理
ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(SubjectBasicExclusiveConstant.getColumnData(), ColumnDataModel.class);
List<HeaderModel> complexHeaderList = columnDataModel.getComplexHeaderList();
if (!Objects.equals(columnDataModel.getType(), 3) && !Objects.equals(columnDataModel.getType(), 5)) {
entitys = VisualUtils.complexHeaderHandel(entitys, complexHeaderList);
dataList = VisualUtils.complexHeaderDataHandel(dataList, complexHeaderList);
}
workbook = ExcelExportUtil.exportExcel(exportParams, entitys, dataList);
}
String fileName = "表单信息" + DateUtil.dateNow("yyyyMMdd") + "_" + RandomUtil.uuId() + ".xlsx";
MultipartFile multipartFile = ExcelUtil.workbookToCommonsMultipartFile(workbook, fileName);
String temporaryFilePath = configValueUtil.getTemporaryFilePath();
FileInfo fileInfo = FileUploadUtils.uploadFile(multipartFile, temporaryFilePath, fileName);
vo.setName(fileInfo.getFilename());
vo.setUrl(UploaderUtil.uploaderFile(fileInfo.getFilename() + "#" + "Temporary") + "&name=" + fileName);
} catch (Exception e) {
log.error("信息导出Excel错误:{}", e.getMessage());
e.printStackTrace();
}
return vo;
}
/**
*
* @param id
* @param subjectBasicExclusiveForm
* @return
*/
@PutMapping("/{id}")
@Operation(summary = "更新")
public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid SubjectBasicExclusiveForm subjectBasicExclusiveForm,
@RequestParam(value = "isImport", required = false) boolean isImport){
subjectBasicExclusiveForm.setId(id);
if (!isImport) {
String b = subjectBasicExclusiveService.checkForm(subjectBasicExclusiveForm,1);
if (StringUtil.isNotEmpty(b)){
return ActionResult.fail(b );
}
}
SubjectBasicExclusiveEntity entity= subjectBasicExclusiveService.getInfo(id);
if(entity!=null){
try{
subjectBasicExclusiveService.saveOrUpdate(subjectBasicExclusiveForm,id,false);
}catch(Exception e){
return ActionResult.fail("修改数据失败");
}
return ActionResult.success("更新成功");
}else{
return ActionResult.fail("更新失败,数据不存在");
}
}
/**
*
* @param id
* @return
*/
@Operation(summary = "删除")
@DeleteMapping("/{id}")
@Transactional
public ActionResult delete(@PathVariable("id") String id){
SubjectBasicExclusiveEntity entity= subjectBasicExclusiveService.getInfo(id);
if(entity!=null){
//假删除
entity.setDeleteMark(1);
subjectBasicExclusiveService.update(id,entity);
}
return ActionResult.success("删除成功");
}
/**
* ()
* 使-
* @param id
* @return
*/
@Operation(summary = "表单信息(详情页)")
@GetMapping("/detail/{id}")
public ActionResult detailInfo(@PathVariable("id") String id){
SubjectBasicExclusiveEntity entity= subjectBasicExclusiveService.getInfo(id);
if(entity==null){
return ActionResult.fail("表单数据不存在!");
}
Map<String, Object> subjectBasicExclusiveMap=JsonUtil.entityToMap(entity);
subjectBasicExclusiveMap.put("id", subjectBasicExclusiveMap.get("id"));
//副表数据
//子表数据
subjectBasicExclusiveMap = generaterSwapUtil.swapDataDetail(subjectBasicExclusiveMap,SubjectBasicExclusiveConstant.getFormData(),"588331783775367173",false);
return ActionResult.success(subjectBasicExclusiveMap);
}
/**
* ()
* 使-
* @param id
* @return
*/
@Operation(summary = "信息")
@GetMapping("/{id}")
public ActionResult info(@PathVariable("id") String id){
SubjectBasicExclusiveEntity entity= subjectBasicExclusiveService.getInfo(id);
if(entity==null){
return ActionResult.fail("表单数据不存在!");
}
Map<String, Object> subjectBasicExclusiveMap=JsonUtil.entityToMap(entity);
subjectBasicExclusiveMap.put("id", subjectBasicExclusiveMap.get("id"));
//副表数据
//子表数据
subjectBasicExclusiveMap = generaterSwapUtil.swapDataForm(subjectBasicExclusiveMap,SubjectBasicExclusiveConstant.getFormData(),SubjectBasicExclusiveConstant.TABLEFIELDKEY,SubjectBasicExclusiveConstant.TABLERENAMES);
return ActionResult.success(subjectBasicExclusiveMap);
}
}

@ -38,8 +38,8 @@ import lombok.extern.slf4j.Slf4j;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.math.BigDecimal;
import java.util.*;
import jnpf.annotation.JnpfField;
@ -74,6 +74,8 @@ import jnpf.base.model.ColumnDataModel;
import jnpf.base.util.VisualUtils;
import org.springframework.transaction.annotation.Transactional;
import javax.validation.Valid;
/**
* workOrder
* @ V3.5
@ -140,6 +142,8 @@ public class WorkOrderController {
private WarehousingReturnService warehousingReturnService;
@Autowired
private WarehousingReportlossService warehousingReportlossService;
@Value("${config.yunguaninterfaceurl}")
private String yunguaninterfaceurl;
/**
*
*
@ -796,17 +800,17 @@ public class WorkOrderController {
warehousingOutboundController.createWork(id,warehousingOutboundForm);
}
}
// List<YunguanProductProcessModel> yunguanProductProcessModelList = workOrderService.queryWorkOrderProductByYunguan(id);
// List<YunguanProductProcessModel> yunguanProductProcessModelList1 = workOrderService.queryWorkOrderPrimaryByYunguan(id);
// yunguanProductProcessModelList.addAll(yunguanProductProcessModelList1);
// JSONObject workOrderCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/prod/proditem", "POST", JsonUtil.getObjectToString(yunguanProductProcessModelList));
// if(ObjectUtil.isNotEmpty(workOrderCode)){
// entity.setErpMark(workOrderCode.get("code").toString());
// entity.setErpMassage(workOrderCode.get("errmsg").toString());
// }else {
// entity.setErpMark("N");
// entity.setErpMassage("ESB返回为空");
// }
List<YunguanProductProcessModel> yunguanProductProcessModelList = workOrderService.queryWorkOrderProductByYunguan(id);
List<YunguanProductProcessModel> yunguanProductProcessModelList1 = workOrderService.queryWorkOrderPrimaryByYunguan(id);
yunguanProductProcessModelList.addAll(yunguanProductProcessModelList1);
JSONObject workOrderCode = HttpUtil.httpRequest(yunguaninterfaceurl+"/fggj/prod/proditem", "POST", JsonUtil.getObjectToString(yunguanProductProcessModelList));
if(ObjectUtil.isNotEmpty(workOrderCode)){
entity.setErpMark(workOrderCode.get("code").toString());
entity.setErpMassage(workOrderCode.get("errmsg").toString());
}else {
entity.setErpMark("N");
entity.setErpMassage("ESB返回为空");
}
workOrderService.updateById(entity);
}
}

@ -1092,9 +1092,11 @@ public class YunguanInterfaceController {
warehousingOutboundQueryWrapper.lambda().eq(WarehousingOutboundEntity::getDocumentNo,yunguanSaleOutBoundModel.getPROD_ZL());
WarehousingOutboundEntity warehousingOutboundEntity = warehousingOutboundService.getOne(warehousingOutboundQueryWrapper);
if (ObjectUtil.isNotEmpty(warehousingOutboundEntity)){
int index = yunguanSaleOutBoundModel.getCK_ORDER().lastIndexOf("-");
String lineNo =yunguanSaleOutBoundModel.getCK_ORDER().substring(index + 1).replaceFirst("^0*","");
QueryWrapper<WarehousingOutboundProductEntity> warehousingOutboundProductQueryWrapper = new QueryWrapper<>();
warehousingOutboundProductQueryWrapper.lambda().eq(WarehousingOutboundProductEntity::getWarehousingOutboundId,warehousingOutboundEntity.getId());
warehousingOutboundProductQueryWrapper.lambda().eq(WarehousingOutboundProductEntity::getOrderLine,yunguanSaleOutBoundModel.getCK_ORDER());
warehousingOutboundProductQueryWrapper.lambda().eq(WarehousingOutboundProductEntity::getOrderLine,lineNo);
WarehousingOutboundProductEntity warehousingOutboundProductEntity = warehousingOutboundProductService.getOne(warehousingOutboundProductQueryWrapper);
if (ObjectUtil.isNotEmpty(warehousingOutboundProductEntity)){
warehousingOutboundProductEntity.setYunguanMark(yunguanSaleOutBoundModel.getREAD_FLAG());

@ -0,0 +1,62 @@
package jnpf.entity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import java.util.Date;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.math.BigDecimal;
/**
*
*
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-07-31
*/
@Data
@TableName("jg_subject_basic_exclusive")
public class SubjectBasicExclusiveEntity {
@TableId(value ="ID" )
private String id;
@TableField("TYPE")
private String type;
@TableField(value = "FIRST_SUBJECT" , updateStrategy = FieldStrategy.IGNORED)
private String firstSubject;
@TableField(value = "SUBJECTS" , updateStrategy = FieldStrategy.IGNORED)
private String subjects;
@TableField(value = "IS_EXCLUSIVE" , updateStrategy = FieldStrategy.IGNORED)
private String isExclusive;
@TableField(value = "MOUTH_AMOUNT" , updateStrategy = FieldStrategy.IGNORED)
private BigDecimal mouthAmount;
@TableField(value = "SETTLEMENT_AMOUNT" , updateStrategy = FieldStrategy.IGNORED)
private BigDecimal settlementAmount;
@TableField(value = "RATE_AMOUNT" , updateStrategy = FieldStrategy.IGNORED)
private String rateAmount;
@TableField(value = "MOUTH" , updateStrategy = FieldStrategy.IGNORED)
private Date mouth;
@TableField(value = "f_creator_time" , fill = FieldFill.INSERT)
private Date creatorTime;
@TableField(value = "f_creator_user_id" , fill = FieldFill.INSERT)
private String creatorUserId;
@TableField(value = "f_last_modify_time" , fill = FieldFill.INSERT_UPDATE)
private Date lastModifyTime;
@TableField(value = "f_last_modify_user_id" , fill = FieldFill.INSERT_UPDATE)
private String lastModifyUserId;
@TableField(value = "f_delete_time" , fill = FieldFill.UPDATE)
private Date deleteTime;
@TableField(value = "f_delete_user_id" , fill = FieldFill.UPDATE)
private String deleteUserId;
@TableField(value = "f_delete_mark" , updateStrategy = FieldStrategy.IGNORED)
private Integer deleteMark;
@TableField(value = "company_id" , fill = FieldFill.INSERT)
private String companyId;
@TableField(value = "department_id" , fill = FieldFill.INSERT)
private String departmentId;
@TableField(value = "organize_json_id" , fill = FieldFill.INSERT)
private String organizeJsonId;
@TableField("F_VERSION")
private Integer version;
@TableField("F_FLOW_ID")
private String flowId;
}

@ -110,6 +110,8 @@ public class WarehousingOutboundProductEntity {
private String name;
@TableField(exist = false)
private String contractName;
@TableField(exist = false)
private String ordLnPurchase;

@ -0,0 +1,48 @@
package jnpf.model.subjectbasicexclusive;
import lombok.Data;
import java.util.List;
import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
* subjectBasicExclusive
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-07-31
*/
@Data
public class SubjectBasicExclusiveForm {
/** 主键 */
private String id;
/** 乐观锁 **/
@JsonProperty("version")
private Integer version;
/** 一级供应商 **/
@JsonProperty("firstSubject")
private String firstSubject;
/** 是否为独家采购 **/
@JsonProperty("isExclusive")
private String isExclusive;
/** 月份 **/
@JsonProperty("mouth")
private String mouth;
/** 一级供应商主要客户名称 **/
@JsonProperty("subjects")
private String subjects;
/** 一级供应商月开票金额 **/
@JsonProperty("mouthAmount")
private String mouthAmount;
/** 一级供应商月结算金额 **/
@JsonProperty("settlementAmount")
private String settlementAmount;
/** 我公司月采购金额占比 **/
@JsonProperty("rateAmount")
private String rateAmount;
/** 类型 **/
@JsonProperty("type")
private String type;
}

@ -0,0 +1,40 @@
package jnpf.model.subjectbasicexclusive;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import jnpf.base.Pagination;
import java.util.List;
/**
*
* subjectBasicExclusive
* @ V3.5
* @ https://www.jnpfsoft.com
* @ JNPF
* @ 2024-07-31
*/
@Data
public class SubjectBasicExclusivePagination extends Pagination {
/** 查询key */
private String[] selectKey;
/** json */
private String json;
/** 数据类型 0-当前页1-全部数据 */
private String dataType;
/** 高级查询 */
private String superQueryJson;
/** 功能id */
private String moduleId;
/** 菜单id */
private String menuId;
/** 月份 */
@JsonProperty("mouth")
private Object mouth;
/** 一级供应商 */
@JsonProperty("firstSubject")
private Object firstSubject;
/** 类型 */
@JsonProperty("type")
private Object type;
}

@ -1896,33 +1896,33 @@ export default {
return sums;
},
initList(list) {
for (let i = 0; i < list.length; i++) {
const e = list[i];
this.dataForm.cwaccountstorageList.push(e)
}
//this.addcwaccountvoucherList();
},
// initList(list) {
// let mark = false
// for (let i = 0; i < list.length; i++) {
// const e = list[i];
// if (e.yunguanMark == 'Y') {
// this.dataForm.cwaccountstorageList.push(e)
// } else {
// mark = true
// }
// }
// if (mark) {
// this.$message({
// message: '',
// type: 'error',
// duration: 1000
// });
// return
// this.dataForm.cwaccountstorageList.push(e)
// }
// //this.addcwaccountvoucherList();
// },
initList(list) {
let mark = false
for (let i = 0; i < list.length; i++) {
const e = list[i];
if (e.yunguanMark == 'Y') {
this.dataForm.cwaccountstorageList.push(e)
} else {
mark = true
}
}
if (mark) {
this.$message({
message: '存在运管暂未返回正常订单状态的订单',
type: 'error',
duration: 1000
});
return
}
//this.addcwaccountvoucherList();
},
typeChangeData() {
this.dataForm.cwaccountsubjectList = [];
this.dataForm.cwaccountcontractList = [];

@ -2054,6 +2054,51 @@ export default {
},
tableRequiredData: {},
dataRule: {
custTy: [{
required: true,
message: '请选择事务处理类型',
trigger: 'blur'
},],
invoiceDate: [{
required: true,
message: '请选择发票日期',
trigger: 'change'
},],
invoiceCnt: [{
required: true,
message: '请输入发票张数',
trigger: 'blur'
},],
invoiceType: [{
required: true,
message: '请选择发票类型',
trigger: 'change'
},],
attribute11: [{
required: true,
message: '请输入发票号码',
trigger: 'blur'
},],
invoiceAmount: [{
required: true,
message: '请输入发票金额',
trigger: 'blur'
},],
glDate: [{
required: true,
message: '请选择入账时间',
trigger: 'change'
},],
description: [{
required: true,
message: '请输入摘要',
trigger: 'blur'
},],
annexCnt: [{
required: true,
message: '请输入附件张数',
trigger: 'blur'
},],
type: [{
required: true,
message: '请至少选择一个',
@ -2991,6 +3036,15 @@ export default {
let isOk = true;
for (let i = 0; i < this.dataForm.cwsettlementsummaryList.length; i++) {
const e = this.dataForm.cwsettlementsummaryList[i];
if (!e.itemNmInv) {
this.$message({
message: '开票商品名称不能为空',
type: 'error',
duration: 1000
});
isOk = false
break
}
}
return isOk;
},

@ -43,8 +43,8 @@
</el-col>
<el-col :span="6">
<el-form-item label="申请状态">
<JnpfSelect v-model="query.applyState" placeholder="请选择" clearable :options="applyStateOptions"
:props="applyStateProps">
<JnpfSelect v-model="query.applyState" placeholder="请选择" clearable
:options="applyStateOptions" :props="applyStateProps">
</JnpfSelect>
</el-form-item>
</el-col>
@ -150,12 +150,6 @@
</template>
</el-table-column>
<!-- <el-table-column prop="settlementAmount" label="应收/应付合计(含税)" align="center" width="150">
</el-table-column> -->
<!-- <el-table-column prop="paymentAmount" label="已付金额" align="center" width="150">
@ -196,7 +190,6 @@
<el-table-column prop="realNameA" label="修改用户" align="center">
</el-table-column>
<el-table-column label="操作" fixed="right" width="250" align="center">
<template slot-scope="scope">
<el-button type="text" :disabled="[1,2,4,5].indexOf(scope.row.flowState)>-1"
@ -211,8 +204,10 @@
v-if="scope.row.settlableAmount > 0 && scope.row.flowState==2"
@click="shoufukuanHandle(scope.row)">收付款</el-button> -->
<!-- <template v-if="scope.row.flowState == 2 && scope.row.erpMark != '200'">
@click="shoufukuanHandle(scope.row)">收付款</el-button> -->
<template v-if="scope.row.flowState == 2 && scope.row.erpMark != '200'">
<el-button size="mini" type="text" @click="repush(scope.row)"></el-button>
</template> -->
</template>
</template>
</el-table-column>
</JNPF-table>

@ -266,9 +266,9 @@
@click="handleDelVoucher(scope.row.id)">删除
</el-button>
<!-- <template v-if="scope.row.flowState == '2' && scope.row.erpMark != '200'">
<template v-if="scope.row.flowState == '2' && scope.row.erpMark != '200'">
<el-button size="mini" type="text" @click="repush(scope.row.id)"></el-button>
</template> -->
</template>
</template>
</el-table-column>
</JNPF-table>
@ -527,14 +527,14 @@ export default {
})
},
inBoundNotice(row) {
// if (row.yunguanMark != 'Y') {
// this.$message({
// type: 'error',
// message: '',
// duration: 1500,
// })
// return
// }
if (row.yunguanMark != 'Y') {
this.$message({
type: 'error',
message: '运管暂未返回正常订单状态',
duration: 1500,
})
return
}
const selectData = row
selectData.flag = '采购入库通知'
if (!this.inBoundFlowList.length) {

@ -1789,15 +1789,15 @@ export default {
);
},
getPurchaseOrder(val, val2) {
// if (val2.yunguanMark != 'Y') {
// this.dataForm.businessId = undefined
// this.$message({
// message: '',
// type: 'error',
// duration: 1000
// });
// return
// }
if (val2.yunguanMark != 'Y') {
this.dataForm.businessId = undefined
this.$message({
message: '运管暂未返回正常订单状态',
type: 'error',
duration: 1000
});
return
}
this.dataForm.purchaseOrderInfo = [];
this.dataForm.purchaseOrderInfo[0] = val2;
this.dataForm.subjectId = val2.firstSubjectBasicId;

@ -1732,15 +1732,15 @@ export default {
);
},
getSaleOrder(val, val2) {
// if (val2.yunguanMark != 'Y') {
// this.dataForm.businessId = undefined
// this.$message({
// message: '',
// type: 'error',
// duration: 1000
// });
// return
// }
if (val2.yunguanMark != 'Y') {
this.dataForm.businessId = undefined
this.$message({
message: '运管暂未返回正常订单状态',
type: 'error',
duration: 1000
});
return
}
this.dataForm.businessOrderInfoList = [];
this.dataForm.businessOrderInfoList[0] = val2;
this.dataForm.subjectId = val2.firstSubjectBasicId;

@ -1975,13 +1975,13 @@ export default {
data.forEach((val, index) => {
this.dataForm.isTransferSource.push(val.id)
val.businessOrderProductRelationalList.forEach((item, index) => {
item.salePrice = item.salePrice ? item.salePrice : 0
if (this.dataForm.businessOrderProductRelationalList.length == 0) {
// this.dataForm.businessOrderProductRelationalList.push(item);
item.salePrice = item.salePrice ? item.salePrice : 0
let item1 = {
productId: item.productId,
businessNum: item.businessNum,
businessPrice: undefined,
name: item.name,
spec: item.spec,
code: item.code,
@ -2070,7 +2070,7 @@ export default {
data.forEach((val, index) => {
this.dataForm.isTransferSource.push(val.id)
val.businessOrderProductRelationalList.forEach((item, index) => {
item.salePrice = item.salePrice ? item.salePrice : 0
if (this.dataForm.businessOrderProductRelationalList.length == 0) {
// this.dataForm.businessOrderProductRelationalList.push(item);
let item1 = {

@ -229,9 +229,9 @@
@click="handleDelVoucher(scope.row.id)">删除
</el-button>
<!-- <template v-if="scope.row.flowState == '2' && scope.row.erpMark != '200'">
<template v-if="scope.row.flowState == '2' && scope.row.erpMark != '200'">
<el-button size="mini" type="text" @click="repush(scope.row.id)"></el-button>
</template> -->
</template>
</template>
</el-table-column>
</JNPF-table>
@ -454,14 +454,14 @@ export default {
})
},
outBoundNotice(row) {
// if (row.yunguanMark != 'Y') {
// this.$message({
// type: 'error',
// message: '',
// duration: 1500,
// })
// return
// }
if (row.yunguanMark != 'Y') {
this.$message({
type: 'error',
message: '运管暂未返回正常订单状态',
duration: 1500,
})
return
}
const selectData = row
selectData.flag = '销售出库通知'
if (!this.outBoundFlowList.length) {

@ -0,0 +1,141 @@
<template>
<transition name="el-zoom-in-center">
<div class="JNPF-preview-main">
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
<div class="JNPF-common-page-header">
<el-page-header @back="goBack"
content="详情"/>
<div class="options">
<el-button @click="goBack"> </el-button>
</div>
</div>
<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right" >
<template v-if="!loading">
<el-col :span="8" >
<jnpf-form-tip-item label="一级供应商"
prop="firstSubject" >
<p>{{dataForm.firstSubject}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="是否为独家采购" label-width="120px"
prop="isExclusive" >
<p>{{ dataForm.isExclusive }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="月份"
prop="mouth" >
<p>{{dataForm.mouth}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="一级供应商主要客户名称"
prop="subjects" >
<p>{{dataForm.subjects}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="一级供应商月开票金额"
prop="mouthAmount" >
<p>{{dataForm.mouthAmount}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="一级供应商月结算金额"
prop="settlementAmount" >
<p>{{dataForm.settlementAmount}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="我公司月采购金额占比"
prop="rateAmount" >
<p>{{dataForm.rateAmount}}</p>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-row>
</div>
</transition>
</template>
<script>
import request from '@/utils/request'
import { getConfigData } from '@/api/onlineDev/visualDev'
import jnpf from '@/utils/jnpf'
import Detail from '@/views/basic/dynamicModel/list/detail'
import { thousandsFormat } from "@/components/Generator/utils/index"
export default {
components: { Detail},
props: [],
data() {
return {
visible: false,
detailVisible: false,
loading: false,
dataForm: {
id :'',
firstSubject : '',
isExclusive : '',
mouth : '',
subjects : '',
mouthAmount : '',
settlementAmount : '',
rateAmount : '',
},
isExclusiveOptions:[{"fullName":"是","id":"1"},{"fullName":"不是","id":"2"}],
isExclusiveProps:{"label":"fullName","value":"id" },
}
},
computed: {},
watch: {},
created() {
},
mounted() {},
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData)
formData.popupType = 'general'
this.detailVisible = true
this.$nextTick(() => {
this.$refs.Detail.init(formData, modelId, defaultValue)
})
})
},
dataInfo(dataAll){
let _dataAll =dataAll
this.dataForm = _dataAll
},
goBack() {
this.$emit('refresh')
},
init(id) {
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if(this.dataForm.id){
this.loading = true
request({
url: '/api/scm/SubjectBasicExclusive/detail/'+this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
this.loading = false
})
}
})
},
},
}
</script>

@ -0,0 +1,474 @@
<template>
<transition name="el-zoom-in-center">
<div class="JNPF-preview-main">
<div class="JNPF-common-page-header">
<el-page-header @back="goBack" :content="!dataForm.id ? '新建':'编辑'" />
<div class="options">
<el-dropdown class="dropdown" placement="bottom">
<el-button style="width:70px">
<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
<el-dropdown-menu slot="dropdown">
<template v-if="dataForm.id">
<el-dropdown-item @click.native="prev" :disabled='prevDis'>
{{'上一条'}}
</el-dropdown-item>
<el-dropdown-item @click.native="next" :disabled='nextDis'>
{{'下一条'}}
</el-dropdown-item>
</template>
<el-dropdown-item type="primary" @click.native="dataFormSubmit(2)"
:loading="continueBtnLoading" :disabled='btnLoading'>
{{!dataForm.id ?'确定并新增':'确定并继续'}}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"
:disabled='continueBtnLoading'> </el-button>
<el-button @click="goBack"> </el-button>
</div>
</div>
<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
label-position="right">
<template v-if="!loading">
<!-- 具体表单 -->
<el-col :span="8">
<jnpf-form-tip-item label="客户名称" prop="firstSubject">
<JnpfInput v-model="dataForm.firstSubject" @change="changeData('firstSubject',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="是否为独家供应" label-width="120px" prop="isExclusive">
<JnpfRadio v-model="dataForm.isExclusive" @change="changeData('isExclusive',-1)"
optionType="button" direction="horizontal" size="medium"
:options="isExclusiveOptions" :props="isExclusiveProps">
</JnpfRadio>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="月份" prop="mouth">
<JnpfDatePicker v-model="dataForm.mouth" @change="changeData('mouth',-1)"
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')"
placeholder="请选择" clearable :style='{"width":"100%"}' type="month"
format="yyyy-MM">
</JnpfDatePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="主要合作商名称" prop="subjects">
<JnpfInput v-model="dataForm.subjects" @change="changeData('subjects',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="客户月采购金额" prop="mouthAmount">
<JnpfInput v-model="dataForm.mouthAmount" @change="changeData('mouthAmount',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="本月我公司月销售金额" prop="settlementAmount">
<JnpfInput v-model="dataForm.settlementAmount"
@change="changeData('settlementAmount',-1)" placeholder="请输入" clearable
:style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="我公司月销售金额占比" prop="rateAmount">
<JnpfInput v-model="dataForm.rateAmount" @change="changeData('rateAmount',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<!-- 表单结束 -->
</template>
</el-form>
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false" />
</el-row>
</div>
</transition>
</template>
<script>
import request from '@/utils/request'
import { mapGetters } from "vuex";
import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
import { getDefaultCurrentValueUserId } from '@/api/permission/user'
import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
import { thousandsFormat } from "@/components/Generator/utils/index"
export default {
components: {},
props: [],
data() {
return {
dataFormSubmitType: 0,
continueBtnLoading: false,
index: 0,
prevDis: false,
nextDis: false,
allList: [],
visible: false,
loading: false,
btnLoading: false,
formRef: 'formRef',
setting: {},
eventType: '',
userBoxVisible: false,
selectDialogVisible: false,
currTableConf: {},
dataValueAll: {},
addTableConf: {
},
//
ableAll: {
},
tableRows: {
},
Vmodel: "",
currVmodel: "",
dataForm: {
firstSubject: undefined,
isExclusive: undefined,
mouth: undefined,
subjects: undefined,
mouthAmount: undefined,
settlementAmount: undefined,
rateAmount: undefined,
version: 0,
type: "2",
},
tableRequiredData: {},
dataRule:
{
firstSubject: [
{
required: true,
message: '请输入',
trigger: 'blur'
},
],
},
isExclusiveOptions: [{ "fullName": "是", "id": "1" }, { "fullName": "不是", "id": "2" }],
isExclusiveProps: { "label": "fullName", "value": "id" },
childIndex: -1,
isEdit: false,
interfaceRes: {
firstSubject: [],
isExclusive: [],
mouth: [],
subjects: [],
mouthAmount: [],
settlementAmount: [],
rateAmount: [],
},
}
},
computed: {
...mapGetters(['userInfo'])
},
watch: {},
created() {
this.dataAll()
this.initDefaultData()
this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
},
mounted() { },
methods: {
prev() {
this.index--
if (this.index === 0) {
this.prevDis = true
}
this.nextDis = false
for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index];
if (this.index == index) {
this.getInfo(element.id)
}
}
},
next() {
this.index++
if (this.index === this.allList.length - 1) {
this.nextDis = true
}
this.prevDis = false
for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index];
if (this.index == index) {
this.getInfo(element.id)
}
}
},
getInfo(id) {
request({
url: '/api/scm/SubjectBasicExclusive/' + id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
});
},
goBack() {
this.visible = false
this.$emit('refreshDataList', true)
},
changeData(model, index) {
this.isEdit = false
this.childIndex = index
let modelAll = model.split("-");
let faceMode = "";
for (let i = 0; i < modelAll.length; i++) {
faceMode += modelAll[i];
}
for (let key in this.interfaceRes) {
if (key != faceMode) {
let faceReList = this.interfaceRes[key]
for (let i = 0; i < faceReList.length; i++) {
if (faceReList[i].relationField == model) {
let options = 'get' + key + 'Options';
if (this[options]) {
this[options]()
}
this.changeData(key, index)
}
}
}
}
},
changeDataFormData(type, data, model, index, defaultValue) {
if (!this.isEdit) {
if (type == 2) {
for (let i = 0; i < this.dataForm[data].length; i++) {
if (index == -1) {
this.dataForm[data][i][model] = defaultValue
} else if (index == i) {
this.dataForm[data][i][model] = defaultValue
}
}
} else {
this.dataForm[data] = defaultValue
}
}
},
dataAll() {
},
goBack() {
this.$emit('refresh')
},
clearData() {
this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
},
init(id, isDetail, allList) {
this.prevDis = false
this.nextDis = false
this.allList = allList || []
if (allList.length) {
this.index = this.allList.findIndex(item => item.id === id)
if (this.index == 0) {
this.prevDis = true
}
if (this.index == this.allList.length - 1) {
this.nextDis = true
}
} else {
this.prevDis = true
this.nextDis = true
}
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if (this.dataForm.id) {
this.loading = true
request({
url: '/api/scm/SubjectBasicExclusive/' + this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
this.loading = false
});
} else {
this.clearData()
this.initDefaultData()
}
});
this.$store.commit('generator/UPDATE_RELATION_DATA', {})
},
//
initDefaultData() {
},
//
dataFormSubmit(type) {
this.dataFormSubmitType = type ? type : 0
this.$refs['formRef'].validate((valid) => {
if (valid) {
this.request()
}
})
},
request() {
let _data = this.dataList()
if (this.dataFormSubmitType == 2) {
this.continueBtnLoading = true
} else {
this.btnLoading = true
}
if (!this.dataForm.id) {
request({
url: '/api/scm/SubjectBasicExclusive',
method: 'post',
data: _data
}).then((res) => {
this.$message({
message: res.msg,
type: 'success',
duration: 1000,
onClose: () => {
if (this.dataFormSubmitType == 2) {
this.$nextTick(() => {
this.clearData()
this.initDefaultData()
})
this.continueBtnLoading = false
return
}
this.visible = false
this.btnLoading = false
this.$emit('refresh', true)
}
})
}).catch(() => {
this.btnLoading = false
this.continueBtnLoading = false
})
} else {
request({
url: '/api/scm/SubjectBasicExclusive/' + this.dataForm.id,
method: 'PUT',
data: _data
}).then((res) => {
this.$message({
message: res.msg,
type: 'success',
duration: 1000,
onClose: () => {
if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
this.visible = false
this.btnLoading = false
this.$emit('refresh', true)
}
})
}).catch(() => {
this.btnLoading = false
this.continueBtnLoading = false
})
}
},
openSelectDialog(key) {
this.currTableConf = this.addTableConf[key]
this.currVmodel = key
this.selectDialogVisible = true
this.$nextTick(() => {
this.$refs.selectDialog.init()
})
},
addForSelect(data) {
for (let i = 0; i < data.length; i++) {
let t = data[i]
if (this['get' + this.currVmodel]) {
this['get' + this.currVmodel](t)
}
}
},
dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
let timeDataValue = null;
let timeValue = Number(timeValueData)
if (timeRule) {
if (timeType == 1) {
timeDataValue = timeValue
} else if (timeType == 2) {
timeDataValue = dataValue
} else if (timeType == 3) {
timeDataValue = new Date().getTime()
} else if (timeType == 4) {
let previousDate = '';
if (timeTarget == 1 || timeTarget == 2) {
previousDate = getDateDay(timeTarget, timeType, timeValue)
timeDataValue = new Date(previousDate).getTime()
} else if (timeTarget == 3) {
previousDate = getBeforeData(timeValue)
timeDataValue = new Date(previousDate).getTime()
} else {
timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
}
} else if (timeType == 5) {
let previousDate = '';
if (timeTarget == 1 || timeTarget == 2) {
previousDate = getDateDay(timeTarget, timeType, timeValue)
timeDataValue = new Date(previousDate).getTime()
} else if (timeTarget == 3) {
previousDate = getLaterData(timeValue)
timeDataValue = new Date(previousDate).getTime()
} else {
timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
}
}
}
return timeDataValue;
},
time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
let timeDataValue = null
if (timeRule) {
if (timeType == 1) {
timeDataValue = timeValue || '00:00:00'
if (timeDataValue.split(':').length == 3) {
timeDataValue = timeDataValue
} else {
timeDataValue = timeDataValue + ':00'
}
} else if (timeType == 2) {
timeDataValue = dataValue
} else if (timeType == 3) {
timeDataValue = this.jnpf.toDate(new Date(), format)
} else if (timeType == 4) {
let previousDate = '';
previousDate = getBeforeTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
} else if (timeType == 5) {
let previousDate = '';
previousDate = getLaterTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
}
}
return timeDataValue;
},
dataList() {
var _data = this.dataForm;
return _data;
},
dataInfo(dataAll) {
let _dataAll = dataAll
this.dataForm = _dataAll
this.isEdit = true
this.dataAll()
this.childIndex = -1
},
},
}
</script>

@ -0,0 +1,464 @@
<template>
<div class="JNPF-common-layout">
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="月份">
<JnpfDateRangePicker v-model="query.mouth" format="yyyy-MM" startPlaceholder="开始日期"
endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="客户名称">
<el-input v-model="query.firstSubject" 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>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
</el-form-item>
</el-col>
</el-form>
</el-row>
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出
</el-button>
</div>
<div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true">
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@click="openSuperQuery()" />
</el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
</el-tooltip>
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange" :span-method="arraySpanMethod" custom-column
show-summary :summary-method="getTableSummaries" border>
<el-table-column prop="firstSubject" label="客户名称" align="center" width="260px">
</el-table-column>
<el-table-column label="是否为独家供应" prop="isExclusive" align="center" width="180px">
<template slot-scope="scope">
{{ scope.row.isExclusive}}
</template>
</el-table-column>
<el-table-column prop="mouth" label="月份" align="center">
</el-table-column>
<el-table-column prop="subjects" label="主要合作商名称" align="center" width="260px">
</el-table-column>
<el-table-column prop="mouthAmount" label="客户月采购金额" align="center" width="260px">
</el-table-column>
<el-table-column prop="settlementAmount" label="本月我公司月销售金额" align="center" width="260px">
</el-table-column>
<el-table-column prop="rateAmount" label="我公司月销售金额占比" align="center" width="260px">
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">
</el-button>
<el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'"
@click="handleDel(scope.row.id)">删除
</el-button>
<el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">
</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage"
:limit.sync="listQuery.pageSize" @pagination="initData" />
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
@close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
</div>
</template>
<script>
import request from '@/utils/request'
import { mapGetters } from "vuex";
import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
import JNPFForm from './form'
import Detail from './Detail'
import ExportBox from '@/components/ExportBox'
import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getConfigData } from '@/api/onlineDev/visualDev'
import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user'
import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize'
import columnList from './columnList'
import { thousandsFormat } from "@/components/Generator/utils/index"
import SuperQuery from '@/components/SuperQuery'
import superQueryJson from './superQueryJson'
export default {
components: {
JNPFForm,
Detail,
ExportBox, ToFormDetail, SuperQuery
},
data() {
return {
keyword: '',
expandsTree: true,
refreshTree: true,
toFormDetailVisible: false,
expandObj: {},
columnOptions: [],
mergeList: [],
exportList: [],
columnList,
superQueryVisible: false,
superQueryJson,
uploadBoxVisible: false,
detailVisible: false,
query: {
mouth: undefined,
firstSubject: undefined,
type: undefined,
},
treeProps: {
children: 'children',
label: 'fullName',
value: 'id',
isLeaf: 'isLeaf'
},
list: [],
listLoading: true,
total: 0,
queryData: {},
listQuery: {
superQueryJson: '',
currentPage: 1,
pageSize: 20,
sort: "desc",
sidx: "",
},
formVisible: false,
flowVisible: false,
flowListVisible: false,
flowList: [],
exportBoxVisible: false,
isExclusiveOptions: [{ "fullName": "是", "id": "1" }, { "fullName": "不是", "id": "2" }],
isExclusiveProps: { "label": "fullName", "value": "id" },
interfaceRes: {
},
}
},
computed: {
...mapGetters(['userInfo']),
menuId() {
return this.$route.meta.modelId || ''
}
},
created() {
this.getColumnList(),
this.initSearchDataAndListData()
this.queryData = JSON.parse(JSON.stringify(this.query))
},
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData)
formData.popupType = 'general'
this.toFormDetailVisible = true
this.$nextTick(() => {
this.$refs.toFormDetail.init(formData, modelId, defaultValue)
})
})
},
toggleTreeExpand(expands) {
this.refreshTree = false
this.expandsTree = expands
this.$nextTick(() => {
this.refreshTree = true
this.$nextTick(() => {
this.$refs.treeBox.setCurrentKey(null)
})
})
},
filterNode(value, data) {
if (!value) return true;
return data[this.treeProps.label].indexOf(value) !== -1;
},
loadNode(node, resolve) {
const nodeData = node.data
const config = {
treeInterfaceId: "",
treeTemplateJson: []
}
if (config.treeInterfaceId) {
//
if (config.treeTemplateJson && config.treeTemplateJson.length) {
for (let i = 0; i < config.treeTemplateJson.length; i++) {
const element = config.treeTemplateJson[i];
element.defaultValue = nodeData[element.relationField] || ''
}
}
//
let query = {
paramList: config.treeTemplateJson || [],
}
//
getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
let data = res.data
if (Array.isArray(data)) {
resolve(data);
} else {
resolve([]);
}
})
}
},
getColumnList() {
//
this.columnOptions = this.transformColumnList(this.columnList)
},
transformColumnList(columnList) {
let list = []
for (let i = 0; i < columnList.length; i++) {
const e = columnList[i];
if (!e.prop.includes('-')) {
list.push(e)
} else {
let prop = e.prop.split('-')[0]
let label = e.label.split('-')[0]
let vModel = e.prop.split('-')[1]
let newItem = {
align: "center",
jnpfKey: "table",
prop,
label,
children: []
}
e.vModel = vModel
if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
if (!list.some(o => o.prop === prop)) list.push(newItem)
for (let i = 0; i < list.length; i++) {
if (list[i].prop === prop) {
list[i].children.push(e)
break
}
}
}
}
this.getMergeList(list)
this.getExportList(list)
return list
},
arraySpanMethod({ column }) {
for (let i = 0; i < this.mergeList.length; i++) {
if (column.property == this.mergeList[i].prop) {
return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
}
}
},
getMergeList(list) {
let newList = JSON.parse(JSON.stringify(list))
newList.forEach(item => {
if (item.children && item.children.length) {
let child = {
prop: item.prop + '-child-first'
}
item.children.unshift(child)
}
})
newList.forEach(item => {
if (item.children && item.children.length) {
item.children.forEach((child, index) => {
if (index == 0) {
this.mergeList.push({
prop: child.prop,
rowspan: 1,
colspan: item.children.length
})
} else {
this.mergeList.push({
prop: child.prop,
rowspan: 0,
colspan: 0
})
}
})
} else {
this.mergeList.push({
prop: item.prop,
rowspan: 1,
colspan: 1
})
}
})
},
getExportList(list) {
let exportList = []
for (let i = 0; i < list.length; i++) {
if (list[i].jnpfKey === 'table') {
for (let j = 0; j < list[i].children.length; j++) {
exportList.push(list[i].children[j])
}
} else {
exportList.push(list[i])
}
}
this.exportList = exportList
},
goDetail(id) {
this.detailVisible = true
this.$nextTick(() => {
this.$refs.Detail.init(id)
})
},
sortChange({ column, prop, order }) {
this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
this.listQuery.sidx = !order ? '' : prop
this.initData()
},
async initSearchDataAndListData() {
await this.initSearchData()
this.initData()
},
//
async initSearchData() {
},
initData() {
this.listLoading = true;
let _query = {
...this.listQuery,
...this.query,
keyword: this.keyword,
dataType: 0,
menuId: this.menuId,
moduleId: '588331783775367173',
type: 2,
};
request({
url: `/api/scm/SubjectBasicExclusive/getList`,
method: 'post',
data: _query
}).then(res => {
var _list = res.data.list;
this.list = _list.map(o => ({
...o,
...this.expandObj,
}))
this.total = res.data.pagination.total
this.listLoading = false
})
},
handleDel(id) {
this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
type: 'warning'
}).then(() => {
request({
url: `/api/scm/SubjectBasicExclusive/${id}`,
method: 'DELETE'
}).then(res => {
this.$message({
type: 'success',
message: res.msg,
onClose: () => {
this.initData()
}
});
})
}).catch(() => {
});
},
handelUpload() {
this.uploadBoxVisible = true
this.$nextTick(() => {
this.$refs.UploadBox.init("", "scm/SubjectBasicExclusive")
})
},
openSuperQuery() {
this.superQueryVisible = true
this.$nextTick(() => {
this.$refs.SuperQuery.init()
})
},
superQuery(queryJson) {
this.listQuery.superQueryJson = queryJson
this.listQuery.currentPage = 1
this.initData()
},
addOrUpdateHandle(row, isDetail) {
let id = row ? row.id : ""
this.formVisible = true
this.$nextTick(() => {
this.$refs.JNPFForm.init(id, isDetail, this.list)
})
},
exportData() {
this.exportBoxVisible = true
this.$nextTick(() => {
this.$refs.ExportBox.init(this.exportList)
})
},
download(data) {
let query = { ...data, ...this.listQuery, ...this.query, menuId: this.menuId }
request({
url: `/api/scm/SubjectBasicExclusive/Actions/Export`,
method: 'post',
data: query
}).then(res => {
if (!res.data.url) return
this.jnpf.downloadFile(res.data.url)
this.$refs.ExportBox.visible = false
this.exportBoxVisible = false
})
},
search() {
this.listQuery.currentPage = 1
this.listQuery.pageSize = 20
this.listQuery.sort = "desc"
this.listQuery.sidx = ""
this.initData()
},
refresh(isrRefresh) {
this.formVisible = false
if (isrRefresh) this.reset()
},
reset() {
this.query = JSON.parse(JSON.stringify(this.queryData))
this.search()
},
colseFlow(isrRefresh) {
this.flowVisible = false
if (isrRefresh) this.reset()
},
}
}
</script>

@ -0,0 +1,141 @@
<template>
<transition name="el-zoom-in-center">
<div class="JNPF-preview-main">
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
<div class="JNPF-common-page-header">
<el-page-header @back="goBack"
content="详情"/>
<div class="options">
<el-button @click="goBack"> </el-button>
</div>
</div>
<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right" >
<template v-if="!loading">
<el-col :span="8" >
<jnpf-form-tip-item label="一级供应商"
prop="firstSubject" >
<p>{{dataForm.firstSubject}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="是否为独家采购" label-width="120px"
prop="isExclusive" >
<p>{{ dataForm.isExclusive }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="月份"
prop="mouth" >
<p>{{dataForm.mouth}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="一级供应商主要客户名称"
prop="subjects" >
<p>{{dataForm.subjects}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="一级供应商月开票金额"
prop="mouthAmount" >
<p>{{dataForm.mouthAmount}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="一级供应商月结算金额"
prop="settlementAmount" >
<p>{{dataForm.settlementAmount}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="我公司月采购金额占比"
prop="rateAmount" >
<p>{{dataForm.rateAmount}}</p>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-row>
</div>
</transition>
</template>
<script>
import request from '@/utils/request'
import { getConfigData } from '@/api/onlineDev/visualDev'
import jnpf from '@/utils/jnpf'
import Detail from '@/views/basic/dynamicModel/list/detail'
import { thousandsFormat } from "@/components/Generator/utils/index"
export default {
components: { Detail},
props: [],
data() {
return {
visible: false,
detailVisible: false,
loading: false,
dataForm: {
id :'',
firstSubject : '',
isExclusive : '',
mouth : '',
subjects : '',
mouthAmount : '',
settlementAmount : '',
rateAmount : '',
},
isExclusiveOptions:[{"fullName":"是","id":"1"},{"fullName":"不是","id":"2"}],
isExclusiveProps:{"label":"fullName","value":"id" },
}
},
computed: {},
watch: {},
created() {
},
mounted() {},
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData)
formData.popupType = 'general'
this.detailVisible = true
this.$nextTick(() => {
this.$refs.Detail.init(formData, modelId, defaultValue)
})
})
},
dataInfo(dataAll){
let _dataAll =dataAll
this.dataForm = _dataAll
},
goBack() {
this.$emit('refresh')
},
init(id) {
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if(this.dataForm.id){
this.loading = true
request({
url: '/api/scm/SubjectBasicExclusive/detail/'+this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
this.loading = false
})
}
})
},
},
}
</script>

@ -0,0 +1,473 @@
<template>
<transition name="el-zoom-in-center">
<div class="JNPF-preview-main">
<div class="JNPF-common-page-header">
<el-page-header @back="goBack" :content="!dataForm.id ? '新建':'编辑'" />
<div class="options">
<el-dropdown class="dropdown" placement="bottom">
<el-button style="width:70px">
<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
<el-dropdown-menu slot="dropdown">
<template v-if="dataForm.id">
<el-dropdown-item @click.native="prev" :disabled='prevDis'>
{{'上一条'}}
</el-dropdown-item>
<el-dropdown-item @click.native="next" :disabled='nextDis'>
{{'下一条'}}
</el-dropdown-item>
</template>
<el-dropdown-item type="primary" @click.native="dataFormSubmit(2)"
:loading="continueBtnLoading" :disabled='btnLoading'>
{{!dataForm.id ?'确定并新增':'确定并继续'}}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading"
:disabled='continueBtnLoading'> </el-button>
<el-button @click="goBack"> </el-button>
</div>
</div>
<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
<el-form ref="formRef" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
label-position="right">
<template v-if="!loading">
<!-- 具体表单 -->
<el-col :span="8">
<jnpf-form-tip-item label="一级供应商名称" prop="firstSubject">
<JnpfInput v-model="dataForm.firstSubject" @change="changeData('firstSubject',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="是否为独家采购" label-width="120px" prop="isExclusive">
<JnpfRadio v-model="dataForm.isExclusive" @change="changeData('isExclusive',-1)"
optionType="button" direction="horizontal" size="medium"
:options="isExclusiveOptions" :props="isExclusiveProps">
</JnpfRadio>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="月份" prop="mouth">
<JnpfDatePicker v-model="dataForm.mouth" @change="changeData('mouth',-1)"
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')"
placeholder="请选择" clearable :style='{"width":"100%"}' type="month"
format="yyyy-MM">
</JnpfDatePicker>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="一级供应商主要客户名称" prop="subjects">
<JnpfInput v-model="dataForm.subjects" @change="changeData('subjects',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="一级供应商月开票金额" prop="mouthAmount">
<JnpfInput v-model="dataForm.mouthAmount" @change="changeData('mouthAmount',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="本月我公司采购金额" prop="settlementAmount">
<JnpfInput v-model="dataForm.settlementAmount"
@change="changeData('settlementAmount',-1)" placeholder="请输入" clearable
:style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="我公司月采购金额占比" prop="rateAmount">
<JnpfInput v-model="dataForm.rateAmount" @change="changeData('rateAmount',-1)"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</JnpfInput>
</jnpf-form-tip-item>
</el-col>
<!-- 表单结束 -->
</template>
</el-form>
<SelectDialog v-if="selectDialogVisible" :config="currTableConf" :formData="dataForm"
ref="selectDialog" @select="addForSelect" @close="selectDialogVisible=false" />
</el-row>
</div>
</transition>
</template>
<script>
import request from '@/utils/request'
import { mapGetters } from "vuex";
import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
import { getDefaultCurrentValueUserId } from '@/api/permission/user'
import { getDefaultCurrentValueDepartmentId } from '@/api/permission/organize'
import { getDateDay, getLaterData, getBeforeData, getBeforeTime, getLaterTime } from '@/components/Generator/utils/index.js'
import { thousandsFormat } from "@/components/Generator/utils/index"
export default {
components: {},
props: [],
data() {
return {
dataFormSubmitType: 0,
continueBtnLoading: false,
index: 0,
prevDis: false,
nextDis: false,
allList: [],
visible: false,
loading: false,
btnLoading: false,
formRef: 'formRef',
setting: {},
eventType: '',
userBoxVisible: false,
selectDialogVisible: false,
currTableConf: {},
dataValueAll: {},
addTableConf: {
},
//
ableAll: {
},
tableRows: {
},
Vmodel: "",
currVmodel: "",
dataForm: {
firstSubject: undefined,
isExclusive: undefined,
mouth: undefined,
subjects: undefined,
mouthAmount: undefined,
settlementAmount: undefined,
rateAmount: undefined,
version: 0,
type: "1",
},
tableRequiredData: {},
dataRule:
{
firstSubject: [
{
required: true,
message: '请输入',
trigger: 'blur'
},
],
},
isExclusiveOptions: [{ "fullName": "是", "id": "1" }, { "fullName": "不是", "id": "2" }],
isExclusiveProps: { "label": "fullName", "value": "id" },
childIndex: -1,
isEdit: false,
interfaceRes: {
firstSubject: [],
isExclusive: [],
mouth: [],
subjects: [],
mouthAmount: [],
settlementAmount: [],
rateAmount: [],
},
}
},
computed: {
...mapGetters(['userInfo'])
},
watch: {},
created() {
this.dataAll()
this.initDefaultData()
this.dataValueAll = JSON.parse(JSON.stringify(this.dataForm))
},
mounted() { },
methods: {
prev() {
this.index--
if (this.index === 0) {
this.prevDis = true
}
this.nextDis = false
for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index];
if (this.index == index) {
this.getInfo(element.id)
}
}
},
next() {
this.index++
if (this.index === this.allList.length - 1) {
this.nextDis = true
}
this.prevDis = false
for (let index = 0; index < this.allList.length; index++) {
const element = this.allList[index];
if (this.index == index) {
this.getInfo(element.id)
}
}
},
getInfo(id) {
request({
url: '/api/scm/SubjectBasicExclusive/' + id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
});
},
goBack() {
this.visible = false
this.$emit('refreshDataList', true)
},
changeData(model, index) {
this.isEdit = false
this.childIndex = index
let modelAll = model.split("-");
let faceMode = "";
for (let i = 0; i < modelAll.length; i++) {
faceMode += modelAll[i];
}
for (let key in this.interfaceRes) {
if (key != faceMode) {
let faceReList = this.interfaceRes[key]
for (let i = 0; i < faceReList.length; i++) {
if (faceReList[i].relationField == model) {
let options = 'get' + key + 'Options';
if (this[options]) {
this[options]()
}
this.changeData(key, index)
}
}
}
}
},
changeDataFormData(type, data, model, index, defaultValue) {
if (!this.isEdit) {
if (type == 2) {
for (let i = 0; i < this.dataForm[data].length; i++) {
if (index == -1) {
this.dataForm[data][i][model] = defaultValue
} else if (index == i) {
this.dataForm[data][i][model] = defaultValue
}
}
} else {
this.dataForm[data] = defaultValue
}
}
},
dataAll() {
},
goBack() {
this.$emit('refresh')
},
clearData() {
this.dataForm = JSON.parse(JSON.stringify(this.dataValueAll))
},
init(id, isDetail, allList) {
this.prevDis = false
this.nextDis = false
this.allList = allList || []
if (allList.length) {
this.index = this.allList.findIndex(item => item.id === id)
if (this.index == 0) {
this.prevDis = true
}
if (this.index == this.allList.length - 1) {
this.nextDis = true
}
} else {
this.prevDis = true
this.nextDis = true
}
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if (this.dataForm.id) {
this.loading = true
request({
url: '/api/scm/SubjectBasicExclusive/' + this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
this.loading = false
});
} else {
this.clearData()
this.initDefaultData()
}
});
this.$store.commit('generator/UPDATE_RELATION_DATA', {})
},
//
initDefaultData() {
},
//
dataFormSubmit(type) {
this.dataFormSubmitType = type ? type : 0
this.$refs['formRef'].validate((valid) => {
if (valid) {
this.request()
}
})
},
request() {
let _data = this.dataList()
if (this.dataFormSubmitType == 2) {
this.continueBtnLoading = true
} else {
this.btnLoading = true
}
if (!this.dataForm.id) {
request({
url: '/api/scm/SubjectBasicExclusive',
method: 'post',
data: _data
}).then((res) => {
this.$message({
message: res.msg,
type: 'success',
duration: 1000,
onClose: () => {
if (this.dataFormSubmitType == 2) {
this.$nextTick(() => {
this.clearData()
this.initDefaultData()
})
this.continueBtnLoading = false
return
}
this.visible = false
this.btnLoading = false
this.$emit('refresh', true)
}
})
}).catch(() => {
this.btnLoading = false
this.continueBtnLoading = false
})
} else {
request({
url: '/api/scm/SubjectBasicExclusive/' + this.dataForm.id,
method: 'PUT',
data: _data
}).then((res) => {
this.$message({
message: res.msg,
type: 'success',
duration: 1000,
onClose: () => {
if (this.dataFormSubmitType == 2) return this.continueBtnLoading = false
this.visible = false
this.btnLoading = false
this.$emit('refresh', true)
}
})
}).catch(() => {
this.btnLoading = false
this.continueBtnLoading = false
})
}
},
openSelectDialog(key) {
this.currTableConf = this.addTableConf[key]
this.currVmodel = key
this.selectDialogVisible = true
this.$nextTick(() => {
this.$refs.selectDialog.init()
})
},
addForSelect(data) {
for (let i = 0; i < data.length; i++) {
let t = data[i]
if (this['get' + this.currVmodel]) {
this['get' + this.currVmodel](t)
}
}
},
dateTime(timeRule, timeType, timeTarget, timeValueData, dataValue) {
let timeDataValue = null;
let timeValue = Number(timeValueData)
if (timeRule) {
if (timeType == 1) {
timeDataValue = timeValue
} else if (timeType == 2) {
timeDataValue = dataValue
} else if (timeType == 3) {
timeDataValue = new Date().getTime()
} else if (timeType == 4) {
let previousDate = '';
if (timeTarget == 1 || timeTarget == 2) {
previousDate = getDateDay(timeTarget, timeType, timeValue)
timeDataValue = new Date(previousDate).getTime()
} else if (timeTarget == 3) {
previousDate = getBeforeData(timeValue)
timeDataValue = new Date(previousDate).getTime()
} else {
timeDataValue = getBeforeTime(timeTarget, timeValue).getTime()
}
} else if (timeType == 5) {
let previousDate = '';
if (timeTarget == 1 || timeTarget == 2) {
previousDate = getDateDay(timeTarget, timeType, timeValue)
timeDataValue = new Date(previousDate).getTime()
} else if (timeTarget == 3) {
previousDate = getLaterData(timeValue)
timeDataValue = new Date(previousDate).getTime()
} else {
timeDataValue = getLaterTime(timeTarget, timeValue).getTime()
}
}
}
return timeDataValue;
},
time(timeRule, timeType, timeTarget, timeValue, formatType, dataValue) {
let format = formatType == 'HH:mm' ? 'HH:mm:00' : formatType
let timeDataValue = null
if (timeRule) {
if (timeType == 1) {
timeDataValue = timeValue || '00:00:00'
if (timeDataValue.split(':').length == 3) {
timeDataValue = timeDataValue
} else {
timeDataValue = timeDataValue + ':00'
}
} else if (timeType == 2) {
timeDataValue = dataValue
} else if (timeType == 3) {
timeDataValue = this.jnpf.toDate(new Date(), format)
} else if (timeType == 4) {
let previousDate = '';
previousDate = getBeforeTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
} else if (timeType == 5) {
let previousDate = '';
previousDate = getLaterTime(timeTarget, timeValue)
timeDataValue = this.jnpf.toDate(previousDate, format)
}
}
return timeDataValue;
},
dataList() {
var _data = this.dataForm;
return _data;
},
dataInfo(dataAll) {
let _dataAll = dataAll
this.dataForm = _dataAll
this.isEdit = true
this.dataAll()
this.childIndex = -1
},
},
}
</script>

@ -0,0 +1,461 @@
<template>
<div class="JNPF-common-layout">
<div class="JNPF-common-layout-center">
<el-row class="JNPF-common-search-box" :gutter="16">
<el-form @submit.native.prevent>
<el-col :span="6">
<el-form-item label="月份">
<JnpfDateRangePicker v-model="query.mouth" format="yyyy-MM" startPlaceholder="开始日期"
endPlaceholder="结束日期">
</JnpfDateRangePicker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="一级供应商">
<el-input v-model="query.firstSubject" 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>
<el-button icon="el-icon-refresh-right" @click="reset()"></el-button>
</el-form-item>
</el-col>
</el-form>
</el-row>
<div class="JNPF-common-layout-main JNPF-flex-main">
<div class="JNPF-common-head">
<div>
<el-button type="primary" icon="icon-ym icon-ym-btn-add" v-has="'btn_add'"
@click="addOrUpdateHandle()">新增
</el-button>
<el-button type="text" icon="icon-ym icon-ym-btn-download" @click="exportData()"
v-has="'btn_download'">导出
</el-button>
</div>
<div class="JNPF-common-head-right">
<el-tooltip content="高级查询" placement="top" v-if="true">
<el-link icon="icon-ym icon-ym-filter JNPF-common-head-icon" :underline="false"
@click="openSuperQuery()" />
</el-tooltip>
<el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
<el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
@click="initData()" />
</el-tooltip>
</div>
</div>
<JNPF-table v-loading="listLoading" :data="list" @sort-change='sortChange' has-c
@selection-change="handleSelectionChange" :span-method="arraySpanMethod" custom-column
show-summary :summary-method="getTableSummaries" border>
<el-table-column prop="firstSubject" label="供应商" align="center" width="260px">
</el-table-column>
<el-table-column label="是否为独家采购" prop="isExclusive" align="center" width="180px">
<template slot-scope="scope">
{{ scope.row.isExclusive}}
</template>
</el-table-column>
<el-table-column prop="mouth" label="月份" align="center">
</el-table-column>
<el-table-column prop="subjects" label="一级供应商主要客户名称" align="center" width="260px">
</el-table-column>
<el-table-column prop="mouthAmount" label="一级供应商月开票金额" align="center" width="260px">
</el-table-column>
<el-table-column prop="settlementAmount" label="本月我公司采购金额" align="center" width="260px">
</el-table-column>
<el-table-column prop="rateAmount" label="我公司月采购金额占比" align="center" width="260px">
</el-table-column>
<el-table-column label="操作" fixed="right" width="150">
<template slot-scope="scope">
<el-button type="text" @click="addOrUpdateHandle(scope.row)" v-has="'btn_edit'">
</el-button>
<el-button type="text" class="JNPF-table-delBtn" v-has="'btn_remove'"
@click="handleDel(scope.row.id)">删除
</el-button>
<el-button type="text" v-has="'btn_detail'" @click="goDetail(scope.row.id)">
</el-button>
</template>
</el-table-column>
</JNPF-table>
<pagination :total="total" :page.sync="listQuery.currentPage"
:limit.sync="listQuery.pageSize" @pagination="initData" />
</div>
</div>
<JNPF-Form v-if="formVisible" ref="JNPFForm" @refresh="refresh" />
<ExportBox v-if="exportBoxVisible" ref="ExportBox" @download="download" />
<ImportBox v-if="uploadBoxVisible" ref="UploadBox" @refresh="initData" />
<Detail v-if="detailVisible" ref="Detail" @refresh="detailVisible=false" />
<ToFormDetail v-if="toFormDetailVisible" ref="toFormDetail"
@close="toFormDetailVisible = false" />
<SuperQuery v-if="superQueryVisible" ref="SuperQuery" :columnOptions="superQueryJson"
@superQuery="superQuery" />
</div>
</template>
<script>
import request from '@/utils/request'
import { mapGetters } from "vuex";
import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
import JNPFForm from './form'
import Detail from './Detail'
import ExportBox from '@/components/ExportBox'
import ToFormDetail from '@/views/basic/dynamicModel/list/detail'
import { getDataInterfaceRes } from '@/api/systemData/dataInterface'
import { getConfigData } from '@/api/onlineDev/visualDev'
import { getDefaultCurrentValueUserIdAsync } from '@/api/permission/user'
import { getDefaultCurrentValueDepartmentIdAsync } from '@/api/permission/organize'
import columnList from './columnList'
import { thousandsFormat } from "@/components/Generator/utils/index"
import SuperQuery from '@/components/SuperQuery'
import superQueryJson from './superQueryJson'
export default {
components: {
JNPFForm,
Detail,
ExportBox, ToFormDetail, SuperQuery
},
data() {
return {
keyword: '',
expandsTree: true,
refreshTree: true,
toFormDetailVisible: false,
expandObj: {},
columnOptions: [],
mergeList: [],
exportList: [],
columnList,
superQueryVisible: false,
superQueryJson,
uploadBoxVisible: false,
detailVisible: false,
query: {
mouth: undefined,
firstSubject: undefined,
type: 1,
},
treeProps: {
children: 'children',
label: 'fullName',
value: 'id',
isLeaf: 'isLeaf'
},
list: [],
listLoading: true,
total: 0,
queryData: {},
listQuery: {
superQueryJson: '',
currentPage: 1,
pageSize: 20,
sort: "desc",
sidx: "",
},
formVisible: false,
flowVisible: false,
flowListVisible: false,
flowList: [],
exportBoxVisible: false,
isExclusiveOptions: [{ "fullName": "是", "id": "1" }, { "fullName": "不是", "id": "2" }],
isExclusiveProps: { "label": "fullName", "value": "id" },
interfaceRes: {
},
}
},
computed: {
...mapGetters(['userInfo']),
menuId() {
return this.$route.meta.modelId || ''
}
},
created() {
this.getColumnList(),
this.initSearchDataAndListData()
this.queryData = JSON.parse(JSON.stringify(this.query))
},
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData)
formData.popupType = 'general'
this.toFormDetailVisible = true
this.$nextTick(() => {
this.$refs.toFormDetail.init(formData, modelId, defaultValue)
})
})
},
toggleTreeExpand(expands) {
this.refreshTree = false
this.expandsTree = expands
this.$nextTick(() => {
this.refreshTree = true
this.$nextTick(() => {
this.$refs.treeBox.setCurrentKey(null)
})
})
},
filterNode(value, data) {
if (!value) return true;
return data[this.treeProps.label].indexOf(value) !== -1;
},
loadNode(node, resolve) {
const nodeData = node.data
const config = {
treeInterfaceId: "",
treeTemplateJson: []
}
if (config.treeInterfaceId) {
//
if (config.treeTemplateJson && config.treeTemplateJson.length) {
for (let i = 0; i < config.treeTemplateJson.length; i++) {
const element = config.treeTemplateJson[i];
element.defaultValue = nodeData[element.relationField] || ''
}
}
//
let query = {
paramList: config.treeTemplateJson || [],
}
//
getDataInterfaceRes(config.treeInterfaceId, query).then(res => {
let data = res.data
if (Array.isArray(data)) {
resolve(data);
} else {
resolve([]);
}
})
}
},
getColumnList() {
//
this.columnOptions = this.transformColumnList(this.columnList)
},
transformColumnList(columnList) {
let list = []
for (let i = 0; i < columnList.length; i++) {
const e = columnList[i];
if (!e.prop.includes('-')) {
list.push(e)
} else {
let prop = e.prop.split('-')[0]
let label = e.label.split('-')[0]
let vModel = e.prop.split('-')[1]
let newItem = {
align: "center",
jnpfKey: "table",
prop,
label,
children: []
}
e.vModel = vModel
if (!this.expandObj.hasOwnProperty(`${prop}Expand`)) this.$set(this.expandObj, `${prop}Expand`, false)
if (!list.some(o => o.prop === prop)) list.push(newItem)
for (let i = 0; i < list.length; i++) {
if (list[i].prop === prop) {
list[i].children.push(e)
break
}
}
}
}
this.getMergeList(list)
this.getExportList(list)
return list
},
arraySpanMethod({ column }) {
for (let i = 0; i < this.mergeList.length; i++) {
if (column.property == this.mergeList[i].prop) {
return [this.mergeList[i].rowspan, this.mergeList[i].colspan]
}
}
},
getMergeList(list) {
let newList = JSON.parse(JSON.stringify(list))
newList.forEach(item => {
if (item.children && item.children.length) {
let child = {
prop: item.prop + '-child-first'
}
item.children.unshift(child)
}
})
newList.forEach(item => {
if (item.children && item.children.length) {
item.children.forEach((child, index) => {
if (index == 0) {
this.mergeList.push({
prop: child.prop,
rowspan: 1,
colspan: item.children.length
})
} else {
this.mergeList.push({
prop: child.prop,
rowspan: 0,
colspan: 0
})
}
})
} else {
this.mergeList.push({
prop: item.prop,
rowspan: 1,
colspan: 1
})
}
})
},
getExportList(list) {
let exportList = []
for (let i = 0; i < list.length; i++) {
if (list[i].jnpfKey === 'table') {
for (let j = 0; j < list[i].children.length; j++) {
exportList.push(list[i].children[j])
}
} else {
exportList.push(list[i])
}
}
this.exportList = exportList
},
goDetail(id) {
this.detailVisible = true
this.$nextTick(() => {
this.$refs.Detail.init(id)
})
},
sortChange({ column, prop, order }) {
this.listQuery.sort = order == 'ascending' ? 'asc' : 'desc'
this.listQuery.sidx = !order ? '' : prop
this.initData()
},
async initSearchDataAndListData() {
await this.initSearchData()
this.initData()
},
//
async initSearchData() {
},
initData() {
this.listLoading = true;
let _query = {
...this.listQuery,
...this.query,
keyword: this.keyword,
dataType: 0,
menuId: this.menuId,
moduleId: '588331783775367173',
type: 1,
};
request({
url: `/api/scm/SubjectBasicExclusive/getList`,
method: 'post',
data: _query
}).then(res => {
var _list = res.data.list;
this.list = _list.map(o => ({
...o,
...this.expandObj,
}))
this.total = res.data.pagination.total
this.listLoading = false
})
},
handleDel(id) {
this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
type: 'warning'
}).then(() => {
request({
url: `/api/scm/SubjectBasicExclusive/${id}`,
method: 'DELETE'
}).then(res => {
this.$message({
type: 'success',
message: res.msg,
onClose: () => {
this.initData()
}
});
})
}).catch(() => {
});
},
handelUpload() {
this.uploadBoxVisible = true
this.$nextTick(() => {
this.$refs.UploadBox.init("", "scm/SubjectBasicExclusive")
})
},
openSuperQuery() {
this.superQueryVisible = true
this.$nextTick(() => {
this.$refs.SuperQuery.init()
})
},
superQuery(queryJson) {
this.listQuery.superQueryJson = queryJson
this.listQuery.currentPage = 1
this.initData()
},
addOrUpdateHandle(row, isDetail) {
let id = row ? row.id : ""
this.formVisible = true
this.$nextTick(() => {
this.$refs.JNPFForm.init(id, isDetail, this.list)
})
},
exportData() {
this.exportBoxVisible = true
this.$nextTick(() => {
this.$refs.ExportBox.init(this.exportList)
})
},
download(data) {
let query = { ...data, ...this.listQuery, ...this.query, menuId: this.menuId }
request({
url: `/api/scm/SubjectBasicExclusive/Actions/Export`,
method: 'post',
data: query
}).then(res => {
if (!res.data.url) return
this.jnpf.downloadFile(res.data.url)
this.$refs.ExportBox.visible = false
this.exportBoxVisible = false
})
},
search() {
this.listQuery.currentPage = 1
this.listQuery.pageSize = 20
this.listQuery.sort = "desc"
this.listQuery.sidx = ""
this.initData()
},
refresh(isrRefresh) {
this.formVisible = false
if (isrRefresh) this.reset()
},
reset() {
this.query = JSON.parse(JSON.stringify(this.queryData))
this.search()
},
colseFlow(isrRefresh) {
this.flowVisible = false
if (isrRefresh) this.reset()
},
}
}
</script>

@ -151,9 +151,9 @@
</el-button>
<el-button size="mini" type="text" :disabled="!scope.row.flowState"
@click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
<!-- <template v-if="scope.row.flowState == '2' && scope.row.erpMark != '200'">
<template v-if="scope.row.flowState == '2' && scope.row.erpMark != '200'">
<el-button size="mini" type="text" @click="repush(scope.row.id)"></el-button>
</template> -->
</template>
</template>
</el-table-column>
</JNPF-table>

@ -157,9 +157,9 @@
</el-button>
<el-button size="mini" type="text" :disabled="!scope.row.flowState"
@click="updateHandle(scope.row,scope.row.flowState)">详情</el-button>
<!-- <template v-if="scope.row.flowState == '2' && scope.row.erpMark != '200'">
<template v-if="scope.row.flowState == '2' && scope.row.erpMark != '200'">
<el-button size="mini" type="text" @click="repush(scope.row.id)"></el-button>
</template> -->
</template>
</template>
</el-table-column>
</JNPF-table>

@ -167,9 +167,9 @@
</el-button>
<el-button size="mini" type="text" :disabled="!scope.row.flowState"
@click="updateHandle(scope.row, scope.row.flowState)">详情</el-button>
<!-- <template v-if="scope.row.flowState == '2' && scope.row.erpMark != '200'">
<template v-if="scope.row.flowState == '2' && scope.row.erpMark != '200'">
<el-button size="mini" type="text" @click="repush(scope.row.id)"></el-button>
</template> -->
</template>
</template>
</el-table-column>
</JNPF-table>
@ -590,14 +590,6 @@ export default {
},
addOstarts(row, status) {
// if (row.erpMark != '200') {
// this.$message({
// type: 'error',
// message: '',
// duration: 1500,
// })
// return
// }
let id = row.id
this.$confirm("此操作将进行加工, 是否继续?", "提示", {
type: "warning",
@ -652,14 +644,6 @@ export default {
},
addOstartsRescind(row, status) {
// if (row.erpMark != '200') {
// this.$message({
// type: 'error',
// message: '',
// duration: 1500,
// })
// return
// }
let id = row.id
this.$confirm("此操作将进行取消加工, 是否继续?", "提示", {
type: "warning",
@ -703,14 +687,6 @@ export default {
},
addOrUpdateHandleOver(row, isDetail) {
// if (row.erpMark != '200') {
// this.$message({
// type: 'error',
// message: '',
// duration: 1500,
// })
// return
// }
let id = row ? row.id : ""
this.formVisibleOver = true
this.$nextTick(() => {

Loading…
Cancel
Save