product
杨世强 2 years ago
parent eb9d8fadff
commit 265d8a6d7f

@ -36,7 +36,6 @@ import jnpf.arinvoices.entity.ArinvoicesEntity;
import jnpf.arinvoices.service.ArinvoicesService;
import jnpf.arinvoices.entity.Arinvoices_item0Entity;
import jnpf.arinvoices.service.Arinvoices_item0Service;
import jnpf.arinvoices.service.SalesorderitemService;
import org.springframework.web.bind.annotation.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.multipart.MultipartFile;
@ -56,7 +55,7 @@ import jnpf.util.enums.FileTypeEnum;
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
* @ 2023-01-29
* @ 2023-01-30
*/
@Slf4j
@RestController
@ -79,8 +78,6 @@ public class ArinvoicesController {
@Autowired
private Arinvoices_item0Service arinvoices_item0Service;
@Autowired
private SalesorderitemService salesorderitemService;
/**
@ -97,10 +94,6 @@ public class ArinvoicesController {
}
List<ArinvoicesListVO> listVO=JsonUtil.getJsonToList(list,ArinvoicesListVO.class);
for(ArinvoicesListVO arinvoicesVO:listVO){
SalesorderitemEntity salesorderitemEntity = arinvoicesService.getSalesorderitem(arinvoicesVO.getSalesOrderNo());
if(ObjectUtil.isNotEmpty(salesorderitemEntity)){
arinvoicesVO.setJg_salesorder(JsonUtil.getJsonToBean(salesorderitemEntity,SalesorderitemListVO.class));
}
}
@ -140,14 +133,6 @@ public class ArinvoicesController {
}
//子表数据
if(ObjectUtil.isNotEmpty(arinvoicesCrForm.getJg_salesorder())){
SalesorderitemEntity jg_salesorderentity = JsonUtil.getJsonToBean(arinvoicesCrForm.getJg_salesorder(), SalesorderitemEntity.class);
jg_salesorderentity.setId(entity.getSalesOrderNo());
//自动生成的字段
jg_salesorderentity.setId(mainId);
salesorderitemService.save(jg_salesorderentity);
}
return ActionResult.success("创建成功");
}
@ -190,23 +175,10 @@ public class ArinvoicesController {
}
List<ArinvoicesListVO> listVO=JsonUtil.getJsonToList(list,ArinvoicesListVO.class);
for(ArinvoicesListVO arinvoicesVO:listVO){
SalesorderitemEntity salesorderitemEntity = arinvoicesService.getSalesorderitem(arinvoicesVO.getSalesOrderNo());
if(ObjectUtil.isNotEmpty(salesorderitemEntity)){
arinvoicesVO.setJg_salesorder(JsonUtil.getJsonToBean(salesorderitemEntity,SalesorderitemListVO.class));
}
}
//转换为map输出
List<Map<String, Object>>mapList=JsonUtil.getJsonToListMap(JsonUtil.getObjectToStringDateFormat(listVO,"yyyy-MM-dd HH:mm:ss"));
mapList.stream().forEach(map -> {
Map<String,Object> map2 =new HashMap<>();
Map<String, Object> map1 = JsonUtil.entityToMap(map.get("salesorderitem"));
for (Map.Entry entry : map1.entrySet()){
String key = "salesorderitem." +entry.getKey();
map2.put(key,entry.getValue());
}
map.putAll(map2);
});
String[]keys=!StringUtil.isEmpty(arinvoicesPaginationExportModel.getSelectKey())?arinvoicesPaginationExportModel.getSelectKey().split(","):new String[0];
UserInfo userInfo=userProvider.get();
DownloadVO vo=this.creatModelExcel(configValueUtil.getTemporaryFilePath(),mapList,keys,userInfo);
@ -219,9 +191,6 @@ public class ArinvoicesController {
if(keys.length>0){
for(String key:keys){
switch(key){
case "jg_salesorder.contractCode" :
entitys.add(new ExcelExportEntity("合同编码" ,"jg_salesorder.contractCode"));
break;
case "documentNo" :
entitys.add(new ExcelExportEntity("单据编号" ,"documentNo"));
break;
@ -337,10 +306,6 @@ public class ArinvoicesController {
}
vo.setArinvoices_item0List(JsonUtil.getJsonToList(Arinvoices_item0List,Arinvoices_item0Model.class ));
//副表
QueryWrapper<SalesorderitemEntity> queryWrapperSalesorderitem = new QueryWrapper<>();
queryWrapperSalesorderitem.lambda().eq(SalesorderitemEntity::getId,entity.getSalesOrderNo());
SalesorderitemEntity jg_salesorderEntity = salesorderitemService.getOne(queryWrapperSalesorderitem);
vo.setJg_salesorder(JsonUtil.getJsonToBean(jg_salesorderEntity, SalesorderitemModel.class));
return ActionResult.success(vo);
}
@ -363,14 +328,6 @@ public class ArinvoicesController {
vo.setArinvoices_item0List(jg_arinvoices_item0ModelList);
//附表数据转换
QueryWrapper<SalesorderitemEntity> queryWrapperSalesorderitem = new QueryWrapper<>();
queryWrapperSalesorderitem.lambda().eq(SalesorderitemEntity::getId,entity.getSalesOrderNo());
SalesorderitemEntity jg_salesorderEntity = salesorderitemService.getOne(queryWrapperSalesorderitem);
if(ObjectUtil.isEmpty(jg_salesorderEntity)){
jg_salesorderEntity = new SalesorderitemEntity();
}
vo.setJg_salesorder(JsonUtil.getJsonToBean(jg_salesorderEntity, SalesorderitemModel.class));
//添加到详情表单对象中
@ -412,16 +369,6 @@ public class ArinvoicesController {
arinvoices_item0Service.save(entitys);
}
//子表数据
if(ObjectUtil.isNotEmpty(arinvoicesUpForm.getJg_salesorder())){
QueryWrapper<SalesorderitemEntity> queryWrapperSalesorderitem =new QueryWrapper<>();
queryWrapperSalesorderitem.lambda().eq(SalesorderitemEntity::getId,entity.getSalesOrderNo());
SalesorderitemEntity jg_salesorderOneEntity= salesorderitemService.getOne(queryWrapperSalesorderitem);
SalesorderitemEntity jg_salesorderentity=JsonUtil.getJsonToBean(arinvoicesUpForm.getJg_salesorder(), SalesorderitemEntity.class);
jg_salesorderentity.setId(jg_salesorderOneEntity.getId());
jg_salesorderentity.setId(entity.getSalesOrderNo());
salesorderitemService.updateById(jg_salesorderentity);
}
return ActionResult.success("更新成功");
}else{
return ActionResult.fail("更新失败,数据不存在");
@ -445,10 +392,6 @@ public class ArinvoicesController {
QueryWrapper<Arinvoices_item0Entity> queryWrapperArinvoices_item0=new QueryWrapper<>();
queryWrapperArinvoices_item0.lambda().eq(Arinvoices_item0Entity::getArinvoicesId,entity.getId());
arinvoices_item0Service.remove(queryWrapperArinvoices_item0);
//子表数据
QueryWrapper<SalesorderitemEntity> queryWrapperSalesorderitem=new QueryWrapper<>();
queryWrapperSalesorderitem.lambda().eq(SalesorderitemEntity::getId,entity.getSalesOrderNo());
salesorderitemService.remove(queryWrapperSalesorderitem);
}
return ActionResult.success("删除成功");

@ -20,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
* @ 2023-01-29
* @ 2023-01-30
*/
@Data
@TableName("jg_arinvoices")

@ -20,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
* @ 2023-01-29
* @ 2023-01-30
*/
@Data
@TableName("jg_arinvoices_item0")

@ -21,7 +21,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
* @ 2023-01-29
* @ 2023-01-30
*/
@Data
@TableName("jg_arinvoices_item1")

@ -1,156 +0,0 @@
package jnpf.arinvoices.entity;
import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.util.Date;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.math.BigDecimal;
import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonProperty;
/**
*
*
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
* @ 2023-01-29
*/
@Data
@TableName("jg_salesorder")
public class SalesorderitemEntity {
@TableId("ID")
private String id;
@TableField("CREATOR_USER_ID")
private String creatorUserId;
@TableField("CREATOR_USER_NAME")
private String creatorUserName;
@TableField("CREATOR_TIME")
private Date creatorTime;
@TableField("LAST_MODIFY_USER_ID")
private String lastModifyUserId;
@TableField("LAST_MODIFY_USER_NAME")
private String lastModifyUserName;
@TableField("LAST_MODIFY_TIME")
private Date lastModifyTime;
@TableField("DELETE_USER_ID")
private String deleteUserId;
@TableField("DELETE_USER_NAME")
private String deleteUserName;
@TableField("DELETE_TIME")
private Date deleteTime;
@TableField("DELETE_MARK")
private String deleteMark;
@TableField("ORGNIZE_ID")
private String orgnizeId;
@TableField("DEPARTMENT_ID")
private String departmentId;
@TableField("DOCUMENT_NO")
private String documentNo;
@TableField("ERP_NO")
private String erpNo;
@TableField("SOURCE_PO_NO")
private String sourcePoNo;
@TableField("CONTRACT_CODE")
private String contractCode;
@TableField("CONTRACT_NAME")
private String contractName;
@TableField("CONTRACT_NO")
private String contractNo;
@TableField("COSTOMER_CODE")
private String costomerCode;
@TableField("COSTOMER_NAME")
private String costomerName;
@TableField("NUM")
private BigDecimal num;
@TableField("PRICE")
private BigDecimal price;
@TableField("NOT_PRICE")
private BigDecimal notPrice;
@TableField("RATE")
private BigDecimal rate;
@TableField("POUND_NUM")
private Integer poundNum;
@TableField("CURRENCY")
private String currency;
@TableField("ADVANCE_AMOUNT")
private BigDecimal advanceAmount;
@TableField("AMOUNT_COLLECTED")
private BigDecimal amountCollected;
@TableField("INVOICE_NUM")
private BigDecimal invoiceNum;
@TableField("INVOICE_AMOUNT")
private BigDecimal invoiceAmount;
@TableField("RETURN_QUANTITY")
private BigDecimal returnQuantity;
@TableField("REF_AMOUNT")
private BigDecimal reamount;
@TableField("STATUS")
private String status;
@TableField("SOURCE_SYSTEM")
private String sourceSystem;
@TableField("IS_SETTLE")
private String isSettle;
@TableField("ISSUE")
private String issue;
@TableField("REMARK")
private String remark;
@TableField("CLOSING_DATE")
private Date closingDate;
@TableField("OVERDUE_INTEREST")
private BigDecimal overdueInterest;
}

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* V3.2.0
* LINKAGE-BOOT
* LINKAGE-BOOT
* 2023-01-29
* 2023-01-30
*/
public interface ArinvoicesMapper extends BaseMapper<ArinvoicesEntity> {

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* V3.2.0
* LINKAGE-BOOT
* LINKAGE-BOOT
* 2023-01-29
* 2023-01-30
*/
public interface Arinvoices_item0Mapper extends BaseMapper<Arinvoices_item0Entity> {

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* V3.2.0
* LINKAGE-BOOT
* LINKAGE-BOOT
* 2023-01-29
* 2023-01-30
*/
public interface Arinvoices_item1Mapper extends BaseMapper<Arinvoices_item1Entity> {

@ -1,17 +0,0 @@
package jnpf.arinvoices.mapper;
import jnpf.arinvoices.entity.SalesorderitemEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
*
* jg_salesorder
* V3.2.0
* LINKAGE-BOOT
* LINKAGE-BOOT
* 2023-01-29
*/
public interface SalesorderitemMapper extends BaseMapper<SalesorderitemEntity> {
}

@ -15,7 +15,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
* @ 2023-01-29
* @ 2023-01-30
*/
@Data
public class ArinvoicesCrForm {
@ -84,8 +84,5 @@ public class ArinvoicesCrForm {
@JsonProperty("arinvoices_item0List")
private List<Arinvoices_item0Model> arinvoices_item0List;
/** 列表子表数据 **/
@JsonProperty("jg_salesorder")
private SalesorderitemModel jg_salesorder;
}

@ -16,7 +16,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
* @ 2023-01-29
* @ 2023-01-30
*/
@Data
public class ArinvoicesInfoVO{
@ -87,7 +87,4 @@ public class ArinvoicesInfoVO{
/** 子表数据 **/
@JsonProperty("arinvoices_item0List")
private List<Arinvoices_item0Model> arinvoices_item0List;
/** 列表子表数据 **/
@JsonProperty("jg_salesorder")
private SalesorderitemModel jg_salesorder;
}

@ -10,7 +10,7 @@ import java.util.List;
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
* @ 2023-01-29
* @ 2023-01-30
*/
@Data
public class ArinvoicesListQuery extends Pagination {

@ -15,7 +15,7 @@ import java.math.BigDecimal;
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
* @ 2023-01-29
* @ 2023-01-30
*/
@Data
public class ArinvoicesListVO{
@ -99,7 +99,4 @@ public class ArinvoicesListVO{
private String creatorUserName;
/**列表子表数据 */
@JsonProperty("jg_salesorder")
private SalesorderitemListVO jg_salesorder;
}

@ -11,7 +11,7 @@ import java.util.List;
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
* @ 2023-01-29
* @ 2023-01-30
*/
@Data
public class ArinvoicesPagination extends Pagination {

@ -9,7 +9,7 @@ import java.util.*;
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
* @ 2023-01-29
* @ 2023-01-30
*/
@Data
public class ArinvoicesPaginationExportModel extends Pagination {

@ -16,7 +16,7 @@ import lombok.Data;
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
* @ 2023-01-29
* @ 2023-01-30
*/
@Data
public class ArinvoicesUpForm{
@ -102,7 +102,4 @@ public class ArinvoicesUpForm{
@JsonProperty("arinvoices_item0List")
private List<Arinvoices_item0Model> arinvoices_item0List;
/** 列表子表数据 **/
@JsonProperty("jg_salesorder")
private SalesorderitemModel jg_salesorder;
}

@ -13,7 +13,7 @@ import com.alibaba.fastjson.annotation.JSONField;
* V3.2.0
* : LINKAGE-BOOT
* LINKAGE-BOOT
* 2023-01-29
* 2023-01-30
*/
@Data
public class Arinvoices_item0Model {

@ -1,25 +0,0 @@
package jnpf.arinvoices.model.arinvoices;
import lombok.Data;
import java.sql.Time;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.math.BigDecimal;
/**
*
*
* @ V3.2.0
* @ LINKAGE-BOOT
* @ LINKAGE-BOOT
* @ 2023-01-29
*/
@Data
public class SalesorderitemListVO{
/** 合同编码 **/
@JsonProperty("contractCode")
private String contractCode;
}

@ -1,26 +0,0 @@
package jnpf.arinvoices.model.arinvoices;
import lombok.Data;
import java.util.List;
import java.util.Date;
import java.math.BigDecimal;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.alibaba.fastjson.annotation.JSONField;
/**
*
*
* V3.2.0
* : LINKAGE-BOOT
* LINKAGE-BOOT
* 2023-01-29
*/
@Data
public class SalesorderitemModel {
/** 合同编码 **/
@JsonProperty("contractCode")
private String contractCode;
}

@ -4,7 +4,6 @@ import jnpf.arinvoices.service.Arinvoices_item0Service;
import jnpf.arinvoices.entity.ArinvoicesEntity;
import com.baomidou.mybatisplus.extension.service.IService;
import jnpf.arinvoices.entity.SalesorderitemEntity;
import jnpf.arinvoices.model.arinvoices.ArinvoicesPagination;
import java.util.*;
/**
@ -13,7 +12,7 @@ import java.util.*;
* V3.2.0
* LINKAGE-BOOT
* LINKAGE-BOOT
* 2023-01-29
* 2023-01-30
*/
public interface ArinvoicesService extends IService<ArinvoicesEntity> {
@ -35,6 +34,4 @@ public interface ArinvoicesService extends IService<ArinvoicesEntity> {
List<Arinvoices_item0Entity> GetArinvoices_item0List(String id);
//列表子表数据方法
SalesorderitemEntity getSalesorderitem(String id);
}

@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* V3.2.0
* LINKAGE-BOOT
* LINKAGE-BOOT
* 2023-01-29
* 2023-01-30
*/
public interface Arinvoices_item0Service extends IService<Arinvoices_item0Entity> {

@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* V3.2.0
* LINKAGE-BOOT
* LINKAGE-BOOT
* 2023-01-29
* 2023-01-30
*/
public interface Arinvoices_item1Service extends IService<Arinvoices_item1Entity> {

@ -1,15 +0,0 @@
package jnpf.arinvoices.service;
import jnpf.arinvoices.entity.SalesorderitemEntity;
import com.baomidou.mybatisplus.extension.service.IService;
/**
*
* jg_salesorder
* V3.2.0
* LINKAGE-BOOT
* LINKAGE-BOOT
* 2023-01-29
*/
public interface SalesorderitemService extends IService<SalesorderitemEntity> {
}

@ -38,7 +38,7 @@ import java.util.*;
* V3.2.0
* LINKAGE-BOOT
* LINKAGE-BOOT
* 2023-01-29
* 2023-01-30
*/
@Service
public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, ArinvoicesEntity> implements ArinvoicesService{
@ -50,8 +50,6 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
@Autowired
private AuthorizeService authorizeService;
@Autowired
private SalesorderitemService salesorderitemService;
@Autowired
private Arinvoices_item0Service arinvoices_item0Service;
@ -70,8 +68,6 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
QueryWrapper<Arinvoices_item0Entity> arinvoices_item0QueryWrapper=new QueryWrapper<>();
int arinvoices_item1Num =0;
QueryWrapper<Arinvoices_item1Entity> arinvoices_item1QueryWrapper=new QueryWrapper<>();
int salesorderitemNum =0;
QueryWrapper<SalesorderitemEntity> salesorderitemQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
@ -97,13 +93,6 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
} else {
arinvoices_item1QueryWrapper = (QueryWrapper<Arinvoices_item1Entity>)arinvoices_item1Obj;
arinvoices_item1Num++;
}
Object salesorderitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesorderitemQueryWrapper,arinvoicesPagination.getMenuId(),"salesorderitem"));
if (ObjectUtil.isEmpty(salesorderitemObj)){
return new ArrayList<>();
} else {
salesorderitemQueryWrapper = (QueryWrapper<SalesorderitemEntity>)salesorderitemObj;
salesorderitemNum++;
}
}
}
@ -136,15 +125,6 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
}
Object salesorderitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesorderitemQueryWrapper,arinvoicesPagination.getMenuId(),"salesorderitem"));
if (ObjectUtil.isEmpty(salesorderitemObj)){
return new ArrayList<>();
} else {
salesorderitemQueryWrapper = (QueryWrapper<SalesorderitemEntity>)salesorderitemObj;
salesorderitemNum++;
}
}
}
if(StringUtil.isNotEmpty(arinvoicesPagination.getDocumentNo())){
@ -190,8 +170,6 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
QueryWrapper<Arinvoices_item0Entity> arinvoices_item0QueryWrapper=new QueryWrapper<>();
int arinvoices_item1Num =0;
QueryWrapper<Arinvoices_item1Entity> arinvoices_item1QueryWrapper=new QueryWrapper<>();
int salesorderitemNum =0;
QueryWrapper<SalesorderitemEntity> salesorderitemQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
@ -217,13 +195,6 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
} else {
arinvoices_item1QueryWrapper = (QueryWrapper<Arinvoices_item1Entity>)arinvoices_item1Obj;
arinvoices_item1Num++;
}
Object salesorderitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesorderitemQueryWrapper,arinvoicesPagination.getMenuId(),"salesorderitem"));
if (ObjectUtil.isEmpty(salesorderitemObj)){
return new ArrayList<>();
} else {
salesorderitemQueryWrapper = (QueryWrapper<SalesorderitemEntity>)salesorderitemObj;
salesorderitemNum++;
}
}
}
@ -256,15 +227,6 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
}
Object salesorderitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesorderitemQueryWrapper,arinvoicesPagination.getMenuId(),"salesorderitem"));
if (ObjectUtil.isEmpty(salesorderitemObj)){
return new ArrayList<>();
} else {
salesorderitemQueryWrapper = (QueryWrapper<SalesorderitemEntity>)salesorderitemObj;
salesorderitemNum++;
}
}
}
if(StringUtil.isNotEmpty(arinvoicesPagination.getDocumentNo())){
@ -336,12 +298,6 @@ public class ArinvoicesServiceImpl extends ServiceImpl<ArinvoicesMapper, Arinvoi
}
//列表子表数据方法
@Override
public SalesorderitemEntity getSalesorderitem(String id){
QueryWrapper<SalesorderitemEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SalesorderitemEntity::getId, id);
return salesorderitemService.getOne(queryWrapper);
}
}

@ -32,7 +32,7 @@ import java.util.*;
* V3.2.0
* LINKAGE-BOOT
* LINKAGE-BOOT
* 2023-01-29
* 2023-01-30
*/
@Service
public class Arinvoices_item0ServiceImpl extends ServiceImpl<Arinvoices_item0Mapper, Arinvoices_item0Entity> implements Arinvoices_item0Service{

@ -32,7 +32,7 @@ import java.util.*;
* V3.2.0
* LINKAGE-BOOT
* LINKAGE-BOOT
* 2023-01-29
* 2023-01-30
*/
@Service
public class Arinvoices_item1ServiceImpl extends ServiceImpl<Arinvoices_item1Mapper, Arinvoices_item1Entity> implements Arinvoices_item1Service{

@ -1,41 +0,0 @@
package jnpf.arinvoices.service.impl;
import jnpf.arinvoices.entity.*;
import jnpf.arinvoices.mapper.SalesorderitemMapper;
import jnpf.arinvoices.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.util.RandomUtil;
import java.math.BigDecimal;
import cn.hutool.core.util.ObjectUtil;
import jnpf.permission.model.authorize.AuthorizeConditionModel;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
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.*;
/**
*
* jg_salesorder
* V3.2.0
* LINKAGE-BOOT
* LINKAGE-BOOT
* 2023-01-29
*/
@Service
public class SalesorderitemServiceImpl extends ServiceImpl<SalesorderitemMapper, SalesorderitemEntity> implements SalesorderitemService{
}

@ -48,12 +48,6 @@
<p>{{dataForm.customerTaxNo}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="合同编码"
prop="jnpf_jg_salesorder_jnpf_contractCode" >
<p>{{dataForm.jnpf_jg_salesorder_jnpf_contractCode}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="客户地址"
prop="customerAddress" >
@ -103,7 +97,7 @@
</el-form-item>
</el-col>
<el-col :span="24">
<el-tabs v-model="activeegevzb" tab-position="top" class="mb-20">
<el-tabs v-model="activewkrlwe" tab-position="top" class="mb-20">
<el-tab-pane label="应收明细">
</el-tab-pane >
<el-tab-pane label="发票明细">
@ -189,13 +183,8 @@
status : "0",
creatorUserName : '',
arinvoices_item0List:[],
jg_salesorder:
{
contractCode:'',
},
jnpf_jg_salesorder_jnpf_contractCode:'',
},
activeegevzb:'1',
activewkrlwe:'1',
currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"审批中","id":"1"},{"fullName":"已审批","id":"2"}],
@ -211,7 +200,6 @@
methods: {
dataInfo(dataAll){
let _dataAll =dataAll
_dataAll.jnpf_jg_salesorder_jnpf_contractCode = _dataAll.jg_salesorder.contractCode
for(let i=0;i<_dataAll.arinvoices_item0List.length;i++){
var _list = _dataAll.arinvoices_item0List[i];
}

@ -7,7 +7,7 @@
<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" >
<template v-if="!loading">
<el-col :span="8" >
<el-form-item label="单据编号"
<el-form-item label="单据编号"
prop="documentNo" >
<el-input v-model="dataForm.documentNo"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@ -15,17 +15,17 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="业务日期"
prop="businessDate">
<el-date-picker v-model="dataForm.businessDate"
placeholder="请选择业务日期" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd"
value-format="timestamp">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="业务日期"
prop="businessDate" >
<el-input v-model="dataForm.businessDate"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="客户名称"
<el-form-item label="客户名称"
prop="customerName" >
<el-input v-model="dataForm.customerName"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@ -34,7 +34,7 @@
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="金额"
<el-form-item label="金额"
prop="amount" >
<el-input v-model="dataForm.amount"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@ -43,7 +43,7 @@
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="数量"
<el-form-item label="数量"
prop="quantity" >
<el-input v-model="dataForm.quantity"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@ -52,7 +52,7 @@
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="发票数量"
<el-form-item label="发票数量"
prop="invoiceQuantity" >
<el-input v-model="dataForm.invoiceQuantity"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@ -61,7 +61,7 @@
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="客户税号"
<el-form-item label="客户税号"
prop="customerTaxNo" >
<el-input v-model="dataForm.customerTaxNo"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@ -70,15 +70,7 @@
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="合同编码"
prop="jnpf_jg_salesorder_jnpf_contractCode" >
<el-input v-model=" dataForm.jnpf_jg_salesorder_jnpf_contractCode"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="客户地址"
<el-form-item label="客户地址"
prop="customerAddress" >
<el-input v-model="dataForm.customerAddress"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@ -87,7 +79,7 @@
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="币别 "
<el-form-item label="币别 "
prop="currency" >
<el-select v-model="dataForm.currency"
placeholder="请选择" clearable :style='{"width":"100%"}'>
@ -97,7 +89,7 @@
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="备注"
<el-form-item label="备注"
prop="remark" >
<el-input v-model="dataForm.remark"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@ -106,7 +98,7 @@
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="发票金额"
<el-form-item label="发票金额"
prop="invoiceAmount" >
<el-input v-model="dataForm.invoiceAmount"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@ -115,7 +107,7 @@
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="销售订单号"
<el-form-item label="销售订单号"
prop="salesOrderNo" >
<el-input v-model="dataForm.salesOrderNo"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@ -124,7 +116,7 @@
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="合同名称"
<el-form-item label="合同名称"
prop="contractName" >
<el-input v-model="dataForm.contractName"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@ -133,7 +125,7 @@
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="单据状态 "
<el-form-item label="单据状态 "
prop="status" >
<el-select v-model="dataForm.status"
placeholder="请选择" clearable :style='{"width":"100%"}'>
@ -143,7 +135,7 @@
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="制单人"
<el-form-item label="制单人"
prop="creatorUserName" >
<el-input v-model="dataForm.creatorUserName"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@ -152,7 +144,7 @@
</el-form-item>
</el-col>
<el-col :span="24">
<el-tabs v-model="activeegevzb" tab-position="top" class="mb-20">
<el-tabs v-model="activewkrlwe" tab-position="top" class="mb-20">
<el-tab-pane label="应收明细">
</el-tab-pane >
<el-tab-pane label="发票明细">
@ -258,13 +250,8 @@
status : "0",
creatorUserName : '',
arinvoices_item0List:[],
jg_salesorder:
{
contractCode:'',
},
jnpf_jg_salesorder_jnpf_contractCode:'',
},
activeegevzb:'1',
activewkrlwe:'1',
rules:
{
},
@ -380,7 +367,6 @@
},
dataList(){
var _data = JSON.parse(JSON.stringify(this.dataForm));
_data.jg_salesorder.contractCode = _data.jnpf_jg_salesorder_jnpf_contractCode
for(let i=0;i<_data.arinvoices_item0List.length;i++){
var _list = _data.arinvoices_item0List[i];
}
@ -388,7 +374,6 @@
},
dataInfo(dataAll){
let _dataAll =dataAll
_dataAll.jnpf_jg_salesorder_jnpf_contractCode = _dataAll.jg_salesorder.contractCode
for(let i=0;i<_dataAll.arinvoices_item0List.length;i++){
var _list = _dataAll.arinvoices_item0List[i];
}

@ -1,19 +1,13 @@
<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 ? '新建' : isDetail ? '详情':'编辑'"/>
<div class="options">
<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> </el-button>
<el-button @click="goBack"> </el-button>
</div>
</div>
<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '1000px'}">
<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'"
:close-on-click-modal="false" append-to-body
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
width="1000px">
<el-row :gutter="15" class="" >
<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" >
<template v-if="!loading">
<el-col :span="8" >
<el-form-item label="单据编号"
<el-form-item label="单据编号"
prop="documentNo" >
<el-input v-model="dataForm.documentNo"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@ -22,7 +16,7 @@
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="供应商"
<el-form-item label="供应商"
prop="supplierName" >
<el-input v-model="dataForm.supplierName"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@ -31,7 +25,7 @@
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="合同名称"
<el-form-item label="合同名称"
prop="contractName" >
<el-input v-model="dataForm.contractName"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@ -40,7 +34,7 @@
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="制单人"
<el-form-item label="制单人"
prop="creatorUserName" >
<el-input v-model="dataForm.creatorUserName"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@ -49,7 +43,7 @@
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="部门id"
<el-form-item label="部门id"
prop="departmentId" >
<dep-select v-model="dataForm.departmentId"
placeholder="请选择" clearable >
@ -58,7 +52,7 @@
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="对方合同"
<el-form-item label="对方合同"
prop="contractNo" >
<el-input v-model="dataForm.contractNo"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@ -67,7 +61,7 @@
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="数量"
<el-form-item label="数量"
prop="num" >
<el-input v-model="dataForm.num"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@ -76,7 +70,7 @@
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="金额"
<el-form-item label="金额"
prop="amount" >
<el-input v-model="dataForm.amount"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@ -85,7 +79,7 @@
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="不含税金额"
<el-form-item label="不含税金额"
prop="notAmount" >
<el-input v-model="dataForm.notAmount"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@ -94,7 +88,7 @@
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="币别 "
<el-form-item label="币别 "
prop="currency" >
<el-select v-model="dataForm.currency"
placeholder="请选择" clearable :style='{"width":"100%"}'>
@ -104,7 +98,7 @@
</el-form-item>
</el-col>
<el-col :span="16" >
<el-form-item label="备注信息"
<el-form-item label="备注信息"
prop="remark" >
<el-input v-model="dataForm.remark"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@ -112,70 +106,7 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="制单时间"
prop="creatorTime" >
<el-date-picker v-model="dataForm.creatorTime"
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="ERP订单号"
prop="erpNo" >
<el-input v-model="dataForm.erpNo"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="已付款金额"
prop="payPrice" >
<el-input v-model="dataForm.payPrice"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="发票数量"
prop="invoiceNum" >
<el-input v-model="dataForm.invoiceNum"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="发票金额"
prop="invoiceAmount" >
<el-input v-model="dataForm.invoiceAmount"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="垫资金额"
prop="advanceAmount" >
<el-input v-model="dataForm.advanceAmount"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="单据状态 "
prop="status" >
<el-select v-model="dataForm.status"
placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in statusOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-tabs v-model="activenfqest" tab-position="top" class="mb-20">
<el-tab-pane label="磅单信息">
@ -187,11 +118,16 @@
<el-table :data="dataForm.purchaseorder_item0List" size='mini' >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="licenseNum" label="车牌号">
<template slot-scope="scope">
<el-input v-model="scope.row.licenseNum"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
<template slot-scope="scope">
<popupSelect v-model="scope.row.licenseNum" placeholder="请选择"
clearable :field="'licenseNum'+scope.$index"
interfaceId="383214061812227333"
:bissId="dataForm.id"
:columnOptions="purchaseback_item0licenseNumcolumnOptions"
propsValue="license_num" relationField="license_num"
popupType="dialog" popupWidth="800px" @change="popupSelectChange2">
</popupSelect>
</template>
</el-table-column>
<el-table-column prop="materialName" label="物料名称">
<template slot-scope="scope">
@ -410,8 +346,11 @@
</template>
</el-form>
</el-row>
</div>
</transition>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false"> </el-button>
<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> </el-button>
</span>
</el-dialog>
</template>
<script>
import request from '@/utils/request'
@ -453,15 +392,56 @@
rules:
{
},
currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"开票中","id":"1"},{"fullName":"付款申请","id":"2"},{"fullName":"待付款","id":"3"},{"fullName":"付款中","id":"4"},{"fullName":"归档","id":"5"}],
pountTypeOptions:[{"fullName":"贸易","id":"0"},{"fullName":"其他","id":"1"}],
unitOptions:[{"fullName":"吨","id":"0"},{"fullName":"千克","id":"1"}],
advanceOptions:[{"fullName":"否","id":"0"},{"fullName":"是","id":"1"}],
rateOptions:[{"fullName":"13","id":"0"},{"fullName":"9","id":"1"},{"fullName":"6","id":"2"},{"fullName":"5","id":"3"},{"fullName":"3","id":"4"},{"fullName":"0","id":"5"}],
paymentTypeOptions:[{"fullName":"贷款","id":"0"},{"fullName":"运费","id":"1"},{"fullName":"仓储","id":"2"}],
}
currencyOptions: [{ 'fullName': '人民币', 'id': '0' },
{ 'fullName': '美元', 'id': '1' },
{ 'fullName': '英镑', 'id': '2' }],
statusOptions: [{ 'fullName': '已保存', 'id': '0' }, { 'fullName': '开票中', 'id': '1' }, {
'fullName': '付款申请',
'id': '2'
}, { 'fullName': '待付款', 'id': '3' }, { 'fullName': '付款中', 'id': '4' }, { 'fullName': '归档', 'id': '5' }],
purchaseback_item0licenseNumcolumnOptions: [{
'label': '车牌号',
'value': 'license_num'
}, {
'label': '物料名称',
'value': 'material_name'
}, {
'label': '结算重量',
'value': 'settlement'
}, {
'label': '计量单位',
'value': 'unit'
}, {
'label': '采购单价',
'value': 'price'
}, {
'label': '税率',
'value': 'rate'
}, {
'label': '应退金额',
'value': 'amount'
}, {
'label': '税额',
'value': 'not_amount'
}, {
'label': '业务员',
'value': 'pount_user'
}, {
'label': '磅单类型',
'value': 'pount_type'
}],
pountTypeOptions: [{ 'fullName': '贸易', 'id': '0' }, { 'fullName': '其他', 'id': '1' }],
unitOptions: [{ 'fullName': '吨', 'id': '0' }, { 'fullName': '千克', 'id': '1' }],
advanceOptions: [{ 'fullName': '否', 'id': '0' }, { 'fullName': '是', 'id': '1' }],
rateOptions: [{ 'fullName': '13', 'id': '0' }, { 'fullName': '9', 'id': '1' }, {
'fullName': '6',
'id': '2'
}, { 'fullName': '5', 'id': '3' }, { 'fullName': '3', 'id': '4' }, { 'fullName': '0', 'id': '5' }],
paymentTypeOptions: [{ 'fullName': '贷款', 'id': '0' }, { 'fullName': '运费', 'id': '1' }, {
'fullName': '仓储',
'id': '2'
}]
}
},
computed: {},
watch: {},
@ -469,6 +449,24 @@
},
mounted() {},
methods: {
popupSelectChange(e,d){
this.dataForm.currency = d.currency;
},
popupSelectChange2(a, b){
for (let i = 0; i < this.dataForm.purchaseback_item0List.length; i++) {
if(a == this.dataForm.purchaseback_item0List[i].licenseNum){
this.dataForm.purchaseback_item0List[i].materialName = b.material_name;
this.dataForm.purchaseback_item0List[i].settlement = b.settlement;
this.dataForm.purchaseback_item0List[i].unit = b.unit;
this.dataForm.purchaseback_item0List[i].price = b.price;
this.dataForm.purchaseback_item0List[i].rate = b.rate;
this.dataForm.purchaseback_item0List[i].amount = b.amount;
this.dataForm.purchaseback_item0List[i].notAmount = b.not_amount;
this.dataForm.purchaseback_item0List[i].pountUser = b.pount_user;
this.dataForm.purchaseback_item0List[i].pountType = b.pount_type;
}
}
},
purchaseorder_item0Exist() {
let isOk = true;
for(let i=0;i<this.dataForm.purchaseorder_item0List.length;i++){

@ -1,15 +1,9 @@
<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 ? '新建' : isDetail ? '详情':'编辑'"/>
<div class="options">
<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> </el-button>
<el-button @click="goBack"> </el-button>
</div>
</div>
<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '1200px'}">
<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'"
:close-on-click-modal="false" append-to-body
:visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
width="1000px">
<el-row :gutter="15" class="">
<el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right" >
<template v-if="!loading">
<el-col :span="8" >
@ -438,8 +432,11 @@
</template>
</el-form>
</el-row>
</div>
</transition>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false"> </el-button>
<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"> </el-button>
</span>
</el-dialog>
</template>
<script>
import request from '@/utils/request'

Loading…
Cancel
Save