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

销售订单

Browse Source
product
杨世强 2 years ago
parent c48f85ffea
commit 1306546dc6
96 changed files with 3294 additions and 1351 deletions
Show Stats Download Patch File Download Diff File

384
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java
Unescape View File

@ -15,13 +15,11 @@ import jnpf.base.UserInfo;
import jnpf.base.vo.DownloadVO;
import jnpf.config.ConfigValueUtil;
import jnpf.exception.DataException;
import jnpf.purchaseorder.entity.*;
import jnpf.purchaseorder.service.*;
import org.springframework.transaction.annotation.Transactional;
import jnpf.purchaseorder.model.purchaseorder.*;
import jnpf.purchaseorder.model.purchaseorder.PurchaseorderPagination;
import jnpf.purchaseorder.entity.Purchaseorder_item0Entity;
import jnpf.purchaseorder.entity.InvoicesitemEntity;
import jnpf.purchaseorder.entity.PaymentdocitemEntity;
import jnpf.purchaseorder.entity.PurchasebackitemEntity;
import jnpf.util.*;
import lombok.extern.slf4j.Slf4j;
import lombok.Cleanup;
@ -29,12 +27,6 @@ import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import jnpf.purchaseorder.entity.PurchaseorderitemEntity;
import jnpf.purchaseorder.service.PurchaseorderitemService;
import jnpf.purchaseorder.service.Purchaseorder_item0Service;
import jnpf.purchaseorder.service.InvoicesitemService;
import jnpf.purchaseorder.service.PaymentdocitemService;
import jnpf.purchaseorder.service.PurchasebackitemService;
import org.springframework.web.bind.annotation.*;
import org.springframework.beans.factory.annotation.Autowired;
@ -53,7 +45,7 @@ import jnpf.util.enums.FileTypeEnum;
* @版本： V3.2.0
* @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队
* @日期： 2023-01-30
* @日期： 2023-02-01
*/
@Slf4j
@RestController
@ -76,13 +68,37 @@ public class PurchaseorderController {
@Autowired
private Purchaseorder_item0Service purchaseorder_item0Service;
@Autowired
private InvoicesitemService invoicesitemService;
private Invoices_item0itemService invoices_item0itemService;
@Autowired
private PaymentdocitemService paymentdocitemService;
private PaymentitemService paymentitemService;
@Autowired
private PurchasebackitemService purchasebackitemService;
@Autowired
private CollectionpoService collectionpoService;
@Autowired
private PaymentdocpoService paymentdocpoService;
@Autowired
private InvoicesitemService invoicesitemService;
/**
* 归档
*
* @param
* @return
*/
@PostMapping("pigeonhole")
public ActionResult pigeonhole(@PathVariable("id") String id, @RequestBody @Valid PurchaseorderUpForm purchaseorderUpForm) {
PurchaseorderitemEntity purchaseorder = JsonUtil.getJsonToBean(purchaseorderUpForm, PurchaseorderitemEntity.class);
if (purchaseorder.getInvoiceAmount().equals(purchaseorder.getAmount()) && purchaseorder.getInvoiceAmount().equals(purchaseorder.getPayPrice())){
purchaseorder.setStatus("3");
purchaseorderitemService.update(id,purchaseorder);
return ActionResult.success("归档成功！");
}else{
return ActionResult.fail("发票金额、金额、已付款金额三者不一致！");
}
}
/**
* 列表
@ -95,7 +111,9 @@ public class PurchaseorderController {
List<PurchaseorderitemEntity> list= purchaseorderitemService.getList(purchaseorderPagination);
//处理id字段转名称，若无需转或者为空可删除
for(PurchaseorderitemEntity entity:list){
entity.setDepartmentId(generaterSwapUtil.comSelectValues(entity.getDepartmentId()));
Map<String,Object> contractNameMap = new HashMap<>();
entity.setContractName(generaterSwapUtil.getPopupSelectValue("390143765857220229","contract_name","contract_name",entity.getContractName(),contractNameMap));
entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName()));
}
List<PurchaseorderListVO> listVO=JsonUtil.getJsonToList(list,PurchaseorderListVO.class);
for(PurchaseorderListVO purchaseorderVO:listVO){
@ -121,6 +139,9 @@ public class PurchaseorderController {
public ActionResult create(@RequestBody @Valid PurchaseorderCrForm purchaseorderCrForm) throws DataException {
String mainId =RandomUtil.uuId();
UserInfo userInfo=userProvider.get();
purchaseorderCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("cgdj", false));
purchaseorderCrForm.setCreatorUserName(userInfo.getUserId());
purchaseorderCrForm.setCreatorTime(DateUtil.getNow());
PurchaseorderitemEntity entity = JsonUtil.getJsonToBean(purchaseorderCrForm, PurchaseorderitemEntity.class);
entity.setId(mainId);
purchaseorderitemService.save(entity);
@ -128,52 +149,36 @@ public class PurchaseorderController {
for(Purchaseorder_item0Entity entitys : Purchaseorder_item0List){
entitys.setId(RandomUtil.uuId());
entitys.setPurchaseorderId(entity.getId());
purchaseorder_item0Service.save(entitys);
}
List<InvoicesitemEntity> InvoicesitemList = JsonUtil.getJsonToList(purchaseorderCrForm.getInvoicesitemList(),InvoicesitemEntity.class);
for(InvoicesitemEntity entitys : InvoicesitemList){
entitys.setId(RandomUtil.uuId());
entitys.setPurchaseorderId(entity.getId());
invoicesitemService.save(entitys);
}
List<PaymentdocitemEntity> PaymentdocitemList = JsonUtil.getJsonToList(purchaseorderCrForm.getPaymentdocitemList(),PaymentdocitemEntity.class);
for(PaymentdocitemEntity entitys : PaymentdocitemList){
entitys.setId(RandomUtil.uuId());
entitys.setPurchaseOrderNo(entity.getId());
paymentdocitemService.save(entitys);
}
List<PurchasebackitemEntity> PurchasebackitemList = JsonUtil.getJsonToList(purchaseorderCrForm.getPurchasebackitemList(),PurchasebackitemEntity.class);
for(PurchasebackitemEntity entitys : PurchasebackitemList){
entitys.setId(RandomUtil.uuId());
entitys.setPurchaseOrderId(entity.getId());
purchasebackitemService.save(entitys);
}
//
// List<Invoices_item0itemEntity> Invoices_item0itemList = JsonUtil.getJsonToList(purchaseorderCrForm.getInvoices_item0itemList(),Invoices_item0itemEntity.class);
// for(Invoices_item0itemEntity entitys : Invoices_item0itemList){
// entitys.setId(RandomUtil.uuId());
// entitys.setPurchaseorderId(entity.getId());
// invoices_item0itemService.save(entitys);
// }
//
// List<PaymentitemEntity> PaymentitemList = JsonUtil.getJsonToList(purchaseorderCrForm.getPaymentitemList(),PaymentitemEntity.class);
// for(PaymentitemEntity entitys : PaymentitemList){
// entitys.setId(RandomUtil.uuId());
// entitys.setDocumentno(entity.getDocumentNo());
// paymentitemService.save(entitys);
// }
//
// List<PurchasebackitemEntity> PurchasebackitemList = JsonUtil.getJsonToList(purchaseorderCrForm.getPurchasebackitemList(),PurchasebackitemEntity.class);
// for(PurchasebackitemEntity entitys : PurchasebackitemList){
// entitys.setId(RandomUtil.uuId());
// entitys.setPurchaseOrderId(entity.getId());
// purchasebackitemService.save(entitys);
// }
//
// List<CollectionpoEntity> CollectionitemList = JsonUtil.getJsonToList(purchaseorderCrForm.getCollectionitemList(), CollectionpoEntity.class);
// for(CollectionpoEntity entitys : CollectionitemList){
// entitys.setId(RandomUtil.uuId());
// entitys.setSalesOrderNo(entity.getDocumentNo());
// collectionpoService.save(entitys);
// }
return ActionResult.success("创建成功");
}
@ -212,7 +217,9 @@ public class PurchaseorderController {
List<PurchaseorderitemEntity> list= purchaseorderitemService.getTypeList(purchaseorderPagination,purchaseorderPaginationExportModel.getDataType());
//处理id字段转名称，若无需转或者为空可删除
for(PurchaseorderitemEntity entity:list){
entity.setDepartmentId(generaterSwapUtil.comSelectValues(entity.getDepartmentId()));
Map<String,Object> contractNameMap = new HashMap<>();
entity.setContractName(generaterSwapUtil.getPopupSelectValue("390143765857220229","contract_name","contract_name",entity.getContractName(),contractNameMap));
entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName()));
}
List<PurchaseorderListVO> listVO=JsonUtil.getJsonToList(list,PurchaseorderListVO.class);
for(PurchaseorderListVO purchaseorderVO:listVO){
@ -235,23 +242,23 @@ public class PurchaseorderController {
case "documentNo" :
entitys.add(new ExcelExportEntity("单据编号" ,"documentNo"));
break;
case "supplierName" :
entitys.add(new ExcelExportEntity("供应商" ,"supplierName"));
break;
case "contractName" :
entitys.add(new ExcelExportEntity("合同名称" ,"contractName"));
break;
case "creatorUserName" :
entitys.add(new ExcelExportEntity("制单人" ,"creatorUserName"));
case "supplierName" :
entitys.add(new ExcelExportEntity("供应商名称" ,"supplierName"));
break;
case "departmentId" :
entitys.add(new ExcelExportEntity("部门id" ,"departmentId"));
case "currency" :
entitys.add(new ExcelExportEntity("币种" ,"currency"));
break;
case "contractNo" :
entitys.add(new ExcelExportEntity("对方合同" ,"contractNo"));
entitys.add(new ExcelExportEntity("对方合同号" ,"contractNo"));
break;
case "advanceAmount" :
entitys.add(new ExcelExportEntity("垫资金额" ,"advanceAmount"));
break;
case "num" :
entitys.add(new ExcelExportEntity("数量" ,"num"));
entitys.add(new ExcelExportEntity("重量" ,"num"));
break;
case "amount" :
entitys.add(new ExcelExportEntity("金额" ,"amount"));
@ -259,12 +266,12 @@ public class PurchaseorderController {
case "notAmount" :
entitys.add(new ExcelExportEntity("不含税金额" ,"notAmount"));
break;
case "currency" :
entitys.add(new ExcelExportEntity("币别 " ,"currency"));
break;
case "remark" :
entitys.add(new ExcelExportEntity("备注信息" ,"remark"));
break;
case "creatorUserName" :
entitys.add(new ExcelExportEntity("制单人" ,"creatorUserName"));
break;
case "creatorTime" :
entitys.add(new ExcelExportEntity("制单时间" ,"creatorTime"));
break;
@ -280,9 +287,6 @@ public class PurchaseorderController {
case "invoiceAmount" :
entitys.add(new ExcelExportEntity("发票金额" ,"invoiceAmount"));
break;
case "advanceAmount" :
entitys.add(new ExcelExportEntity("垫资金额" ,"advanceAmount"));
break;
case "status" :
entitys.add(new ExcelExportEntity("单据状态 " ,"status"));
break;
@ -349,24 +353,47 @@ public class PurchaseorderController {
public ActionResult<PurchaseorderInfoVO> info(@PathVariable("id") String id){
PurchaseorderitemEntity entity= purchaseorderitemService.getInfo(id);
PurchaseorderInfoVO vo=JsonUtil.getJsonToBean(entity, PurchaseorderInfoVO.class);
vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName()));
if(vo.getCreatorTime()!=null){
vo.setCreatorTime(vo.getCreatorTime());
}
//子表
List<Purchaseorder_item0Entity> Purchaseorder_item0List = purchaseorderitemService.GetPurchaseorder_item0List(id);
for(Purchaseorder_item0Entity purchaseorder_item0Entity : Purchaseorder_item0List){
}
vo.setPurchaseorder_item0List(JsonUtil.getJsonToList(Purchaseorder_item0List,Purchaseorder_item0Model.class ));
List<InvoicesitemEntity> InvoicesitemList = purchaseorderitemService.GetInvoicesitemList(id);
for(InvoicesitemEntity invoicesitemEntity : InvoicesitemList){
QueryWrapper<InvoicesitemEntity> invoicesitemWrapper = new QueryWrapper<>();
invoicesitemWrapper.lambda().eq(InvoicesitemEntity::getPurchaseorderId,id);
List<InvoicesitemEntity> invoicesitemList = invoicesitemService.list(invoicesitemWrapper);
List<Invoices_item0itemEntity> Invoices_item0itemList = new ArrayList<>();
for (InvoicesitemEntity invoicesitemEntity : invoicesitemList){
List<Invoices_item0itemEntity> invoices_item0itemList = purchaseorderitemService.GetInvoices_item0itemList(invoicesitemEntity.getId());
Invoices_item0itemList.addAll(invoices_item0itemList);
}
vo.setInvoicesitemList(JsonUtil.getJsonToList(InvoicesitemList,InvoicesitemModel.class ));
List<PaymentdocitemEntity> PaymentdocitemList = purchaseorderitemService.GetPaymentdocitemList(id);
for(PaymentdocitemEntity paymentdocitemEntity : PaymentdocitemList){
for(Invoices_item0itemEntity invoices_item0itemEntity : Invoices_item0itemList){
}
vo.setPaymentdocitemList(JsonUtil.getJsonToList(PaymentdocitemList,PaymentdocitemModel.class ));
vo.setInvoices_item0itemList(JsonUtil.getJsonToList(Invoices_item0itemList,Invoices_item0itemModel.class ));
QueryWrapper<PaymentdocpoEntity> PaymentdocpoWrapper = new QueryWrapper<>();
PaymentdocpoWrapper.lambda().eq(PaymentdocpoEntity::getPurchaseOrderNo,entity.getDocumentNo());
List<PaymentdocpoEntity> paymentdocList = paymentdocpoService.list(PaymentdocpoWrapper);
List<PaymentitemEntity> PaymentitemList = new ArrayList<>();
for (PaymentdocpoEntity paymentdocpoEntity : paymentdocList) {
List<PaymentitemEntity> paymentitemlist = purchaseorderitemService.GetPaymentitemList(paymentdocpoEntity.getDocumentNo());
PaymentitemList.addAll(paymentitemlist);
}
for(PaymentitemEntity paymentitemEntity : PaymentitemList){
}
vo.setPaymentitemList(JsonUtil.getJsonToList(PaymentitemList,PaymentitemModel.class ));
List<PurchasebackitemEntity> PurchasebackitemList = purchaseorderitemService.GetPurchasebackitemList(id);
for(PurchasebackitemEntity purchasebackitemEntity : PurchasebackitemList){
}
vo.setPurchasebackitemList(JsonUtil.getJsonToList(PurchasebackitemList,PurchasebackitemModel.class ));
List<CollectionpoEntity> CollectionitemList = purchaseorderitemService.GetCollectionitemList(entity.getDocumentNo());
for(CollectionpoEntity collectionpoEntity : CollectionitemList){
}
vo.setCollectionitemList(JsonUtil.getJsonToList(CollectionitemList,CollectionitemModel.class ));
//副表
return ActionResult.success(vo);
}
@ -386,30 +413,68 @@ public class PurchaseorderController {
List<Purchaseorder_item0Entity> jg_purchaseorder_item0List = purchaseorderitemService.GetPurchaseorder_item0List(id);
List<Purchaseorder_item0Model> jg_purchaseorder_item0ModelList = JsonUtil.getJsonToList(jg_purchaseorder_item0List,Purchaseorder_item0Model.class);
for(Purchaseorder_item0Model jg_purchaseorder_item0Model : jg_purchaseorder_item0ModelList){
Map<String,Object> licenseNumMap = new HashMap<>();
jg_purchaseorder_item0Model.setLicenseNum(generaterSwapUtil.getPopupSelectValue("383214061812227333","license_num","license_num",jg_purchaseorder_item0Model.getLicenseNum(),licenseNumMap));
// Map<String,Object> licenseNumMap = new HashMap<>();
// jg_purchaseorder_item0Model.setLicenseNum(generaterSwapUtil.getPopupSelectValue("389754644018016581","license_no","license_no",jg_purchaseorder_item0Model.getLicenseNum(),licenseNumMap));
}
vo.setPurchaseorder_item0List(jg_purchaseorder_item0ModelList);
List<InvoicesitemEntity> jg_invoicesList = purchaseorderitemService.GetInvoicesitemList(id);
List<InvoicesitemModel> jg_invoicesModelList = JsonUtil.getJsonToList(jg_invoicesList,InvoicesitemModel.class);
for(InvoicesitemModel jg_invoicesModel : jg_invoicesModelList){
}
vo.setInvoicesitemList(jg_invoicesModelList);
List<PaymentdocitemEntity> jg_paymentdocList = purchaseorderitemService.GetPaymentdocitemList(id);
List<PaymentdocitemModel> jg_paymentdocModelList = JsonUtil.getJsonToList(jg_paymentdocList,PaymentdocitemModel.class);
for(PaymentdocitemModel jg_paymentdocModel : jg_paymentdocModelList){
}
vo.setPaymentdocitemList(jg_paymentdocModelList);
// List<Invoices_item0itemEntity> jg_invoices_item0List = purchaseorderitemService.GetInvoices_item0itemList(id);
// List<Invoices_item0itemModel> jg_invoices_item0ModelList = JsonUtil.getJsonToList(jg_invoices_item0List,Invoices_item0itemModel.class);
// for(Invoices_item0itemModel jg_invoices_item0Model : jg_invoices_item0ModelList){
// }
// vo.setInvoices_item0itemList(jg_invoices_item0ModelList);
QueryWrapper<InvoicesitemEntity> invoicesitemWrapper = new QueryWrapper<>();
invoicesitemWrapper.lambda().eq(InvoicesitemEntity::getPurchaseorderId,id);
List<InvoicesitemEntity> invoicesitemList = invoicesitemService.list(invoicesitemWrapper);
List<Invoices_item0itemEntity> Invoices_item0itemList = new ArrayList<>();
for (InvoicesitemEntity invoicesitemEntity : invoicesitemList){
List<Invoices_item0itemEntity> invoices_item0itemList = purchaseorderitemService.GetInvoices_item0itemList(invoicesitemEntity.getId());
Invoices_item0itemList.addAll(invoices_item0itemList);
}
for(Invoices_item0itemEntity invoices_item0itemEntity : Invoices_item0itemList){
}
vo.setInvoices_item0itemList(JsonUtil.getJsonToList(Invoices_item0itemList,Invoices_item0itemModel.class ));
// List<PaymentitemEntity> jg_paymentList = purchaseorderitemService.GetPaymentitemList(id);
// List<PaymentitemModel> jg_paymentModelList = JsonUtil.getJsonToList(jg_paymentList,PaymentitemModel.class);
// for(PaymentitemModel jg_paymentModel : jg_paymentModelList){
// }
// vo.setPaymentitemList(jg_paymentModelList);
QueryWrapper<PaymentdocpoEntity> PaymentdocpoWrapper = new QueryWrapper<>();
PaymentdocpoWrapper.lambda().eq(PaymentdocpoEntity::getPurchaseOrderNo,entity.getDocumentNo());
List<PaymentdocpoEntity> paymentdocList = paymentdocpoService.list(PaymentdocpoWrapper);
List<PaymentitemEntity> PaymentitemList = new ArrayList<>();
for (PaymentdocpoEntity paymentdocpoEntity : paymentdocList) {
List<PaymentitemEntity> paymentitemlist = purchaseorderitemService.GetPaymentitemList(paymentdocpoEntity.getDocumentNo());
PaymentitemList.addAll(paymentitemlist);
}
for(PaymentitemEntity paymentitemEntity : PaymentitemList){
}
vo.setPaymentitemList(JsonUtil.getJsonToList(PaymentitemList,PaymentitemModel.class ));
List<PurchasebackitemEntity> jg_purchasebackList = purchaseorderitemService.GetPurchasebackitemList(id);
List<PurchasebackitemModel> jg_purchasebackModelList = JsonUtil.getJsonToList(jg_purchasebackList,PurchasebackitemModel.class);
for(PurchasebackitemModel jg_purchasebackModel : jg_purchasebackModelList){
}
vo.setPurchasebackitemList(jg_purchasebackModelList);
// List<CollectionpoEntity> jg_collectionList = purchaseorderitemService.GetCollectionitemList(id);
// List<CollectionitemModel> jg_collectionModelList = JsonUtil.getJsonToList(jg_collectionList,CollectionitemModel.class);
// for(CollectionitemModel jg_collectionModel : jg_collectionModelList){
// }
// vo.setCollectionitemList(jg_collectionModelList);
List<CollectionpoEntity> CollectionitemList = purchaseorderitemService.GetCollectionitemList(entity.getDocumentNo());
for(CollectionpoEntity collectionpoEntity : CollectionitemList){
}
vo.setCollectionitemList(JsonUtil.getJsonToList(CollectionitemList,CollectionitemModel.class ));
//附表数据转换
//添加到详情表单对象中
vo.setDepartmentId(generaterSwapUtil.comSelectValues(vo.getDepartmentId()));
Map<String,Object> contractNameMap = new HashMap<>();
vo.setContractName(generaterSwapUtil.getPopupSelectValue("390143765857220229","contract_name","contract_name",vo.getContractName(),contractNameMap));
vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName()));
return ActionResult.success(vo);
}
@ -425,82 +490,99 @@ public class PurchaseorderController {
*/
@PutMapping("/{id}")
@Transactional
public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid PurchaseorderUpForm purchaseorderUpForm) throws DataException {
UserInfo userInfo=userProvider.get();
PurchaseorderitemEntity entity= purchaseorderitemService.getInfo(id);
if(entity!=null){
PurchaseorderitemEntity subentity=JsonUtil.getJsonToBean(purchaseorderUpForm, PurchaseorderitemEntity.class);
public ActionResult update(@PathVariable("id") String id, @RequestBody @Valid PurchaseorderUpForm purchaseorderUpForm) throws DataException {
UserInfo userInfo = userProvider.get();
PurchaseorderitemEntity entity = purchaseorderitemService.getInfo(id);
if(!entity.getStatus().equals("0")){
String info = "";
switch (entity.getStatus()) {
case "1":
info = "开票中";
break;
case "2":
info = "付款中";
break;
case "3":
info = "归档";
break;
}
return ActionResult.fail("已"+info+"，无法编辑！");
}
if (entity != null) {
PurchaseorderitemEntity subentity = JsonUtil.getJsonToBean(purchaseorderUpForm, PurchaseorderitemEntity.class);
subentity.setCreatorUserName(entity.getCreatorUserName());
subentity.setCreatorTime(entity.getCreatorTime());
purchaseorderitemService.update(id, subentity);
QueryWrapper<Purchaseorder_item0Entity> Purchaseorder_item0queryWrapper = new QueryWrapper<>();
Purchaseorder_item0queryWrapper.lambda().eq(Purchaseorder_item0Entity::getPurchaseorderId, entity.getId());
purchaseorder_item0Service.remove(Purchaseorder_item0queryWrapper);
List<Purchaseorder_item0Entity> Purchaseorder_item0List = JsonUtil.getJsonToList(purchaseorderUpForm.getPurchaseorder_item0List(),Purchaseorder_item0Entity.class);
for(Purchaseorder_item0Entity entitys : Purchaseorder_item0List){
List<Purchaseorder_item0Entity> Purchaseorder_item0List = JsonUtil.getJsonToList(purchaseorderUpForm.getPurchaseorder_item0List(), Purchaseorder_item0Entity.class);
for (Purchaseorder_item0Entity entitys : Purchaseorder_item0List) {
entitys.setId(RandomUtil.uuId());
entitys.setPurchaseorderId(entity.getId());
purchaseorder_item0Service.save(entitys);
}
QueryWrapper<Invoices_item0itemEntity> Invoices_item0itemqueryWrapper = new QueryWrapper<>();
Invoices_item0itemqueryWrapper.lambda().eq(Invoices_item0itemEntity::getPurchaseorderId, entity.getId());
invoices_item0itemService.remove(Invoices_item0itemqueryWrapper);
QueryWrapper<InvoicesitemEntity> InvoicesitemqueryWrapper = new QueryWrapper<>();
InvoicesitemqueryWrapper.lambda().eq(InvoicesitemEntity::getPurchaseorderId, entity.getId());
invoicesitemService.remove(InvoicesitemqueryWrapper);
List<InvoicesitemEntity> InvoicesitemList = JsonUtil.getJsonToList(purchaseorderUpForm.getInvoicesitemList(),InvoicesitemEntity.class);
for(InvoicesitemEntity entitys : InvoicesitemList){
List<Invoices_item0itemEntity> Invoices_item0itemList = JsonUtil.getJsonToList(purchaseorderUpForm.getInvoices_item0itemList(), Invoices_item0itemEntity.class);
for (Invoices_item0itemEntity entitys : Invoices_item0itemList) {
entitys.setId(RandomUtil.uuId());
entitys.setPurchaseorderId(entity.getId());
invoicesitemService.save(entitys);
invoices_item0itemService.save(entitys);
}
QueryWrapper<PaymentdocpoEntity> PaymentdocpoWrapper = new QueryWrapper<>();
PaymentdocpoWrapper.lambda().eq(PaymentdocpoEntity::getPurchaseOrderNo,entity.getDocumentNo());
List<PaymentdocpoEntity> paymentdocList = paymentdocpoService.list(PaymentdocpoWrapper);
QueryWrapper<PaymentdocitemEntity> PaymentdocitemqueryWrapper = new QueryWrapper<>();
PaymentdocitemqueryWrapper.lambda().eq(PaymentdocitemEntity::getPurchaseOrderNo, entity.getId());
paymentdocitemService.remove(PaymentdocitemqueryWrapper);
List<PaymentdocitemEntity> PaymentdocitemList = JsonUtil.getJsonToList(purchaseorderUpForm.getPaymentdocitemList(),PaymentdocitemEntity.class);
for(PaymentdocitemEntity entitys : PaymentdocitemList){
entitys.setId(RandomUtil.uuId());
entitys.setPurchaseOrderNo(entity.getId());
paymentdocitemService.save(entitys);
for (PaymentdocpoEntity paymentdocpoEntity : paymentdocList) {
QueryWrapper<PaymentitemEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(PaymentitemEntity::getPaymentno,paymentdocpoEntity.getDocumentNo());
paymentitemService.remove(queryWrapper);
}
List<PaymentitemEntity> PaymentitemList = JsonUtil.getJsonToList(purchaseorderUpForm.getPaymentitemList(), PaymentitemEntity.class);
for (PaymentitemEntity entitys : PaymentitemList) {
entitys.setId(RandomUtil.uuId());
entitys.setPaymentno(entitys.getPaymentno());
paymentitemService.save(entitys);
}
// QueryWrapper<PaymentitemEntity> PaymentitemqueryWrapper = new QueryWrapper<>();
// PaymentitemqueryWrapper.lambda().eq(PaymentitemEntity::getDocumentno, entity.getDocumentNo());
// paymentitemService.remove(PaymentitemqueryWrapper);
//
// List<PaymentitemEntity> PaymentitemList = JsonUtil.getJsonToList(purchaseorderUpForm.getPaymentitemList(), PaymentitemEntity.class);
// for (PaymentitemEntity entitys : PaymentitemList) {
// entitys.setId(RandomUtil.uuId());
// entitys.setDocumentno(entity.getDocumentNo());
// paymentitemService.save(entitys);
// }
QueryWrapper<PurchasebackitemEntity> PurchasebackitemqueryWrapper = new QueryWrapper<>();
PurchasebackitemqueryWrapper.lambda().eq(PurchasebackitemEntity::getPurchaseOrderId, entity.getId());
purchasebackitemService.remove(PurchasebackitemqueryWrapper);
List<PurchasebackitemEntity> PurchasebackitemList = JsonUtil.getJsonToList(purchaseorderUpForm.getPurchasebackitemList(),PurchasebackitemEntity.class);
for(PurchasebackitemEntity entitys : PurchasebackitemList){
List<PurchasebackitemEntity> PurchasebackitemList = JsonUtil.getJsonToList(purchaseorderUpForm.getPurchasebackitemList(), PurchasebackitemEntity.class);
for (PurchasebackitemEntity entitys : PurchasebackitemList) {
entitys.setId(RandomUtil.uuId());
entitys.setPurchaseOrderId(entity.getId());
purchasebackitemService.save(entitys);
}
QueryWrapper<CollectionpoEntity> CollectionitemqueryWrapper = new QueryWrapper<>();
CollectionitemqueryWrapper.lambda().eq(CollectionpoEntity::getSalesOrderNo, entity.getDocumentNo());
collectionpoService.remove(CollectionitemqueryWrapper);
List<CollectionpoEntity> CollectionitemList = JsonUtil.getJsonToList(purchaseorderUpForm.getCollectionitemList(), CollectionpoEntity.class);
for (CollectionpoEntity entitys : CollectionitemList) {
entitys.setId(RandomUtil.uuId());
entitys.setSalesOrderNo(entity.getDocumentNo());
collectionpoService.save(entitys);
}
return ActionResult.success("更新成功");
}else{
} else {
return ActionResult.fail("更新失败，数据不存在");
}
}
@ -517,20 +599,26 @@ public class PurchaseorderController {
@Transactional
public ActionResult delete(@PathVariable("id") String id){
PurchaseorderitemEntity entity= purchaseorderitemService.getInfo(id);
if (!entity.getStatus().equals("0")){
return ActionResult.fail("该状态下不允许删除！");
}
if(entity!=null){
purchaseorderitemService.delete(entity);
QueryWrapper<Purchaseorder_item0Entity> queryWrapperPurchaseorder_item0=new QueryWrapper<>();
queryWrapperPurchaseorder_item0.lambda().eq(Purchaseorder_item0Entity::getPurchaseorderId,entity.getId());
purchaseorder_item0Service.remove(queryWrapperPurchaseorder_item0);
QueryWrapper<InvoicesitemEntity> queryWrapperInvoicesitem=new QueryWrapper<>();
queryWrapperInvoicesitem.lambda().eq(InvoicesitemEntity::getPurchaseorderId,entity.getId());
invoicesitemService.remove(queryWrapperInvoicesitem);
QueryWrapper<PaymentdocitemEntity> queryWrapperPaymentdocitem=new QueryWrapper<>();
queryWrapperPaymentdocitem.lambda().eq(PaymentdocitemEntity::getPurchaseOrderNo,entity.getId());
paymentdocitemService.remove(queryWrapperPaymentdocitem);
QueryWrapper<Invoices_item0itemEntity> queryWrapperInvoices_item0item=new QueryWrapper<>();
queryWrapperInvoices_item0item.lambda().eq(Invoices_item0itemEntity::getPurchaseorderId,entity.getId());
invoices_item0itemService.remove(queryWrapperInvoices_item0item);
QueryWrapper<PaymentitemEntity> queryWrapperPaymentitem=new QueryWrapper<>();
queryWrapperPaymentitem.lambda().eq(PaymentitemEntity::getDocumentno,entity.getDocumentNo());
paymentitemService.remove(queryWrapperPaymentitem);
QueryWrapper<PurchasebackitemEntity> queryWrapperPurchasebackitem=new QueryWrapper<>();
queryWrapperPurchasebackitem.lambda().eq(PurchasebackitemEntity::getPurchaseOrderId,entity.getId());
purchasebackitemService.remove(queryWrapperPurchasebackitem);
QueryWrapper<CollectionpoEntity> queryWrapperCollectionitem=new QueryWrapper<>();
queryWrapperCollectionitem.lambda().eq(CollectionpoEntity::getSalesOrderNo,entity.getDocumentNo());
collectionpoService.remove(queryWrapperCollectionitem);
}
return ActionResult.success("删除成功");

66
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/ArinvoicesitemEntity.java → SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/CollectionpoEntity.java
Unescape View File

@ -1,4 +1,4 @@
package jnpf.saleorder.entity;
package jnpf.purchaseorder.entity;
import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.TableField;
@ -8,23 +8,20 @@ import lombok.Data;
import java.util.Date;
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-31
* @日期： 2023-02-01
*/
@Data
@TableName("jg_arinvoices")
public class ArinvoicesitemEntity {
@TableName("jg_collection")
public class CollectionpoEntity {
@TableId("ID")
private String id;
@ -68,46 +65,43 @@ public class ArinvoicesitemEntity {
@TableField("DOCUMENT_NO")
private String documentNo;
@TableField("CUSTOMER_CODE")
private String customerCode;
@TableField("CUSTOMER_NAME")
private String customerName;
@TableField("QUANTITY")
private BigDecimal quantity;
@TableField("AMOUNT")
private BigDecimal amount;
@TableField("CURRENCY")
private String currency;
@TableField("SALES_ORDER_NO")
private String salesOrderNo;
@TableField("INVOICE_AMOUNT")
private BigDecimal invoiceAmount;
@TableField("CONTRACT_NAME")
private String contractName;
@TableField("INVOICE_QUANTITY")
private BigDecimal invoiceQuantity;
@TableField("AMOUNT_COLLECTED")
private BigDecimal amountCollected;
@TableField("BUSINESS_DATE")
private Date businessDate;
@TableField("CONTRACT_NAME")
private String contractName;
@TableField("SALES_ORDER_NO")
private String salesOrderNo;
@TableField("STATUS")
private String status;
@TableField("CUSTOMER_TAX_NO")
private String customerTaxNo;
@TableField("CUSTOMER_CODE")
private String customerCode;
@TableField("CUSTOMER_ADDRESS")
private String customerAddress;
@TableField("CUSTOMER_NAME")
private String customerName;
@TableField("CURRENCY")
private String currency;
@TableField("PAYMENT_TYPE")
private String paymentType;
@TableField("SETTLEMENT_TYPE")
private String settlementType;
@TableField("REMARK")
private String remark;
@TableField("COLLECTION_COUNT")
private String collectionCount;
@TableField("COLLECTION_BANK")
private String collectionBank;
}

110
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/Invoices_item0itemEntity.java
Unescape View File

@ -0,0 +1,110 @@
package jnpf.purchaseorder.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 com.fasterxml.jackson.annotation.JsonProperty;
/**
*
* 应付发票明细
* @版本： V3.2.0
* @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-01
*/
@Data
@TableName("jg_invoices_item0")
public class Invoices_item0itemEntity {
@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("INVOICE_CODE")
private String invoiceCode;
@TableField("INVOICE_NO")
private String invoiceNo;
@TableField("INVOICE_QUANTITY")
private BigDecimal invoiceQuantity;
@TableField("INVOICE_AMOUNT")
private BigDecimal invoiceAmount;
@TableField("TAX_RATE")
private String taxRate;
@TableField("TAX_AMOUNT")
private BigDecimal taxAmount;
@TableField("AMOUNT_NOT_TAX")
private BigDecimal amountNotTax;
@TableField("INVOICE_STATUS")
private String invoiceStatus;
@TableField("INVOICE_ATTACHMENT")
private String invoiceAttachment;
@TableField("INVOICING_DATE")
private Date invoicingDate;
@TableField("REMARK")
private String remark;
@TableField("INVOICES_ID")
private String invoicesId;
@TableField("MATERIAL_NAME")
private String materialName;
@TableField("PURCHASEORDER_ID")
private String purchaseorderId;
}

9
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/InvoicesitemEntity.java
Unescape View File

@ -1,17 +1,12 @@
package jnpf.purchaseorder.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 com.fasterxml.jackson.annotation.JsonProperty;
import java.util.Date;
/**
@ -20,7 +15,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @版本： V3.2.0
* @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队
* @日期： 2023-01-30
* @日期： 2023-01-29
*/
@Data
@TableName("jg_invoices")

10
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PaymentdocitemEntity.java → SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PaymentdocpoEntity.java
Unescape View File

@ -1,16 +1,12 @@
package jnpf.purchaseorder.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 com.fasterxml.jackson.annotation.JsonProperty;
import java.util.Date;
/**
@ -19,11 +15,11 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @版本： V3.2.0
* @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队
* @日期： 2023-01-30
* @日期： 2023-01-14
*/
@Data
@TableName("jg_paymentdoc")
public class PaymentdocitemEntity {
public class PaymentdocpoEntity {
@TableId("ID")
private String id;

117
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PaymentitemEntity.java
Unescape View File

@ -0,0 +1,117 @@
package jnpf.purchaseorder.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 com.fasterxml.jackson.annotation.JsonProperty;
/**
*
* 付款单
* @版本： V3.2.0
* @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-01
*/
@Data
@TableName("jg_payment")
public class PaymentitemEntity {
@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("DOCUMENTNO")
private String documentno;
@TableField("PAYMENTNO")
private String paymentno;
@TableField("PAYMENTAMOUNT")
private BigDecimal paymentamount;
@TableField("REQUESTEDAMOUNT")
private BigDecimal requestedamount;
@TableField("BUSINESSDATE")
private Date businessdate;
@TableField("DUEDATE")
private Date duedate;
@TableField("STATUS")
private String status;
@TableField("SUPPLIERCODE")
private String suppliercode;
@TableField("SUPPLIERNAME")
private String suppliername;
@TableField("CURRENCY")
private String currency;
@TableField("PAYMENTTYPE")
private String paymenttype;
@TableField("SETTLEMENTTYPE")
private String settlementtype;
@TableField("REMARK")
private String remark;
@TableField("COLLECTIONACCOUNT")
private String collectionaccount;
@TableField("COLLECTIONBANK")
private String collectionbank;
@TableField("PAYMENTACCOUNT")
private String paymentaccount;
@TableField("PAYMENTBANK")
private String paymentbank;
}

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

@ -19,7 +19,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @版本： V3.2.0
* @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队
* @日期： 2023-01-30
* @日期： 2023-02-01
*/
@Data
@TableName("jg_purchaseback")

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

@ -21,7 +21,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @版本： V3.2.0
* @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队
* @日期： 2023-01-30
* @日期： 2023-02-01
*/
@Data
@TableName("jg_purchaseorder_item0")

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

@ -26,7 +26,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @版本： V3.2.0
* @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队
* @日期： 2023-01-30
* @日期： 2023-02-01
*/
@Data
@TableName("jg_purchaseorder")

8
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PaymentdocitemMapper.java → SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/CollectionpoMapper.java
Unescape View File

@ -1,17 +1,17 @@
package jnpf.purchaseorder.mapper;
import jnpf.purchaseorder.entity.PaymentdocitemEntity;
import jnpf.purchaseorder.entity.CollectionpoEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
*
* jg_paymentdoc
* jg_collection
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-30
* 日期： 2023-02-01
*/
public interface PaymentdocitemMapper extends BaseMapper<PaymentdocitemEntity> {
public interface CollectionpoMapper extends BaseMapper<CollectionpoEntity> {
}

17
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/Invoices_item0itemMapper.java
Unescape View File

@ -0,0 +1,17 @@
package jnpf.purchaseorder.mapper;
import jnpf.purchaseorder.entity.Invoices_item0itemEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
*
* jg_invoices_item0
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-01
*/
public interface Invoices_item0itemMapper extends BaseMapper<Invoices_item0itemEntity> {
}

6
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/InvoicesitemMapper.java
Unescape View File

@ -1,16 +1,16 @@
package jnpf.purchaseorder.mapper;
import jnpf.purchaseorder.entity.InvoicesitemEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import jnpf.purchaseorder.entity.InvoicesitemEntity;
/**
*
* jg_invoices
* invoices
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-30
* 日期： 2023-01-29
*/
public interface InvoicesitemMapper extends BaseMapper<InvoicesitemEntity> {

17
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PaymentdocpoMapper.java
Unescape View File

@ -0,0 +1,17 @@
package jnpf.purchaseorder.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import jnpf.purchaseorder.entity.PaymentdocpoEntity;
/**
*
* paymentdoc
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-14
*/
public interface PaymentdocpoMapper extends BaseMapper<PaymentdocpoEntity> {
}

17
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PaymentitemMapper.java
Unescape View File

@ -0,0 +1,17 @@
package jnpf.purchaseorder.mapper;
import jnpf.purchaseorder.entity.PaymentitemEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
*
* jg_payment
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-01
*/
public interface PaymentitemMapper extends BaseMapper<PaymentitemEntity> {
}

2
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PurchasebackitemMapper.java
Unescape View File

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-30
* 日期： 2023-02-01
*/
public interface PurchasebackitemMapper extends BaseMapper<PurchasebackitemEntity> {

2
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/Purchaseorder_item0Mapper.java
Unescape View File

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-30
* 日期： 2023-02-01
*/
public interface Purchaseorder_item0Mapper extends BaseMapper<Purchaseorder_item0Entity> {

2
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PurchaseorderitemMapper.java
Unescape View File

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-30
* 日期： 2023-02-01
*/
public interface PurchaseorderitemMapper extends BaseMapper<PurchaseorderitemEntity> {

25
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PaymentdocitemModel.java → SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/CollectionitemModel.java
Unescape View File

@ -13,20 +13,31 @@ import com.alibaba.fastjson.annotation.JSONField;
* 版本： V3.2.0
* 版权: LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-30
* 日期： 2023-02-01
*/
@Data
public class PaymentdocitemModel {
public class CollectionitemModel {
/** 付款单号 **/
/** 收款单号 **/
@JsonProperty("documentNo")
private String documentNo;
/** 付款金额 **/
@JsonProperty("paymentAmount")
private String paymentAmount;
/** 收款单号 **/
@JsonProperty("salesOrderNo")
private String salesOrderNo;
/** 付款类型 **/
/** 收款时间 **/
@JsonProperty("creatorTime")
private Long creatorTime;
/** 收款金额 **/
@JsonProperty("amountCollected")
private String amountCollected;
/** 付款方式 **/
@JsonProperty("settlementType")
private String settlementType;
/** 单据状态 **/
@JsonProperty("paymentType")
private String paymentType;

61
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/Invoices_item0itemModel.java
Unescape View File

@ -0,0 +1,61 @@
package jnpf.purchaseorder.model.purchaseorder;
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-02-01
*/
@Data
public class Invoices_item0itemModel {
/** 发票编号 **/
@JsonProperty("invoiceNo")
private String invoiceNo;
/** 发票代码 **/
@JsonProperty("invoiceCode")
private String invoiceCode;
/** 金额 **/
@JsonProperty("invoiceAmount")
private String invoiceAmount;
/** 税率 **/
@JsonProperty("taxRate")
private String taxRate;
/** 不含税金额 **/
@JsonProperty("amountNotTax")
private String amountNotTax;
/** 税额 **/
@JsonProperty("taxAmount")
private String taxAmount;
/** 发票状态 **/
@JsonProperty("invoiceStatus")
private String invoiceStatus;
/** 开票时间 **/
@JsonProperty("invoicingDate")
private Long invoicingDate;
/** 开票人 **/
@JsonProperty("creatorUserName")
private String creatorUserName;
/** 发票附件 **/
@JsonProperty("invoiceAttachment")
private String invoiceAttachment;
}

26
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/InvoicesitemModel.java
Unescape View File

@ -1,26 +0,0 @@
package jnpf.purchaseorder.model.purchaseorder;
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-30
*/
@Data
public class InvoicesitemModel {
/** 单据编号 **/
@JsonProperty("documentNo")
private String documentNo;
}

49
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PaymentitemModel.java
Unescape View File

@ -0,0 +1,49 @@
package jnpf.purchaseorder.model.purchaseorder;
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-02-01
*/
@Data
public class PaymentitemModel {
/** 付款单号 **/
@JsonProperty("documentno")
private String documentno;
/** 付款单号 **/
@JsonProperty("paymentno")
private String paymentno;
/** 付款时间 **/
@JsonProperty("duedate")
private Long duedate;
/** 付款金额 **/
@JsonProperty("paymentamount")
private String paymentamount;
/** 付款方式 **/
@JsonProperty("settlementtype")
private String settlementtype;
/** 备注 **/
@JsonProperty("remark")
private String remark;
/** 付款人 **/
@JsonProperty("creatorUserName")
private String creatorUserName;
}

11
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchasebackitemModel.java
Unescape View File

@ -13,7 +13,7 @@ import com.alibaba.fastjson.annotation.JSONField;
* 版本： V3.2.0
* 版权: LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-30
* 日期： 2023-02-01
*/
@Data
public class PurchasebackitemModel {
@ -22,13 +22,20 @@ public class PurchasebackitemModel {
@JsonProperty("documentNo")
private String documentNo;
/** 退货时间 **/
@JsonProperty("creatorTime")
private Long creatorTime;
/** 退货数量 **/
@JsonProperty("refundNum")
private String refundNum;
/** 退款金额 **/
/** 应退金额 **/
@JsonProperty("refundAmount")
private String refundAmount;
/** 退货人 **/
@JsonProperty("creatorUserName")
private String creatorUserName;
}

58
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderCrForm.java
Unescape View File

@ -3,9 +3,10 @@
package jnpf.purchaseorder.model.purchaseorder;
import jnpf.purchaseorder.model.purchaseorder.Purchaseorder_item0Model;
import jnpf.purchaseorder.model.purchaseorder.InvoicesitemModel;
import jnpf.purchaseorder.model.purchaseorder.PaymentdocitemModel;
import jnpf.purchaseorder.model.purchaseorder.Invoices_item0itemModel;
import jnpf.purchaseorder.model.purchaseorder.PaymentitemModel;
import jnpf.purchaseorder.model.purchaseorder.PurchasebackitemModel;
import jnpf.purchaseorder.model.purchaseorder.CollectionitemModel;
import lombok.Data;
import java.util.List;
import java.math.BigDecimal;
@ -18,7 +19,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @版本： V3.2.0
* @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队
* @日期： 2023-01-30
* @日期： 2023-02-01
*/
@Data
public class PurchaseorderCrForm {
@ -27,27 +28,31 @@ public class PurchaseorderCrForm {
@JsonProperty("documentNo")
private String documentNo;
/** 供应商 **/
@JsonProperty("supplierName")
private String supplierName;
/** 合同编码 **/
@JsonProperty("contractCode")
private String contractCode;
/** 合同名称 **/
@JsonProperty("contractName")
private String contractName;
/** 制单人 **/
@JsonProperty("creatorUserName")
private String creatorUserName;
/** 供应商名称 **/
@JsonProperty("supplierName")
private String supplierName;
/** 部门id **/
@JsonProperty("departmentId")
private String departmentId;
/** 币种 **/
@JsonProperty("currency")
private String currency;
/** 对方合同 **/
/** 对方合同号 **/
@JsonProperty("contractNo")
private String contractNo;
/** 数量 **/
/** 垫资金额 **/
@JsonProperty("advanceAmount")
private String advanceAmount;
/** 重量 **/
@JsonProperty("num")
private String num;
@ -59,17 +64,17 @@ public class PurchaseorderCrForm {
@JsonProperty("notAmount")
private String notAmount;
/** 币别 **/
@JsonProperty("currency")
private String currency;
/** 备注信息 **/
@JsonProperty("remark")
private String remark;
/** 制单人 **/
@JsonProperty("creatorUserName")
private String creatorUserName;
/** 制单时间 **/
@JsonProperty("creatorTime")
private Long creatorTime;
private String creatorTime;
/** ERP订单号 **/
@JsonProperty("erpNo")
@ -87,10 +92,6 @@ public class PurchaseorderCrForm {
@JsonProperty("invoiceAmount")
private String invoiceAmount;
/** 垫资金额 **/
@JsonProperty("advanceAmount")
private String advanceAmount;
/** 单据状态 **/
@JsonProperty("status")
private String status;
@ -99,14 +100,17 @@ public class PurchaseorderCrForm {
@JsonProperty("purchaseorder_item0List")
private List<Purchaseorder_item0Model> purchaseorder_item0List;
/** 子表数据 **/
@JsonProperty("invoicesitemList")
private List<InvoicesitemModel> invoicesitemList;
@JsonProperty("invoices_item0itemList")
private List<Invoices_item0itemModel> invoices_item0itemList;
/** 子表数据 **/
@JsonProperty("paymentdocitemList")
private List<PaymentdocitemModel> paymentdocitemList;
@JsonProperty("paymentitemList")
private List<PaymentitemModel> paymentitemList;
/** 子表数据 **/
@JsonProperty("purchasebackitemList")
private List<PurchasebackitemModel> purchasebackitemList;
/** 子表数据 **/
@JsonProperty("collectionitemList")
private List<CollectionitemModel> collectionitemList;
}

59
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderInfoVO.java
Unescape View File

@ -4,9 +4,10 @@
package jnpf.purchaseorder.model.purchaseorder;
import jnpf.purchaseorder.model.purchaseorder.Purchaseorder_item0Model;
import jnpf.purchaseorder.model.purchaseorder.InvoicesitemModel;
import jnpf.purchaseorder.model.purchaseorder.PaymentdocitemModel;
import jnpf.purchaseorder.model.purchaseorder.Invoices_item0itemModel;
import jnpf.purchaseorder.model.purchaseorder.PaymentitemModel;
import jnpf.purchaseorder.model.purchaseorder.PurchasebackitemModel;
import jnpf.purchaseorder.model.purchaseorder.CollectionitemModel;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.List;
@ -19,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
* @版本： V3.2.0
* @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队
* @日期： 2023-01-30
* @日期： 2023-02-01
*/
@Data
public class PurchaseorderInfoVO{
@ -31,27 +32,31 @@ public class PurchaseorderInfoVO{
@JsonProperty("documentNo")
private String documentNo;
/** 供应商 **/
@JsonProperty("supplierName")
private String supplierName;
/** 合同编码 **/
@JsonProperty("contractCode")
private String contractCode;
/** 合同名称 **/
@JsonProperty("contractName")
private String contractName;
/** 制单人 **/
@JsonProperty("creatorUserName")
private String creatorUserName;
/** 供应商名称 **/
@JsonProperty("supplierName")
private String supplierName;
/** 部门id **/
@JsonProperty("departmentId")
private String departmentId;
/** 币种 **/
@JsonProperty("currency")
private String currency;
/** 对方合同 **/
/** 对方合同号 **/
@JsonProperty("contractNo")
private String contractNo;
/** 数量 **/
/** 垫资金额 **/
@JsonProperty("advanceAmount")
private String advanceAmount;
/** 重量 **/
@JsonProperty("num")
private String num;
@ -63,17 +68,18 @@ public class PurchaseorderInfoVO{
@JsonProperty("notAmount")
private String notAmount;
/** 币别 **/
@JsonProperty("currency")
private String currency;
/** 备注信息 **/
@JsonProperty("remark")
private String remark;
/** 制单人 **/
@JsonProperty("creatorUserName")
private String creatorUserName;
/** 制单时间 **/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonProperty("creatorTime")
private Long creatorTime;
private Date creatorTime;
/** ERP订单号 **/
@JsonProperty("erpNo")
@ -91,10 +97,6 @@ public class PurchaseorderInfoVO{
@JsonProperty("invoiceAmount")
private String invoiceAmount;
/** 垫资金额 **/
@JsonProperty("advanceAmount")
private String advanceAmount;
/** 单据状态 **/
@JsonProperty("status")
private String status;
@ -103,12 +105,15 @@ public class PurchaseorderInfoVO{
@JsonProperty("purchaseorder_item0List")
private List<Purchaseorder_item0Model> purchaseorder_item0List;
/** 子表数据 **/
@JsonProperty("invoicesitemList")
private List<InvoicesitemModel> invoicesitemList;
@JsonProperty("invoices_item0itemList")
private List<Invoices_item0itemModel> invoices_item0itemList;
/** 子表数据 **/
@JsonProperty("paymentdocitemList")
private List<PaymentdocitemModel> paymentdocitemList;
@JsonProperty("paymentitemList")
private List<PaymentitemModel> paymentitemList;
/** 子表数据 **/
@JsonProperty("purchasebackitemList")
private List<PurchasebackitemModel> purchasebackitemList;
/** 子表数据 **/
@JsonProperty("collectionitemList")
private List<CollectionitemModel> collectionitemList;
}

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

@ -10,7 +10,7 @@ import java.util.List;
* @版本： V3.2.0
* @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队
* @日期： 2023-01-30
* @日期： 2023-02-01
*/
@Data
public class PurchaseorderListQuery extends Pagination {

47
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderListVO.java
Unescape View File

@ -15,7 +15,7 @@ import java.math.BigDecimal;
* @版本： V3.2.0
* @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队
* @日期： 2023-01-30
* @日期： 2023-02-01
*/
@Data
public class PurchaseorderListVO{
@ -28,10 +28,9 @@ public class PurchaseorderListVO{
@JsonProperty("documentNo")
private String documentNo;
/** 供应商 **/
@JsonProperty("supplierName")
private String supplierName;
/** 合同编码 **/
@JsonProperty("contractCode")
private String contractCode;
/** 合同名称 **/
@ -39,22 +38,27 @@ public class PurchaseorderListVO{
private String contractName;
/** 制单人 **/
@JsonProperty("creatorUserName")
private String creatorUserName;
/** 供应商名称 **/
@JsonProperty("supplierName")
private String supplierName;
/** 部门id **/
@JsonProperty("departmentId")
private String departmentId;
/** 币种 **/
@JsonProperty("currency")
private String currency;
/** 对方合同 **/
/** 对方合同号 **/
@JsonProperty("contractNo")
private String contractNo;
/** 数量 **/
/** 垫资金额 **/
@JsonProperty("advanceAmount")
private String advanceAmount;
/** 重量 **/
@JsonProperty("num")
private String num;
@ -69,18 +73,18 @@ public class PurchaseorderListVO{
private String notAmount;
/** 币别 **/
@JsonProperty("currency")
private String currency;
/** 备注信息 **/
@JsonProperty("remark")
private String remark;
/** 制单人 **/
@JsonProperty("creatorUserName")
private String creatorUserName;
/** 制单时间 **/
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@JsonProperty("creatorTime")
private Date creatorTime;
@ -105,11 +109,6 @@ public class PurchaseorderListVO{
private String invoiceAmount;
/** 垫资金额 **/
@JsonProperty("advanceAmount")
private String advanceAmount;
/** 单据状态 **/
@JsonProperty("status")
private String status;

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

@ -11,7 +11,7 @@ import java.util.List;
* @版本： V3.2.0
* @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队
* @日期： 2023-01-30
* @日期： 2023-02-01
*/
@Data
public class PurchaseorderPagination extends Pagination {

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

@ -9,7 +9,7 @@ import java.util.*;
* @版本： V3.2.0
* @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队
* @日期： 2023-01-30
* @日期： 2023-02-01
*/
@Data
public class PurchaseorderPaginationExportModel extends Pagination {

63
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderUpForm.java
Unescape View File

@ -3,9 +3,10 @@
package jnpf.purchaseorder.model.purchaseorder;
import jnpf.purchaseorder.model.purchaseorder.Purchaseorder_item0Model;
import jnpf.purchaseorder.model.purchaseorder.InvoicesitemModel;
import jnpf.purchaseorder.model.purchaseorder.PaymentdocitemModel;
import jnpf.purchaseorder.model.purchaseorder.Invoices_item0itemModel;
import jnpf.purchaseorder.model.purchaseorder.PaymentitemModel;
import jnpf.purchaseorder.model.purchaseorder.PurchasebackitemModel;
import jnpf.purchaseorder.model.purchaseorder.CollectionitemModel;
import lombok.Data;
import java.util.List;
import java.math.BigDecimal;
@ -19,7 +20,7 @@ import lombok.Data;
* @版本： V3.2.0
* @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队
* @日期： 2023-01-30
* @日期： 2023-02-01
*/
@Data
public class PurchaseorderUpForm{
@ -31,10 +32,9 @@ public class PurchaseorderUpForm{
@JsonProperty("documentNo")
private String documentNo;
/** 供应商 **/
@JsonProperty("supplierName")
private String supplierName;
/** 合同编码 **/
@JsonProperty("contractCode")
private String contractCode;
/** 合同名称 **/
@ -42,22 +42,27 @@ public class PurchaseorderUpForm{
private String contractName;
/** 制单人 **/
@JsonProperty("creatorUserName")
private String creatorUserName;
/** 供应商名称 **/
@JsonProperty("supplierName")
private String supplierName;
/** 部门id **/
@JsonProperty("departmentId")
private String departmentId;
/** 币种 **/
@JsonProperty("currency")
private String currency;
/** 对方合同 **/
/** 对方合同号 **/
@JsonProperty("contractNo")
private String contractNo;
/** 数量 **/
/** 垫资金额 **/
@JsonProperty("advanceAmount")
private String advanceAmount;
/** 重量 **/
@JsonProperty("num")
private String num;
@ -72,19 +77,19 @@ public class PurchaseorderUpForm{
private String notAmount;
/** 币别 **/
@JsonProperty("currency")
private String currency;
/** 备注信息 **/
@JsonProperty("remark")
private String remark;
/** 制单人 **/
@JsonProperty("creatorUserName")
private String creatorUserName;
/** 制单时间 **/
@JsonProperty("creatorTime")
private Long creatorTime;
private String creatorTime;
/** ERP订单号 **/
@ -107,11 +112,6 @@ public class PurchaseorderUpForm{
private String invoiceAmount;
/** 垫资金额 **/
@JsonProperty("advanceAmount")
private String advanceAmount;
/** 单据状态 **/
@JsonProperty("status")
private String status;
@ -120,13 +120,16 @@ public class PurchaseorderUpForm{
@JsonProperty("purchaseorder_item0List")
private List<Purchaseorder_item0Model> purchaseorder_item0List;
/** 子表数据 **/
@JsonProperty("invoicesitemList")
private List<InvoicesitemModel> invoicesitemList;
@JsonProperty("invoices_item0itemList")
private List<Invoices_item0itemModel> invoices_item0itemList;
/** 子表数据 **/
@JsonProperty("paymentdocitemList")
private List<PaymentdocitemModel> paymentdocitemList;
@JsonProperty("paymentitemList")
private List<PaymentitemModel> paymentitemList;
/** 子表数据 **/
@JsonProperty("purchasebackitemList")
private List<PurchasebackitemModel> purchasebackitemList;
/** 子表数据 **/
@JsonProperty("collectionitemList")
private List<CollectionitemModel> collectionitemList;
}

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

@ -13,7 +13,7 @@ import com.alibaba.fastjson.annotation.JSONField;
* 版本： V3.2.0
* 版权: LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-30
* 日期： 2023-02-01
*/
@Data
public class Purchaseorder_item0Model {
@ -26,7 +26,7 @@ public class Purchaseorder_item0Model {
@JsonProperty("materialName")
private String materialName;
/** 磅单类型 **/
/** 类型 **/
@JsonProperty("pountType")
private String pountType;
@ -66,5 +66,13 @@ public class Purchaseorder_item0Model {
@JsonProperty("remark")
private String remark;
/** 磅单图片 **/
@JsonProperty("poundPictures")
private String poundPictures;
/** 车辆图片 **/
@JsonProperty("vehiclePictures")
private String vehiclePictures;
}

8
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/PaymentdocitemService.java → SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/CollectionpoService.java
Unescape View File

@ -1,15 +1,15 @@
package jnpf.purchaseorder.service;
import jnpf.purchaseorder.entity.PaymentdocitemEntity;
import jnpf.purchaseorder.entity.CollectionpoEntity;
import com.baomidou.mybatisplus.extension.service.IService;
/**
*
* jg_paymentdoc
* jg_collection
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-30
* 日期： 2023-02-01
*/
public interface PaymentdocitemService extends IService<PaymentdocitemEntity> {
public interface CollectionpoService extends IService<CollectionpoEntity> {
}

15
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/Invoices_item0itemService.java
Unescape View File

@ -0,0 +1,15 @@
package jnpf.purchaseorder.service;
import jnpf.purchaseorder.entity.Invoices_item0itemEntity;
import com.baomidou.mybatisplus.extension.service.IService;
/**
*
* jg_invoices_item0
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-01
*/
public interface Invoices_item0itemService extends IService<Invoices_item0itemEntity> {
}

11
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/InvoicesitemService.java
Unescape View File

@ -1,15 +1,20 @@
package jnpf.purchaseorder.service;
import jnpf.purchaseorder.entity.InvoicesitemEntity;
import com.baomidou.mybatisplus.extension.service.IService;
import jnpf.purchaseorder.entity.InvoicesitemEntity;
import java.util.List;
/**
*
* jg_invoices
* invoices
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-30
* 日期： 2023-01-29
*/
public interface InvoicesitemService extends IService<InvoicesitemEntity> {
}

21
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/PaymentdocpoService.java
Unescape View File

@ -0,0 +1,21 @@
package jnpf.purchaseorder.service;
import com.baomidou.mybatisplus.extension.service.IService;
import jnpf.paymentdoc.entity.Paymentdoc_item0Entity;
import jnpf.paymentdoc.model.paymentdoc.PaymentdocPagination;
import jnpf.purchaseorder.entity.PaymentdocpoEntity;
import java.util.List;
/**
*
* paymentdoc
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-14
*/
public interface PaymentdocpoService extends IService<PaymentdocpoEntity> {
}

15
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/PaymentitemService.java
Unescape View File

@ -0,0 +1,15 @@
package jnpf.purchaseorder.service;
import jnpf.purchaseorder.entity.PaymentitemEntity;
import com.baomidou.mybatisplus.extension.service.IService;
/**
*
* jg_payment
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-01
*/
public interface PaymentitemService extends IService<PaymentitemEntity> {
}

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

@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-30
* 日期： 2023-02-01
*/
public interface PurchasebackitemService extends IService<PurchasebackitemEntity> {

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

@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-30
* 日期： 2023-02-01
*/
public interface Purchaseorder_item0Service extends IService<Purchaseorder_item0Entity> {

13
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/PurchaseorderitemService.java
Unescape View File

@ -1,8 +1,10 @@
package jnpf.purchaseorder.service;
import jnpf.purchaseorder.entity.Purchaseorder_item0Entity;
import jnpf.purchaseorder.entity.InvoicesitemEntity;
import jnpf.purchaseorder.entity.PaymentdocitemEntity;
import jnpf.purchaseorder.entity.Invoices_item0itemEntity;
import jnpf.purchaseorder.entity.PaymentitemEntity;
import jnpf.purchaseorder.entity.PurchasebackitemEntity;
import jnpf.purchaseorder.entity.CollectionpoEntity;
import jnpf.purchaseorder.entity.PurchaseorderitemEntity;
import com.baomidou.mybatisplus.extension.service.IService;
import jnpf.purchaseorder.model.purchaseorder.PurchaseorderPagination;
@ -13,7 +15,7 @@ import java.util.*;
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-30
* 日期： 2023-02-01
*/
public interface PurchaseorderitemService extends IService<PurchaseorderitemEntity> {
@ -33,9 +35,10 @@ public interface PurchaseorderitemService extends IService<PurchaseorderitemEnti
// 子表方法
List<Purchaseorder_item0Entity> GetPurchaseorder_item0List(String id);
List<InvoicesitemEntity> GetInvoicesitemList(String id);
List<PaymentdocitemEntity> GetPaymentdocitemList(String id);
List<Invoices_item0itemEntity> GetInvoices_item0itemList(String id);
List<PaymentitemEntity> GetPaymentitemList(String id);
List<PurchasebackitemEntity> GetPurchasebackitemList(String id);
List<CollectionpoEntity> GetCollectionitemList(String id);
//列表子表数据方法
}

23
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/CollectionpoServiceImpl.java
Unescape View File

@ -0,0 +1,23 @@
package jnpf.purchaseorder.service.impl;
import jnpf.purchaseorder.entity.*;
import jnpf.purchaseorder.mapper.CollectionpoMapper;
import jnpf.purchaseorder.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
/**
*
* jg_collection
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-01
*/
@Service
public class CollectionpoServiceImpl extends ServiceImpl<CollectionpoMapper, CollectionpoEntity> implements CollectionpoService {
}

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

@ -0,0 +1,41 @@
package jnpf.purchaseorder.service.impl;
import jnpf.purchaseorder.entity.*;
import jnpf.purchaseorder.mapper.Invoices_item0itemMapper;
import jnpf.purchaseorder.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_invoices_item0
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-01
*/
@Service
public class Invoices_item0itemServiceImpl extends ServiceImpl<Invoices_item0itemMapper, Invoices_item0itemEntity> implements Invoices_item0itemService{
}

49
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/InvoicesitemServiceImpl.java
Unescape View File

@ -1,41 +1,40 @@
package jnpf.purchaseorder.service.impl;
import jnpf.purchaseorder.entity.*;
import jnpf.purchaseorder.mapper.InvoicesitemMapper;
import jnpf.purchaseorder.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.annotation.TableField;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.purchaseorder.entity.*;
import jnpf.invoices.service.InvoicesService;
import jnpf.invoices.service.Invoices_item0Service;
import jnpf.permission.model.authorize.AuthorizeConditionModel;
import jnpf.permission.service.AuthorizeService;
import jnpf.purchaseorder.mapper.InvoicesitemMapper;
import jnpf.purchaseorder.service.InvoicesitemService;
import jnpf.util.ServletUtil;
import jnpf.util.StringUtil;
import jnpf.util.UserProvider;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
/**
*
* jg_invoices
* invoices
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-30
* 日期： 2023-01-29
*/
@Service
public class InvoicesitemServiceImpl extends ServiceImpl<InvoicesitemMapper, InvoicesitemEntity> implements InvoicesitemService{
public class InvoicesitemServiceImpl extends ServiceImpl<InvoicesitemMapper, InvoicesitemEntity> implements InvoicesitemService {
}

43
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PaymentdocpoServiceImpl.java
Unescape View File

@ -0,0 +1,43 @@
package jnpf.purchaseorder.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.paymentdoc.entity.Paymentdoc_item0Entity;
import jnpf.paymentdoc.mapper.PaymentdocMapper;
import jnpf.paymentdoc.model.paymentdoc.PaymentdocPagination;
import jnpf.paymentdoc.service.PaymentdocService;
import jnpf.paymentdoc.service.Paymentdoc_item0Service;
import jnpf.permission.model.authorize.AuthorizeConditionModel;
import jnpf.permission.service.AuthorizeService;
import jnpf.purchaseorder.entity.PaymentdocpoEntity;
import jnpf.purchaseorder.mapper.PaymentdocpoMapper;
import jnpf.purchaseorder.service.PaymentdocpoService;
import jnpf.util.ServletUtil;
import jnpf.util.StringUtil;
import jnpf.util.UserProvider;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
/**
*
* paymentdoc
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-14
*/
@Service
public class PaymentdocpoServiceImpl extends ServiceImpl<PaymentdocpoMapper, PaymentdocpoEntity> implements PaymentdocpoService {
}

8
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PaymentdocitemServiceImpl.java → SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PaymentitemServiceImpl.java
Unescape View File

@ -1,7 +1,7 @@
package jnpf.purchaseorder.service.impl;
import jnpf.purchaseorder.entity.*;
import jnpf.purchaseorder.mapper.PaymentdocitemMapper;
import jnpf.purchaseorder.mapper.PaymentitemMapper;
import jnpf.purchaseorder.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.util.RandomUtil;
@ -28,14 +28,14 @@ import java.util.*;
/**
*
* jg_paymentdoc
* jg_payment
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-30
* 日期： 2023-02-01
*/
@Service
public class PaymentdocitemServiceImpl extends ServiceImpl<PaymentdocitemMapper, PaymentdocitemEntity> implements PaymentdocitemService{
public class PaymentitemServiceImpl extends ServiceImpl<PaymentitemMapper, PaymentitemEntity> implements PaymentitemService{
}

2
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchasebackitemServiceImpl.java
Unescape View File

@ -32,7 +32,7 @@ import java.util.*;
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-30
* 日期： 2023-02-01
*/
@Service
public class PurchasebackitemServiceImpl extends ServiceImpl<PurchasebackitemMapper, PurchasebackitemEntity> implements PurchasebackitemService{

2
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/Purchaseorder_item0ServiceImpl.java
Unescape View File

@ -32,7 +32,7 @@ import java.util.*;
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-30
* 日期： 2023-02-01
*/
@Service
public class Purchaseorder_item0ServiceImpl extends ServiceImpl<Purchaseorder_item0Mapper, Purchaseorder_item0Entity> implements Purchaseorder_item0Service{

180
SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java
Unescape View File

@ -29,7 +29,7 @@ import java.util.*;
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-30
* 日期： 2023-02-01
*/
@Service
public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemMapper, PurchaseorderitemEntity> implements PurchaseorderitemService {
@ -46,14 +46,17 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
private Purchaseorder_item0Service purchaseorder_item0Service;
@Autowired
private InvoicesitemService invoicesitemService;
private Invoices_item0itemService invoices_item0itemService;
@Autowired
private PaymentdocitemService paymentdocitemService;
private PaymentitemService paymentitemService;
@Autowired
private PurchasebackitemService purchasebackitemService;
@Autowired
private CollectionpoService collectionpoService;
@ -66,12 +69,14 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
QueryWrapper<PurchaseorderitemEntity> purchaseorderQueryWrapper=new QueryWrapper<>();
int purchaseorder_item0Num =0;
QueryWrapper<Purchaseorder_item0Entity> purchaseorder_item0QueryWrapper=new QueryWrapper<>();
int invoicesitemNum =0;
QueryWrapper<InvoicesitemEntity> invoicesitemQueryWrapper=new QueryWrapper<>();
int paymentdocitemNum =0;
QueryWrapper<PaymentdocitemEntity> paymentdocitemQueryWrapper=new QueryWrapper<>();
int purchasebackitemNum =0;
QueryWrapper<PurchasebackitemEntity> purchasebackitemQueryWrapper=new QueryWrapper<>();
int invoices_item0itemNum =0;
QueryWrapper<Invoices_item0itemEntity> invoices_item0itemQueryWrapper=new QueryWrapper<>();
int paymentitemNum =0;
QueryWrapper<PaymentitemEntity> paymentitemQueryWrapper=new QueryWrapper<>();
int collectionitemNum =0;
QueryWrapper<CollectionpoEntity> collectionitemQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
@ -91,26 +96,33 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
purchaseorder_item0QueryWrapper = (QueryWrapper<Purchaseorder_item0Entity>)purchaseorder_item0Obj;
purchaseorder_item0Num++;
}
Object invoicesitemObj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesitemQueryWrapper,purchaseorderPagination.getMenuId(),"invoicesitem"));
if (ObjectUtil.isEmpty(invoicesitemObj)){
Object purchasebackitemObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackitemQueryWrapper,purchaseorderPagination.getMenuId(),"purchasebackitem"));
if (ObjectUtil.isEmpty(purchasebackitemObj)){
return new ArrayList<>();
} else {
invoicesitemQueryWrapper = (QueryWrapper<InvoicesitemEntity>)invoicesitemObj;
invoicesitemNum++;
purchasebackitemQueryWrapper = (QueryWrapper<PurchasebackitemEntity>)purchasebackitemObj;
purchasebackitemNum++;
}
Object paymentdocitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocitemQueryWrapper,purchaseorderPagination.getMenuId(),"paymentdocitem"));
if (ObjectUtil.isEmpty(paymentdocitemObj)){
Object invoices_item0itemObj=authorizeService.getCondition(new AuthorizeConditionModel(invoices_item0itemQueryWrapper,purchaseorderPagination.getMenuId(),"invoices_item0item"));
if (ObjectUtil.isEmpty(invoices_item0itemObj)){
return new ArrayList<>();
} else {
paymentdocitemQueryWrapper = (QueryWrapper<PaymentdocitemEntity>)paymentdocitemObj;
paymentdocitemNum++;
invoices_item0itemQueryWrapper = (QueryWrapper<Invoices_item0itemEntity>)invoices_item0itemObj;
invoices_item0itemNum++;
}
Object purchasebackitemObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackitemQueryWrapper,purchaseorderPagination.getMenuId(),"purchasebackitem"));
if (ObjectUtil.isEmpty(purchasebackitemObj)){
Object paymentitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentitemQueryWrapper,purchaseorderPagination.getMenuId(),"paymentitem"));
if (ObjectUtil.isEmpty(paymentitemObj)){
return new ArrayList<>();
} else {
purchasebackitemQueryWrapper = (QueryWrapper<PurchasebackitemEntity>)purchasebackitemObj;
purchasebackitemNum++;
paymentitemQueryWrapper = (QueryWrapper<PaymentitemEntity>)paymentitemObj;
paymentitemNum++;
}
Object collectionitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper,purchaseorderPagination.getMenuId(),"collectionitem"));
if (ObjectUtil.isEmpty(collectionitemObj)){
return new ArrayList<>();
} else {
collectionitemQueryWrapper = (QueryWrapper<CollectionpoEntity>)collectionitemObj;
collectionitemNum++;
}
}
}
@ -134,30 +146,39 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
}
Object invoicesitemObj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesitemQueryWrapper,purchaseorderPagination.getMenuId(),"invoicesitem"));
if (ObjectUtil.isEmpty(invoicesitemObj)){
Object purchasebackitemObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackitemQueryWrapper,purchaseorderPagination.getMenuId(),"purchasebackitem"));
if (ObjectUtil.isEmpty(purchasebackitemObj)){
return new ArrayList<>();
} else {
invoicesitemQueryWrapper = (QueryWrapper<InvoicesitemEntity>)invoicesitemObj;
invoicesitemNum++;
purchasebackitemQueryWrapper = (QueryWrapper<PurchasebackitemEntity>)purchasebackitemObj;
purchasebackitemNum++;
}
Object paymentdocitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocitemQueryWrapper,purchaseorderPagination.getMenuId(),"paymentdocitem"));
if (ObjectUtil.isEmpty(paymentdocitemObj)){
Object invoices_item0itemObj=authorizeService.getCondition(new AuthorizeConditionModel(invoices_item0itemQueryWrapper,purchaseorderPagination.getMenuId(),"invoices_item0item"));
if (ObjectUtil.isEmpty(invoices_item0itemObj)){
return new ArrayList<>();
} else {
paymentdocitemQueryWrapper = (QueryWrapper<PaymentdocitemEntity>)paymentdocitemObj;
paymentdocitemNum++;
invoices_item0itemQueryWrapper = (QueryWrapper<Invoices_item0itemEntity>)invoices_item0itemObj;
invoices_item0itemNum++;
}
Object purchasebackitemObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackitemQueryWrapper,purchaseorderPagination.getMenuId(),"purchasebackitem"));
if (ObjectUtil.isEmpty(purchasebackitemObj)){
Object paymentitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentitemQueryWrapper,purchaseorderPagination.getMenuId(),"paymentitem"));
if (ObjectUtil.isEmpty(paymentitemObj)){
return new ArrayList<>();
} else {
purchasebackitemQueryWrapper = (QueryWrapper<PurchasebackitemEntity>)purchasebackitemObj;
purchasebackitemNum++;
paymentitemQueryWrapper = (QueryWrapper<PaymentitemEntity>)paymentitemObj;
paymentitemNum++;
}
Object collectionitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper,purchaseorderPagination.getMenuId(),"collectionitem"));
if (ObjectUtil.isEmpty(collectionitemObj)){
return new ArrayList<>();
} else {
collectionitemQueryWrapper = (QueryWrapper<CollectionpoEntity>)collectionitemObj;
collectionitemNum++;
}
@ -204,12 +225,14 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
QueryWrapper<PurchaseorderitemEntity> purchaseorderQueryWrapper=new QueryWrapper<>();
int purchaseorder_item0Num =0;
QueryWrapper<Purchaseorder_item0Entity> purchaseorder_item0QueryWrapper=new QueryWrapper<>();
int invoicesitemNum =0;
QueryWrapper<InvoicesitemEntity> invoicesitemQueryWrapper=new QueryWrapper<>();
int paymentdocitemNum =0;
QueryWrapper<PaymentdocitemEntity> paymentdocitemQueryWrapper=new QueryWrapper<>();
int purchasebackitemNum =0;
QueryWrapper<PurchasebackitemEntity> purchasebackitemQueryWrapper=new QueryWrapper<>();
int invoices_item0itemNum =0;
QueryWrapper<Invoices_item0itemEntity> invoices_item0itemQueryWrapper=new QueryWrapper<>();
int paymentitemNum =0;
QueryWrapper<PaymentitemEntity> paymentitemQueryWrapper=new QueryWrapper<>();
int collectionitemNum =0;
QueryWrapper<CollectionpoEntity> collectionitemQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
@ -229,26 +252,33 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
purchaseorder_item0QueryWrapper = (QueryWrapper<Purchaseorder_item0Entity>)purchaseorder_item0Obj;
purchaseorder_item0Num++;
}
Object invoicesitemObj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesitemQueryWrapper,purchaseorderPagination.getMenuId(),"invoicesitem"));
if (ObjectUtil.isEmpty(invoicesitemObj)){
Object purchasebackitemObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackitemQueryWrapper,purchaseorderPagination.getMenuId(),"purchasebackitem"));
if (ObjectUtil.isEmpty(purchasebackitemObj)){
return new ArrayList<>();
} else {
invoicesitemQueryWrapper = (QueryWrapper<InvoicesitemEntity>)invoicesitemObj;
invoicesitemNum++;
purchasebackitemQueryWrapper = (QueryWrapper<PurchasebackitemEntity>)purchasebackitemObj;
purchasebackitemNum++;
}
Object paymentdocitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocitemQueryWrapper,purchaseorderPagination.getMenuId(),"paymentdocitem"));
if (ObjectUtil.isEmpty(paymentdocitemObj)){
Object invoices_item0itemObj=authorizeService.getCondition(new AuthorizeConditionModel(invoices_item0itemQueryWrapper,purchaseorderPagination.getMenuId(),"invoices_item0item"));
if (ObjectUtil.isEmpty(invoices_item0itemObj)){
return new ArrayList<>();
} else {
paymentdocitemQueryWrapper = (QueryWrapper<PaymentdocitemEntity>)paymentdocitemObj;
paymentdocitemNum++;
invoices_item0itemQueryWrapper = (QueryWrapper<Invoices_item0itemEntity>)invoices_item0itemObj;
invoices_item0itemNum++;
}
Object purchasebackitemObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackitemQueryWrapper,purchaseorderPagination.getMenuId(),"purchasebackitem"));
if (ObjectUtil.isEmpty(purchasebackitemObj)){
Object paymentitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentitemQueryWrapper,purchaseorderPagination.getMenuId(),"paymentitem"));
if (ObjectUtil.isEmpty(paymentitemObj)){
return new ArrayList<>();
} else {
purchasebackitemQueryWrapper = (QueryWrapper<PurchasebackitemEntity>)purchasebackitemObj;
purchasebackitemNum++;
paymentitemQueryWrapper = (QueryWrapper<PaymentitemEntity>)paymentitemObj;
paymentitemNum++;
}
Object collectionitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper,purchaseorderPagination.getMenuId(),"collectionitem"));
if (ObjectUtil.isEmpty(collectionitemObj)){
return new ArrayList<>();
} else {
collectionitemQueryWrapper = (QueryWrapper<CollectionpoEntity>)collectionitemObj;
collectionitemNum++;
}
}
}
@ -272,30 +302,39 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
}
Object invoicesitemObj=authorizeService.getCondition(new AuthorizeConditionModel(invoicesitemQueryWrapper,purchaseorderPagination.getMenuId(),"invoicesitem"));
if (ObjectUtil.isEmpty(invoicesitemObj)){
Object purchasebackitemObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackitemQueryWrapper,purchaseorderPagination.getMenuId(),"purchasebackitem"));
if (ObjectUtil.isEmpty(purchasebackitemObj)){
return new ArrayList<>();
} else {
purchasebackitemQueryWrapper = (QueryWrapper<PurchasebackitemEntity>)purchasebackitemObj;
purchasebackitemNum++;
}
Object invoices_item0itemObj=authorizeService.getCondition(new AuthorizeConditionModel(invoices_item0itemQueryWrapper,purchaseorderPagination.getMenuId(),"invoices_item0item"));
if (ObjectUtil.isEmpty(invoices_item0itemObj)){
return new ArrayList<>();
} else {
invoicesitemQueryWrapper = (QueryWrapper<InvoicesitemEntity>)invoicesitemObj;
invoicesitemNum++;
invoices_item0itemQueryWrapper = (QueryWrapper<Invoices_item0itemEntity>)invoices_item0itemObj;
invoices_item0itemNum++;
}
Object paymentdocitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentdocitemQueryWrapper,purchaseorderPagination.getMenuId(),"paymentdocitem"));
if (ObjectUtil.isEmpty(paymentdocitemObj)){
Object paymentitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentitemQueryWrapper,purchaseorderPagination.getMenuId(),"paymentitem"));
if (ObjectUtil.isEmpty(paymentitemObj)){
return new ArrayList<>();
} else {
paymentdocitemQueryWrapper = (QueryWrapper<PaymentdocitemEntity>)paymentdocitemObj;
paymentdocitemNum++;
paymentitemQueryWrapper = (QueryWrapper<PaymentitemEntity>)paymentitemObj;
paymentitemNum++;
}
Object purchasebackitemObj=authorizeService.getCondition(new AuthorizeConditionModel(purchasebackitemQueryWrapper,purchaseorderPagination.getMenuId(),"purchasebackitem"));
if (ObjectUtil.isEmpty(purchasebackitemObj)){
Object collectionitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper,purchaseorderPagination.getMenuId(),"collectionitem"));
if (ObjectUtil.isEmpty(collectionitemObj)){
return new ArrayList<>();
} else {
purchasebackitemQueryWrapper = (QueryWrapper<PurchasebackitemEntity>)purchasebackitemObj;
purchasebackitemNum++;
collectionitemQueryWrapper = (QueryWrapper<CollectionpoEntity>)collectionitemObj;
collectionitemNum++;
}
@ -369,16 +408,16 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
return purchaseorder_item0Service.list(queryWrapper);
}
@Override
public List<InvoicesitemEntity> GetInvoicesitemList(String id){
QueryWrapper<InvoicesitemEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(InvoicesitemEntity::getPurchaseorderId, id);
return invoicesitemService.list(queryWrapper);
public List<Invoices_item0itemEntity> GetInvoices_item0itemList(String id){
QueryWrapper<Invoices_item0itemEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(Invoices_item0itemEntity::getInvoicesId, id);
return invoices_item0itemService.list(queryWrapper);
}
@Override
public List<PaymentdocitemEntity> GetPaymentdocitemList(String id){
QueryWrapper<PaymentdocitemEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(PaymentdocitemEntity::getPurchaseOrderNo, id);
return paymentdocitemService.list(queryWrapper);
public List<PaymentitemEntity> GetPaymentitemList(String id){
QueryWrapper<PaymentitemEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(PaymentitemEntity::getPaymentno, id);
return paymentitemService.list(queryWrapper);
}
@Override
public List<PurchasebackitemEntity> GetPurchasebackitemList(String id){
@ -386,6 +425,13 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl<PurchaseorderitemM
queryWrapper.lambda().eq(PurchasebackitemEntity::getPurchaseOrderId, id);
return purchasebackitemService.list(queryWrapper);
}
@Override
public List<CollectionpoEntity> GetCollectionitemList(String id){
QueryWrapper<CollectionpoEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(CollectionpoEntity::getSalesOrderNo, id);
queryWrapper.lambda().eq(CollectionpoEntity::getPaymentType,3);
return collectionpoService.list(queryWrapper);
}
//列表子表数据方法

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

@ -19,10 +19,11 @@ import org.springframework.transaction.annotation.Transactional;
import jnpf.saleorder.model.saleorder.*;
import jnpf.saleorder.model.saleorder.SaleorderPagination;
import jnpf.saleorder.entity.Salesorder_item0Entity;
import jnpf.saleorder.entity.ReceiptoutitemEntity;
import jnpf.saleorder.entity.CollectionitemEntity;
import jnpf.saleorder.entity.ArinvoicesitemEntity;
import jnpf.saleorder.entity.SalesbackitemEntity;
import jnpf.saleorder.entity.ReceiptoutsoitemEntity;
import jnpf.saleorder.entity.CollectionsoitemEntity;
import jnpf.saleorder.entity.Arinvoices_item0soitemEntity;
import jnpf.saleorder.entity.SalesbacksoitemEntity;
import jnpf.saleorder.entity.PaymentsoitemEntity;
import jnpf.util.*;
import lombok.extern.slf4j.Slf4j;
import lombok.Cleanup;
@ -33,10 +34,11 @@ import org.springframework.web.bind.annotation.RestController;
import jnpf.saleorder.entity.SaleorderitemEntity;
import jnpf.saleorder.service.SaleorderitemService;
import jnpf.saleorder.service.Salesorder_item0Service;
import jnpf.saleorder.service.ReceiptoutitemService;
import jnpf.saleorder.service.CollectionitemService;
import jnpf.saleorder.service.ArinvoicesitemService;
import jnpf.saleorder.service.SalesbackitemService;
import jnpf.saleorder.service.ReceiptoutsoitemService;
import jnpf.saleorder.service.CollectionsoitemService;
import jnpf.saleorder.service.Arinvoices_item0soitemService;
import jnpf.saleorder.service.SalesbacksoitemService;
import jnpf.saleorder.service.PaymentsoitemService;
import org.springframework.web.bind.annotation.*;
import org.springframework.beans.factory.annotation.Autowired;
@ -55,12 +57,12 @@ import jnpf.util.enums.FileTypeEnum;
* @版本： V3.2.0
* @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队
* @日期： 2023-01-31
* @日期： 2023-02-03
*/
@Slf4j
@RestController
@Api(tags = "saleorder" , value = "salesorder")
@RequestMapping("/api/salesorder/Saleorder")
@Api(tags = "saleorder" , value = "saleorder")
@RequestMapping("/api/saleorder/Saleorder")
public class SaleorderController {
@Autowired
@ -78,13 +80,15 @@ public class SaleorderController {
@Autowired
private Salesorder_item0Service salesorder_item0Service;
@Autowired
private ReceiptoutitemService receiptoutitemService;
private ReceiptoutsoitemService receiptoutsoitemService;
@Autowired
private CollectionitemService collectionitemService;
private CollectionsoitemService collectionsoitemService;
@Autowired
private ArinvoicesitemService arinvoicesitemService;
private Arinvoices_item0soitemService arinvoices_item0soitemService;
@Autowired
private SalesbackitemService salesbackitemService;
private SalesbacksoitemService salesbacksoitemService;
@Autowired
private PaymentsoitemService paymentsoitemService;
@ -99,7 +103,9 @@ public class SaleorderController {
List<SaleorderitemEntity> list= saleorderitemService.getList(saleorderPagination);
//处理id字段转名称，若无需转或者为空可删除
for(SaleorderitemEntity entity:list){
entity.setDepartmentId(generaterSwapUtil.comSelectValues(entity.getDepartmentId()));
Map<String,Object> contractNameMap = new HashMap<>();
entity.setContractName(generaterSwapUtil.getPopupSelectValue("391146878474963333","contract_name","contract_name",entity.getContractName(),contractNameMap));
entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName()));
}
List<SaleorderListVO> listVO=JsonUtil.getJsonToList(list,SaleorderListVO.class);
for(SaleorderListVO saleorderVO:listVO){
@ -125,6 +131,8 @@ public class SaleorderController {
public ActionResult create(@RequestBody @Valid SaleorderCrForm saleorderCrForm) throws DataException {
String mainId =RandomUtil.uuId();
UserInfo userInfo=userProvider.get();
saleorderCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("bxdj", false));
saleorderCrForm.setCreatorUserName(userInfo.getUserId());
SaleorderitemEntity entity = JsonUtil.getJsonToBean(saleorderCrForm, SaleorderitemEntity.class);
entity.setId(mainId);
saleorderitemService.save(entity);
@ -146,44 +154,66 @@ public class SaleorderController {
salesorder_item0Service.save(entitys);
}
List<ReceiptoutitemEntity> ReceiptoutitemList = JsonUtil.getJsonToList(saleorderCrForm.getReceiptoutitemList(),ReceiptoutitemEntity.class);
for(ReceiptoutitemEntity entitys : ReceiptoutitemList){
List<ReceiptoutsoitemEntity> ReceiptoutsoitemList = JsonUtil.getJsonToList(saleorderCrForm.getReceiptoutsoitemList(),ReceiptoutsoitemEntity.class);
for(ReceiptoutsoitemEntity entitys : ReceiptoutsoitemList){
entitys.setId(RandomUtil.uuId());
entitys.setSourceNo(entity.getDocumentNo());
receiptoutitemService.save(entitys);
receiptoutsoitemService.save(entitys);
}
List<CollectionitemEntity> CollectionitemList = JsonUtil.getJsonToList(saleorderCrForm.getCollectionitemList(),CollectionitemEntity.class);
for(CollectionitemEntity entitys : CollectionitemList){
List<CollectionsoitemEntity> CollectionsoitemList = JsonUtil.getJsonToList(saleorderCrForm.getCollectionsoitemList(),CollectionsoitemEntity.class);
for(CollectionsoitemEntity entitys : CollectionsoitemList){
entitys.setId(RandomUtil.uuId());
entitys.setSalesOrderNo(entity.getId());
entitys.setSalesOrderNo(entity.getDocumentNo());
collectionitemService.save(entitys);
collectionsoitemService.save(entitys);
}
List<ArinvoicesitemEntity> ArinvoicesitemList = JsonUtil.getJsonToList(saleorderCrForm.getArinvoicesitemList(),ArinvoicesitemEntity.class);
for(ArinvoicesitemEntity entitys : ArinvoicesitemList){
List<Arinvoices_item0soitemEntity> Arinvoices_item0soitemList = JsonUtil.getJsonToList(saleorderCrForm.getArinvoices_item0soitemList(),Arinvoices_item0soitemEntity.class);
for(Arinvoices_item0soitemEntity entitys : Arinvoices_item0soitemList){
entitys.setId(RandomUtil.uuId());
entitys.setSalesOrderNo(entity.getId());
entitys.setSalesOrderNo(entity.getDocumentNo());
arinvoicesitemService.save(entitys);
arinvoices_item0soitemService.save(entitys);
}
List<SalesbackitemEntity> SalesbackitemList = JsonUtil.getJsonToList(saleorderCrForm.getSalesbackitemList(),SalesbackitemEntity.class);
for(SalesbackitemEntity entitys : SalesbackitemList){
List<SalesbacksoitemEntity> SalesbacksoitemList = JsonUtil.getJsonToList(saleorderCrForm.getSalesbacksoitemList(),SalesbacksoitemEntity.class);
for(SalesbacksoitemEntity entitys : SalesbacksoitemList){
entitys.setId(RandomUtil.uuId());
entitys.setSalesOrderId(entity.getId());
salesbackitemService.save(entitys);
salesbacksoitemService.save(entitys);
}
List<PaymentsoitemEntity> PaymentsoitemList = JsonUtil.getJsonToList(saleorderCrForm.getPaymentsoitemList(),PaymentsoitemEntity.class);
for(PaymentsoitemEntity entitys : PaymentsoitemList){
entitys.setId(RandomUtil.uuId());
entitys.setPaymentno(entity.getDocumentNo());
paymentsoitemService.save(entitys);
}
@ -226,7 +256,9 @@ public class SaleorderController {
List<SaleorderitemEntity> list= saleorderitemService.getTypeList(saleorderPagination,saleorderPaginationExportModel.getDataType());
//处理id字段转名称，若无需转或者为空可删除
for(SaleorderitemEntity entity:list){
entity.setDepartmentId(generaterSwapUtil.comSelectValues(entity.getDepartmentId()));
Map<String,Object> contractNameMap = new HashMap<>();
entity.setContractName(generaterSwapUtil.getPopupSelectValue("391146878474963333","contract_name","contract_name",entity.getContractName(),contractNameMap));
entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName()));
}
List<SaleorderListVO> listVO=JsonUtil.getJsonToList(list,SaleorderListVO.class);
for(SaleorderListVO saleorderVO:listVO){
@ -252,15 +284,15 @@ public class SaleorderController {
case "contractName" :
entitys.add(new ExcelExportEntity("合同名称" ,"contractName"));
break;
case "creatorUserName" :
entitys.add(new ExcelExportEntity("制单人" ,"creatorUserName"));
break;
case "departmentId" :
entitys.add(new ExcelExportEntity("采购部门" ,"departmentId"));
case "currency" :
entitys.add(new ExcelExportEntity("币别" ,"currency"));
break;
case "contractNo" :
entitys.add(new ExcelExportEntity("对方合同" ,"contractNo"));
break;
case "advanceAmount" :
entitys.add(new ExcelExportEntity("垫资金额" ,"advanceAmount"));
break;
case "num" :
entitys.add(new ExcelExportEntity("数量" ,"num"));
break;
@ -270,9 +302,6 @@ public class SaleorderController {
case "notPrice" :
entitys.add(new ExcelExportEntity("不含税金额" ,"notPrice"));
break;
case "currency" :
entitys.add(new ExcelExportEntity("币别" ,"currency"));
break;
case "remark" :
entitys.add(new ExcelExportEntity("备注信息" ,"remark"));
break;
@ -294,6 +323,9 @@ public class SaleorderController {
case "status" :
entitys.add(new ExcelExportEntity("单据状态 " ,"status"));
break;
case "creatorUserName" :
entitys.add(new ExcelExportEntity("制单人" ,"creatorUserName"));
break;
default:
break;
}
@ -357,28 +389,33 @@ public class SaleorderController {
public ActionResult<SaleorderInfoVO> info(@PathVariable("id") String id){
SaleorderitemEntity entity= saleorderitemService.getInfo(id);
SaleorderInfoVO vo=JsonUtil.getJsonToBean(entity, SaleorderInfoVO.class);
vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName()));
//子表
List<Salesorder_item0Entity> Salesorder_item0List = saleorderitemService.GetSalesorder_item0List(id);
for(Salesorder_item0Entity salesorder_item0Entity : Salesorder_item0List){
}
vo.setSalesorder_item0List(JsonUtil.getJsonToList(Salesorder_item0List,Salesorder_item0Model.class ));
List<ReceiptoutitemEntity> ReceiptoutitemList = saleorderitemService.GetReceiptoutitemList(id);
for(ReceiptoutitemEntity receiptoutitemEntity : ReceiptoutitemList){
List<ReceiptoutsoitemEntity> ReceiptoutsoitemList = saleorderitemService.GetReceiptoutsoitemList(id);
for(ReceiptoutsoitemEntity receiptoutsoitemEntity : ReceiptoutsoitemList){
}
vo.setReceiptoutitemList(JsonUtil.getJsonToList(ReceiptoutitemList,ReceiptoutitemModel.class ));
List<CollectionitemEntity> CollectionitemList = saleorderitemService.GetCollectionitemList(id);
for(CollectionitemEntity collectionitemEntity : CollectionitemList){
vo.setReceiptoutsoitemList(JsonUtil.getJsonToList(ReceiptoutsoitemList,ReceiptoutsoitemModel.class ));
List<CollectionsoitemEntity> CollectionsoitemList = saleorderitemService.GetCollectionsoitemList(id);
for(CollectionsoitemEntity collectionsoitemEntity : CollectionsoitemList){
}
vo.setCollectionitemList(JsonUtil.getJsonToList(CollectionitemList,CollectionitemModel.class ));
List<ArinvoicesitemEntity> ArinvoicesitemList = saleorderitemService.GetArinvoicesitemList(id);
for(ArinvoicesitemEntity arinvoicesitemEntity : ArinvoicesitemList){
vo.setCollectionsoitemList(JsonUtil.getJsonToList(CollectionsoitemList,CollectionsoitemModel.class ));
List<Arinvoices_item0soitemEntity> Arinvoices_item0soitemList = saleorderitemService.GetArinvoices_item0soitemList(id);
for(Arinvoices_item0soitemEntity arinvoices_item0soitemEntity : Arinvoices_item0soitemList){
}
vo.setArinvoicesitemList(JsonUtil.getJsonToList(ArinvoicesitemList,ArinvoicesitemModel.class ));
List<SalesbackitemEntity> SalesbackitemList = saleorderitemService.GetSalesbackitemList(id);
for(SalesbackitemEntity salesbackitemEntity : SalesbackitemList){
vo.setArinvoices_item0soitemList(JsonUtil.getJsonToList(Arinvoices_item0soitemList,Arinvoices_item0soitemModel.class ));
List<SalesbacksoitemEntity> SalesbacksoitemList = saleorderitemService.GetSalesbacksoitemList(id);
for(SalesbacksoitemEntity salesbacksoitemEntity : SalesbacksoitemList){
}
vo.setSalesbackitemList(JsonUtil.getJsonToList(SalesbackitemList,SalesbackitemModel.class ));
vo.setSalesbacksoitemList(JsonUtil.getJsonToList(SalesbacksoitemList,SalesbacksoitemModel.class ));
List<PaymentsoitemEntity> PaymentsoitemList = saleorderitemService.GetPaymentsoitemList(id);
for(PaymentsoitemEntity paymentsoitemEntity : PaymentsoitemList){
}
vo.setPaymentsoitemList(JsonUtil.getJsonToList(PaymentsoitemList,PaymentsoitemModel.class ));
//副表
return ActionResult.success(vo);
}
@ -398,35 +435,43 @@ public class SaleorderController {
List<Salesorder_item0Entity> jg_salesorder_item0List = saleorderitemService.GetSalesorder_item0List(id);
List<Salesorder_item0Model> jg_salesorder_item0ModelList = JsonUtil.getJsonToList(jg_salesorder_item0List,Salesorder_item0Model.class);
for(Salesorder_item0Model jg_salesorder_item0Model : jg_salesorder_item0ModelList){
Map<String,Object> licenseNumMap = new HashMap<>();
jg_salesorder_item0Model.setLicenseNum(generaterSwapUtil.getPopupSelectValue("383568082196537541","license_num","license_num",jg_salesorder_item0Model.getLicenseNum(),licenseNumMap));
// Map<String,Object> licenseNumMap = new HashMap<>();
// jg_salesorder_item0Model.setLicenseNum(generaterSwapUtil.getPopupSelectValue("391151974030035653","license_no","license_no",jg_salesorder_item0Model.getLicenseNum(),licenseNumMap));
}
vo.setSalesorder_item0List(jg_salesorder_item0ModelList);
List<ReceiptoutitemEntity> jg_receiptoutList = saleorderitemService.GetReceiptoutitemList(id);
List<ReceiptoutitemModel> jg_receiptoutModelList = JsonUtil.getJsonToList(jg_receiptoutList,ReceiptoutitemModel.class);
for(ReceiptoutitemModel jg_receiptoutModel : jg_receiptoutModelList){
List<ReceiptoutsoitemEntity> jg_receiptoutList = saleorderitemService.GetReceiptoutsoitemList(id);
List<ReceiptoutsoitemModel> jg_receiptoutModelList = JsonUtil.getJsonToList(jg_receiptoutList,ReceiptoutsoitemModel.class);
for(ReceiptoutsoitemModel jg_receiptoutModel : jg_receiptoutModelList){
}
vo.setReceiptoutsoitemList(jg_receiptoutModelList);
List<CollectionsoitemEntity> jg_collectionList = saleorderitemService.GetCollectionsoitemList(id);
List<CollectionsoitemModel> jg_collectionModelList = JsonUtil.getJsonToList(jg_collectionList,CollectionsoitemModel.class);
for(CollectionsoitemModel jg_collectionModel : jg_collectionModelList){
}
vo.setReceiptoutitemList(jg_receiptoutModelList);
List<CollectionitemEntity> jg_collectionList = saleorderitemService.GetCollectionitemList(id);
List<CollectionitemModel> jg_collectionModelList = JsonUtil.getJsonToList(jg_collectionList,CollectionitemModel.class);
for(CollectionitemModel jg_collectionModel : jg_collectionModelList){
vo.setCollectionsoitemList(jg_collectionModelList);
List<Arinvoices_item0soitemEntity> jg_arinvoices_item0List = saleorderitemService.GetArinvoices_item0soitemList(id);
List<Arinvoices_item0soitemModel> jg_arinvoices_item0ModelList = JsonUtil.getJsonToList(jg_arinvoices_item0List,Arinvoices_item0soitemModel.class);
for(Arinvoices_item0soitemModel jg_arinvoices_item0Model : jg_arinvoices_item0ModelList){
jg_arinvoices_item0Model.setAttachMent(generaterSwapUtil.getFileNameInJson(jg_arinvoices_item0Model.getAttachMent()));
}
vo.setCollectionitemList(jg_collectionModelList);
List<ArinvoicesitemEntity> jg_arinvoicesList = saleorderitemService.GetArinvoicesitemList(id);
List<ArinvoicesitemModel> jg_arinvoicesModelList = JsonUtil.getJsonToList(jg_arinvoicesList,ArinvoicesitemModel.class);
for(ArinvoicesitemModel jg_arinvoicesModel : jg_arinvoicesModelList){
vo.setArinvoices_item0soitemList(jg_arinvoices_item0ModelList);
List<SalesbacksoitemEntity> jg_salesbackList = saleorderitemService.GetSalesbacksoitemList(id);
List<SalesbacksoitemModel> jg_salesbackModelList = JsonUtil.getJsonToList(jg_salesbackList,SalesbacksoitemModel.class);
for(SalesbacksoitemModel jg_salesbackModel : jg_salesbackModelList){
}
vo.setArinvoicesitemList(jg_arinvoicesModelList);
List<SalesbackitemEntity> jg_salesbackList = saleorderitemService.GetSalesbackitemList(id);
List<SalesbackitemModel> jg_salesbackModelList = JsonUtil.getJsonToList(jg_salesbackList,SalesbackitemModel.class);
for(SalesbackitemModel jg_salesbackModel : jg_salesbackModelList){
vo.setSalesbacksoitemList(jg_salesbackModelList);
List<PaymentsoitemEntity> jg_paymentList = saleorderitemService.GetPaymentsoitemList(id);
List<PaymentsoitemModel> jg_paymentModelList = JsonUtil.getJsonToList(jg_paymentList,PaymentsoitemModel.class);
for(PaymentsoitemModel jg_paymentModel : jg_paymentModelList){
}
vo.setSalesbackitemList(jg_salesbackModelList);
vo.setPaymentsoitemList(jg_paymentModelList);
//附表数据转换
//添加到详情表单对象中
vo.setDepartmentId(generaterSwapUtil.comSelectValues(vo.getDepartmentId()));
Map<String,Object> contractNameMap = new HashMap<>();
vo.setContractName(generaterSwapUtil.getPopupSelectValue("391146878474963333","contract_name","contract_name",vo.getContractName(),contractNameMap));
vo.setCreatorUserName(generaterSwapUtil.userSelectValue(vo.getCreatorUserName()));
return ActionResult.success(vo);
}
@ -447,6 +492,7 @@ public class SaleorderController {
SaleorderitemEntity entity= saleorderitemService.getInfo(id);
if(entity!=null){
SaleorderitemEntity subentity=JsonUtil.getJsonToBean(saleorderUpForm, SaleorderitemEntity.class);
subentity.setCreatorUserName(entity.getCreatorUserName());
saleorderitemService.update(id, subentity);
QueryWrapper<Salesorder_item0Entity> Salesorder_item0queryWrapper = new QueryWrapper<>();
@ -472,63 +518,90 @@ public class SaleorderController {
}
QueryWrapper<ReceiptoutitemEntity> ReceiptoutitemqueryWrapper = new QueryWrapper<>();
ReceiptoutitemqueryWrapper.lambda().eq(ReceiptoutitemEntity::getSourceNo, entity.getDocumentNo());
receiptoutitemService.remove(ReceiptoutitemqueryWrapper);
QueryWrapper<ReceiptoutsoitemEntity> ReceiptoutsoitemqueryWrapper = new QueryWrapper<>();
ReceiptoutsoitemqueryWrapper.lambda().eq(ReceiptoutsoitemEntity::getSourceNo, entity.getDocumentNo());
receiptoutsoitemService.remove(ReceiptoutsoitemqueryWrapper);
List<ReceiptoutitemEntity> ReceiptoutitemList = JsonUtil.getJsonToList(saleorderUpForm.getReceiptoutitemList(),ReceiptoutitemEntity.class);
for(ReceiptoutitemEntity entitys : ReceiptoutitemList){
List<ReceiptoutsoitemEntity> ReceiptoutsoitemList = JsonUtil.getJsonToList(saleorderUpForm.getReceiptoutsoitemList(),ReceiptoutsoitemEntity.class);
for(ReceiptoutsoitemEntity entitys : ReceiptoutsoitemList){
entitys.setId(RandomUtil.uuId());
entitys.setSourceNo(entity.getDocumentNo());
receiptoutitemService.save(entitys);
receiptoutsoitemService.save(entitys);
}
QueryWrapper<CollectionitemEntity> CollectionitemqueryWrapper = new QueryWrapper<>();
CollectionitemqueryWrapper.lambda().eq(CollectionitemEntity::getSalesOrderNo, entity.getId());
collectionitemService.remove(CollectionitemqueryWrapper);
QueryWrapper<CollectionsoitemEntity> CollectionsoitemqueryWrapper = new QueryWrapper<>();
CollectionsoitemqueryWrapper.lambda().eq(CollectionsoitemEntity::getSalesOrderNo, entity.getDocumentNo());
collectionsoitemService.remove(CollectionsoitemqueryWrapper);
List<CollectionitemEntity> CollectionitemList = JsonUtil.getJsonToList(saleorderUpForm.getCollectionitemList(),CollectionitemEntity.class);
for(CollectionitemEntity entitys : CollectionitemList){
List<CollectionsoitemEntity> CollectionsoitemList = JsonUtil.getJsonToList(saleorderUpForm.getCollectionsoitemList(),CollectionsoitemEntity.class);
for(CollectionsoitemEntity entitys : CollectionsoitemList){
entitys.setId(RandomUtil.uuId());
entitys.setSalesOrderNo(entity.getId());
collectionitemService.save(entitys);
entitys.setSalesOrderNo(entity.getDocumentNo());
collectionsoitemService.save(entitys);
}
QueryWrapper<ArinvoicesitemEntity> ArinvoicesitemqueryWrapper = new QueryWrapper<>();
ArinvoicesitemqueryWrapper.lambda().eq(ArinvoicesitemEntity::getSalesOrderNo, entity.getId());
arinvoicesitemService.remove(ArinvoicesitemqueryWrapper);
QueryWrapper<Arinvoices_item0soitemEntity> Arinvoices_item0soitemqueryWrapper = new QueryWrapper<>();
Arinvoices_item0soitemqueryWrapper.lambda().eq(Arinvoices_item0soitemEntity::getSalesOrderNo, entity.getDocumentNo());
arinvoices_item0soitemService.remove(Arinvoices_item0soitemqueryWrapper);
List<Arinvoices_item0soitemEntity> Arinvoices_item0soitemList = JsonUtil.getJsonToList(saleorderUpForm.getArinvoices_item0soitemList(),Arinvoices_item0soitemEntity.class);
for(Arinvoices_item0soitemEntity entitys : Arinvoices_item0soitemList){
List<ArinvoicesitemEntity> ArinvoicesitemList = JsonUtil.getJsonToList(saleorderUpForm.getArinvoicesitemList(),ArinvoicesitemEntity.class);
for(ArinvoicesitemEntity entitys : ArinvoicesitemList){
entitys.setId(RandomUtil.uuId());
entitys.setSalesOrderNo(entity.getId());
arinvoicesitemService.save(entitys);
entitys.setSalesOrderNo(entity.getDocumentNo());
arinvoices_item0soitemService.save(entitys);
}
QueryWrapper<SalesbackitemEntity> SalesbackitemqueryWrapper = new QueryWrapper<>();
SalesbackitemqueryWrapper.lambda().eq(SalesbackitemEntity::getSalesOrderId, entity.getId());
salesbackitemService.remove(SalesbackitemqueryWrapper);
QueryWrapper<SalesbacksoitemEntity> SalesbacksoitemqueryWrapper = new QueryWrapper<>();
SalesbacksoitemqueryWrapper.lambda().eq(SalesbacksoitemEntity::getSalesOrderId, entity.getId());
salesbacksoitemService.remove(SalesbacksoitemqueryWrapper);
List<SalesbacksoitemEntity> SalesbacksoitemList = JsonUtil.getJsonToList(saleorderUpForm.getSalesbacksoitemList(),SalesbacksoitemEntity.class);
for(SalesbacksoitemEntity entitys : SalesbacksoitemList){
List<SalesbackitemEntity> SalesbackitemList = JsonUtil.getJsonToList(saleorderUpForm.getSalesbackitemList(),SalesbackitemEntity.class);
for(SalesbackitemEntity entitys : SalesbackitemList){
entitys.setId(RandomUtil.uuId());
entitys.setSalesOrderId(entity.getId());
salesbackitemService.save(entitys);
salesbacksoitemService.save(entitys);
}
QueryWrapper<PaymentsoitemEntity> PaymentsoitemqueryWrapper = new QueryWrapper<>();
PaymentsoitemqueryWrapper.lambda().eq(PaymentsoitemEntity::getPaymentno, entity.getDocumentNo());
paymentsoitemService.remove(PaymentsoitemqueryWrapper);
List<PaymentsoitemEntity> PaymentsoitemList = JsonUtil.getJsonToList(saleorderUpForm.getPaymentsoitemList(),PaymentsoitemEntity.class);
for(PaymentsoitemEntity entitys : PaymentsoitemList){
entitys.setId(RandomUtil.uuId());
entitys.setPaymentno(entity.getDocumentNo());
paymentsoitemService.save(entitys);
}
return ActionResult.success("更新成功");
@ -554,18 +627,21 @@ public class SaleorderController {
QueryWrapper<Salesorder_item0Entity> queryWrapperSalesorder_item0=new QueryWrapper<>();
queryWrapperSalesorder_item0.lambda().eq(Salesorder_item0Entity::getSalesOrderId,entity.getId());
salesorder_item0Service.remove(queryWrapperSalesorder_item0);
QueryWrapper<ReceiptoutitemEntity> queryWrapperReceiptoutitem=new QueryWrapper<>();
queryWrapperReceiptoutitem.lambda().eq(ReceiptoutitemEntity::getSourceNo,entity.getDocumentNo());
receiptoutitemService.remove(queryWrapperReceiptoutitem);
QueryWrapper<CollectionitemEntity> queryWrapperCollectionitem=new QueryWrapper<>();
queryWrapperCollectionitem.lambda().eq(CollectionitemEntity::getSalesOrderNo,entity.getId());
collectionitemService.remove(queryWrapperCollectionitem);
QueryWrapper<ArinvoicesitemEntity> queryWrapperArinvoicesitem=new QueryWrapper<>();
queryWrapperArinvoicesitem.lambda().eq(ArinvoicesitemEntity::getSalesOrderNo,entity.getId());
arinvoicesitemService.remove(queryWrapperArinvoicesitem);
QueryWrapper<SalesbackitemEntity> queryWrapperSalesbackitem=new QueryWrapper<>();
queryWrapperSalesbackitem.lambda().eq(SalesbackitemEntity::getSalesOrderId,entity.getId());
salesbackitemService.remove(queryWrapperSalesbackitem);
QueryWrapper<ReceiptoutsoitemEntity> queryWrapperReceiptoutsoitem=new QueryWrapper<>();
queryWrapperReceiptoutsoitem.lambda().eq(ReceiptoutsoitemEntity::getSourceNo,entity.getDocumentNo());
receiptoutsoitemService.remove(queryWrapperReceiptoutsoitem);
QueryWrapper<CollectionsoitemEntity> queryWrapperCollectionsoitem=new QueryWrapper<>();
queryWrapperCollectionsoitem.lambda().eq(CollectionsoitemEntity::getSalesOrderNo,entity.getDocumentNo());
collectionsoitemService.remove(queryWrapperCollectionsoitem);
QueryWrapper<Arinvoices_item0soitemEntity> queryWrapperArinvoices_item0soitem=new QueryWrapper<>();
queryWrapperArinvoices_item0soitem.lambda().eq(Arinvoices_item0soitemEntity::getSalesOrderNo,entity.getDocumentNo());
arinvoices_item0soitemService.remove(queryWrapperArinvoices_item0soitem);
QueryWrapper<SalesbacksoitemEntity> queryWrapperSalesbacksoitem=new QueryWrapper<>();
queryWrapperSalesbacksoitem.lambda().eq(SalesbacksoitemEntity::getSalesOrderId,entity.getId());
salesbacksoitemService.remove(queryWrapperSalesbacksoitem);
QueryWrapper<PaymentsoitemEntity> queryWrapperPaymentsoitem=new QueryWrapper<>();
queryWrapperPaymentsoitem.lambda().eq(PaymentsoitemEntity::getPaymentno,entity.getDocumentNo());
paymentsoitemService.remove(queryWrapperPaymentsoitem);
}
return ActionResult.success("删除成功");

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

@ -0,0 +1,107 @@
package jnpf.saleorder.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 com.fasterxml.jackson.annotation.JsonProperty;
/**
*
* 应收发票明细
* @版本： V3.2.0
* @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-03
*/
@Data
@TableName("jg_arinvoices_item0")
public class Arinvoices_item0soitemEntity {
@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("INVOICE_CODE")
private String invoiceCode;
@TableField("INVOICE_NO")
private String invoiceNo;
@TableField("INVOICE_QUANTITY")
private BigDecimal invoiceQuantity;
@TableField("INVOLCE_AMOUNT")
private BigDecimal involceAmount;
@TableField("TAX_RATE")
private Integer taxRate;
@TableField("TAX_AMOUNT")
private BigDecimal taxAmount;
@TableField("AMOUNT_NOT_TAX")
private BigDecimal amountNotTax;
@TableField("INVOICE_STATUS")
private String invoiceStatus;
@TableField("ATTACH_MENT")
private String attachMent;
@TableField("INVOICE_DATE")
private Date invoiceDate;
@TableField("REMARK")
private String remark;
@TableField("ARINVOICES_ID")
private String arinvoicesId;
@TableField("SALES_ORDER_NO")
private String salesOrderNo;
}

4
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/CollectionitemEntity.java → SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/CollectionsoitemEntity.java
Unescape View File

@ -17,11 +17,11 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @版本： V3.2.0
* @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队
* @日期： 2023-01-31
* @日期： 2023-02-03
*/
@Data
@TableName("jg_collection")
public class CollectionitemEntity {
public class CollectionsoitemEntity {
@TableId("ID")
private String id;

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

@ -0,0 +1,117 @@
package jnpf.saleorder.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 com.fasterxml.jackson.annotation.JsonProperty;
/**
*
* 付款单
* @版本： V3.2.0
* @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队
* @日期： 2023-02-03
*/
@Data
@TableName("jg_payment")
public class PaymentsoitemEntity {
@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("DOCUMENTNO")
private String documentno;
@TableField("PAYMENTNO")
private String paymentno;
@TableField("PAYMENTAMOUNT")
private BigDecimal paymentamount;
@TableField("REQUESTEDAMOUNT")
private BigDecimal requestedamount;
@TableField("BUSINESSDATE")
private Date businessdate;
@TableField("DUEDATE")
private Date duedate;
@TableField("STATUS")
private String status;
@TableField("SUPPLIERCODE")
private String suppliercode;
@TableField("SUPPLIERNAME")
private String suppliername;
@TableField("CURRENCY")
private String currency;
@TableField("PAYMENTTYPE")
private String paymenttype;
@TableField("SETTLEMENTTYPE")
private String settlementtype;
@TableField("REMARK")
private String remark;
@TableField("COLLECTIONACCOUNT")
private String collectionaccount;
@TableField("COLLECTIONBANK")
private String collectionbank;
@TableField("PAYMENTACCOUNT")
private String paymentaccount;
@TableField("PAYMENTBANK")
private String paymentbank;
}

4
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/ReceiptoutitemEntity.java → SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/ReceiptoutsoitemEntity.java
Unescape View File

@ -18,11 +18,11 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @版本： V3.2.0
* @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队
* @日期： 2023-01-31
* @日期： 2023-02-03
*/
@Data
@TableName("jg_receiptout")
public class ReceiptoutitemEntity {
public class ReceiptoutsoitemEntity {
@TableId("ID")
private String id;

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

@ -27,7 +27,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @版本： V3.2.0
* @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队
* @日期： 2023-01-31
* @日期： 2023-02-03
*/
@Data
@TableName("jg_salesorder")

4
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SalesbackitemEntity.java → SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SalesbacksoitemEntity.java
Unescape View File

@ -18,11 +18,11 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @版本： V3.2.0
* @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队
* @日期： 2023-01-31
* @日期： 2023-02-03
*/
@Data
@TableName("jg_salesback")
public class SalesbackitemEntity {
public class SalesbacksoitemEntity {
@TableId("ID")
private String id;

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

@ -21,7 +21,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @版本： V3.2.0
* @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队
* @日期： 2023-01-31
* @日期： 2023-02-03
*/
@Data
@TableName("jg_salesorder_item0")

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

@ -0,0 +1,17 @@
package jnpf.saleorder.mapper;
import jnpf.saleorder.entity.Arinvoices_item0soitemEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
*
* jg_arinvoices_item0
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-03
*/
public interface Arinvoices_item0soitemMapper extends BaseMapper<Arinvoices_item0soitemEntity> {
}

6
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/CollectionitemMapper.java → SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/CollectionsoitemMapper.java
Unescape View File

@ -1,7 +1,7 @@
package jnpf.saleorder.mapper;
import jnpf.saleorder.entity.CollectionitemEntity;
import jnpf.saleorder.entity.CollectionsoitemEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
@ -10,8 +10,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-31
* 日期： 2023-02-03
*/
public interface CollectionitemMapper extends BaseMapper<CollectionitemEntity> {
public interface CollectionsoitemMapper extends BaseMapper<CollectionsoitemEntity> {
}

8
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/ArinvoicesitemMapper.java → SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/PaymentsoitemMapper.java
Unescape View File

@ -1,17 +1,17 @@
package jnpf.saleorder.mapper;
import jnpf.saleorder.entity.ArinvoicesitemEntity;
import jnpf.saleorder.entity.PaymentsoitemEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
*
* jg_arinvoices
* jg_payment
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-31
* 日期： 2023-02-03
*/
public interface ArinvoicesitemMapper extends BaseMapper<ArinvoicesitemEntity> {
public interface PaymentsoitemMapper extends BaseMapper<PaymentsoitemEntity> {
}

6
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/ReceiptoutitemMapper.java → SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/ReceiptoutsoitemMapper.java
Unescape View File

@ -1,7 +1,7 @@
package jnpf.saleorder.mapper;
import jnpf.saleorder.entity.ReceiptoutitemEntity;
import jnpf.saleorder.entity.ReceiptoutsoitemEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
@ -10,8 +10,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-31
* 日期： 2023-02-03
*/
public interface ReceiptoutitemMapper extends BaseMapper<ReceiptoutitemEntity> {
public interface ReceiptoutsoitemMapper extends BaseMapper<ReceiptoutsoitemEntity> {
}

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

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-31
* 日期： 2023-02-03
*/
public interface SaleorderitemMapper extends BaseMapper<SaleorderitemEntity> {

6
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SalesbackitemMapper.java → SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SalesbacksoitemMapper.java
Unescape View File

@ -1,7 +1,7 @@
package jnpf.saleorder.mapper;
import jnpf.saleorder.entity.SalesbackitemEntity;
import jnpf.saleorder.entity.SalesbacksoitemEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
@ -10,8 +10,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-31
* 日期： 2023-02-03
*/
public interface SalesbackitemMapper extends BaseMapper<SalesbackitemEntity> {
public interface SalesbacksoitemMapper extends BaseMapper<SalesbacksoitemEntity> {
}

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

@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-31
* 日期： 2023-02-03
*/
public interface Salesorder_item0Mapper extends BaseMapper<Salesorder_item0Entity> {

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

@ -0,0 +1,65 @@
package jnpf.saleorder.model.saleorder;
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-02-03
*/
@Data
public class Arinvoices_item0soitemModel {
/** 发票编号 **/
@JsonProperty("invoiceNo")
private String invoiceNo;
/** 发票代码 **/
@JsonProperty("invoiceCode")
private String invoiceCode;
/** 发票金额 **/
@JsonProperty("involceAmount")
private String involceAmount;
/** 发票数量 **/
@JsonProperty("invoiceQuantity")
private String invoiceQuantity;
/** 税率 **/
@JsonProperty("taxRate")
private String taxRate;
/** 不含税金额 **/
@JsonProperty("amountNotTax")
private String amountNotTax;
/** 税额 **/
@JsonProperty("taxAmount")
private String taxAmount;
/** 发票状态 **/
@JsonProperty("invoiceStatus")
private String invoiceStatus;
/** 开票人 **/
@JsonProperty("creatorUserName")
private String creatorUserName;
/** 开票日期 **/
@JsonProperty("invoiceDate")
private Long invoiceDate;
/** 发票附件 **/
@JsonProperty("attachMent")
private String attachMent;
}

30
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/ArinvoicesitemModel.java
Unescape View File

@ -1,30 +0,0 @@
package jnpf.saleorder.model.saleorder;
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-31
*/
@Data
public class ArinvoicesitemModel {
/** 发票金额 **/
@JsonProperty("invoiceAmount")
private String invoiceAmount;
/** 发票数量 **/
@JsonProperty("invoiceQuantity")
private String invoiceQuantity;
}

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

@ -13,10 +13,10 @@ import com.alibaba.fastjson.annotation.JSONField;
* 版本： V3.2.0
* 版权: LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-31
* 日期： 2023-02-03
*/
@Data
public class CollectionitemModel {
public class CollectionsoitemModel {
/** 收款类型 **/
@JsonProperty("paymentType")

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

@ -0,0 +1,41 @@
package jnpf.saleorder.model.saleorder;
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-02-03
*/
@Data
public class PaymentsoitemModel {
/** 付款单号 **/
@JsonProperty("documentno")
private String documentno;
/** 付款方式 **/
@JsonProperty("settlementtype")
private String settlementtype;
/** 付款日期 **/
@JsonProperty("duedate")
private Long duedate;
/** 付款金额 **/
@JsonProperty("paymentamount")
private String paymentamount;
/** 备注 **/
@JsonProperty("remark")
private String remark;
}

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

@ -13,10 +13,10 @@ import com.alibaba.fastjson.annotation.JSONField;
* 版本： V3.2.0
* 版权: LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-31
* 日期： 2023-02-03
*/
@Data
public class ReceiptoutitemModel {
public class ReceiptoutsoitemModel {
/** 出库单号 **/
@JsonProperty("documentNo")

56
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderCrForm.java
Unescape View File

@ -3,10 +3,11 @@
package jnpf.saleorder.model.saleorder;
import jnpf.saleorder.model.saleorder.Salesorder_item0Model;
import jnpf.saleorder.model.saleorder.ReceiptoutitemModel;
import jnpf.saleorder.model.saleorder.CollectionitemModel;
import jnpf.saleorder.model.saleorder.ArinvoicesitemModel;
import jnpf.saleorder.model.saleorder.SalesbackitemModel;
import jnpf.saleorder.model.saleorder.ReceiptoutsoitemModel;
import jnpf.saleorder.model.saleorder.CollectionsoitemModel;
import jnpf.saleorder.model.saleorder.Arinvoices_item0soitemModel;
import jnpf.saleorder.model.saleorder.SalesbacksoitemModel;
import jnpf.saleorder.model.saleorder.PaymentsoitemModel;
import lombok.Data;
import java.util.List;
import java.math.BigDecimal;
@ -19,7 +20,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
* @版本： V3.2.0
* @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队
* @日期： 2023-01-31
* @日期： 2023-02-03
*/
@Data
public class SaleorderCrForm {
@ -28,22 +29,26 @@ public class SaleorderCrForm {
@JsonProperty("documentNo")
private String documentNo;
/** 合同编码 **/
@JsonProperty("contractCode")
private String contractCode;
/** 合同名称 **/
@JsonProperty("contractName")
private String contractName;
/** 制单人 **/
@JsonProperty("creatorUserName")
private String creatorUserName;
/** 采购部门 **/
@JsonProperty("departmentId")
private String departmentId;
/** 币别 **/
@JsonProperty("currency")
private String currency;
/** 对方合同 **/
@JsonProperty("contractNo")
private String contractNo;
/** 垫资金额 **/
@JsonProperty("advanceAmount")
private String advanceAmount;
/** 数量 **/
@JsonProperty("num")
private String num;
@ -56,10 +61,6 @@ public class SaleorderCrForm {
@JsonProperty("notPrice")
private String notPrice;
/** 币别 **/
@JsonProperty("currency")
private String currency;
/** 备注信息 **/
@JsonProperty("remark")
private String remark;
@ -88,21 +89,28 @@ public class SaleorderCrForm {
@JsonProperty("status")
private String status;
/** 制单人 **/
@JsonProperty("creatorUserName")
private String creatorUserName;
/** 子表数据 **/
@JsonProperty("salesorder_item0List")
private List<Salesorder_item0Model> salesorder_item0List;
/** 子表数据 **/
@JsonProperty("receiptoutitemList")
private List<ReceiptoutitemModel> receiptoutitemList;
@JsonProperty("receiptoutsoitemList")
private List<ReceiptoutsoitemModel> receiptoutsoitemList;
/** 子表数据 **/
@JsonProperty("collectionsoitemList")
private List<CollectionsoitemModel> collectionsoitemList;
/** 子表数据 **/
@JsonProperty("collectionitemList")
private List<CollectionitemModel> collectionitemList;
@JsonProperty("arinvoices_item0soitemList")
private List<Arinvoices_item0soitemModel> arinvoices_item0soitemList;
/** 子表数据 **/
@JsonProperty("arinvoicesitemList")
private List<ArinvoicesitemModel> arinvoicesitemList;
@JsonProperty("salesbacksoitemList")
private List<SalesbacksoitemModel> salesbacksoitemList;
/** 子表数据 **/
@JsonProperty("salesbackitemList")
private List<SalesbackitemModel> salesbackitemList;
@JsonProperty("paymentsoitemList")
private List<PaymentsoitemModel> paymentsoitemList;
}

56
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderInfoVO.java
Unescape View File

@ -4,10 +4,11 @@
package jnpf.saleorder.model.saleorder;
import jnpf.saleorder.model.saleorder.Salesorder_item0Model;
import jnpf.saleorder.model.saleorder.ReceiptoutitemModel;
import jnpf.saleorder.model.saleorder.CollectionitemModel;
import jnpf.saleorder.model.saleorder.ArinvoicesitemModel;
import jnpf.saleorder.model.saleorder.SalesbackitemModel;
import jnpf.saleorder.model.saleorder.ReceiptoutsoitemModel;
import jnpf.saleorder.model.saleorder.CollectionsoitemModel;
import jnpf.saleorder.model.saleorder.Arinvoices_item0soitemModel;
import jnpf.saleorder.model.saleorder.SalesbacksoitemModel;
import jnpf.saleorder.model.saleorder.PaymentsoitemModel;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.List;
@ -20,7 +21,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
* @版本： V3.2.0
* @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队
* @日期： 2023-01-31
* @日期： 2023-02-03
*/
@Data
public class SaleorderInfoVO{
@ -32,22 +33,26 @@ public class SaleorderInfoVO{
@JsonProperty("documentNo")
private String documentNo;
/** 合同编码 **/
@JsonProperty("contractCode")
private String contractCode;
/** 合同名称 **/
@JsonProperty("contractName")
private String contractName;
/** 制单人 **/
@JsonProperty("creatorUserName")
private String creatorUserName;
/** 采购部门 **/
@JsonProperty("departmentId")
private String departmentId;
/** 币别 **/
@JsonProperty("currency")
private String currency;
/** 对方合同 **/
@JsonProperty("contractNo")
private String contractNo;
/** 垫资金额 **/
@JsonProperty("advanceAmount")
private String advanceAmount;
/** 数量 **/
@JsonProperty("num")
private String num;
@ -60,10 +65,6 @@ public class SaleorderInfoVO{
@JsonProperty("notPrice")
private String notPrice;
/** 币别 **/
@JsonProperty("currency")
private String currency;
/** 备注信息 **/
@JsonProperty("remark")
private String remark;
@ -92,19 +93,26 @@ public class SaleorderInfoVO{
@JsonProperty("status")
private String status;
/** 制单人 **/
@JsonProperty("creatorUserName")
private String creatorUserName;
/** 子表数据 **/
@JsonProperty("salesorder_item0List")
private List<Salesorder_item0Model> salesorder_item0List;
/** 子表数据 **/
@JsonProperty("receiptoutitemList")
private List<ReceiptoutitemModel> receiptoutitemList;
@JsonProperty("receiptoutsoitemList")
private List<ReceiptoutsoitemModel> receiptoutsoitemList;
/** 子表数据 **/
@JsonProperty("collectionsoitemList")
private List<CollectionsoitemModel> collectionsoitemList;
/** 子表数据 **/
@JsonProperty("collectionitemList")
private List<CollectionitemModel> collectionitemList;
@JsonProperty("arinvoices_item0soitemList")
private List<Arinvoices_item0soitemModel> arinvoices_item0soitemList;
/** 子表数据 **/
@JsonProperty("arinvoicesitemList")
private List<ArinvoicesitemModel> arinvoicesitemList;
@JsonProperty("salesbacksoitemList")
private List<SalesbacksoitemModel> salesbacksoitemList;
/** 子表数据 **/
@JsonProperty("salesbackitemList")
private List<SalesbackitemModel> salesbackitemList;
@JsonProperty("paymentsoitemList")
private List<PaymentsoitemModel> paymentsoitemList;
}

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

@ -10,7 +10,7 @@ import java.util.List;
* @版本： V3.2.0
* @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队
* @日期： 2023-01-31
* @日期： 2023-02-03
*/
@Data
public class SaleorderListQuery extends Pagination {

32
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderListVO.java
Unescape View File

@ -15,7 +15,7 @@ import java.math.BigDecimal;
* @版本： V3.2.0
* @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队
* @日期： 2023-01-31
* @日期： 2023-02-03
*/
@Data
public class SaleorderListVO{
@ -28,20 +28,19 @@ public class SaleorderListVO{
@JsonProperty("documentNo")
private String documentNo;
/** 合同编码 **/
@JsonProperty("contractCode")
private String contractCode;
/** 合同名称 **/
@JsonProperty("contractName")
private String contractName;
/** 制单人 **/
@JsonProperty("creatorUserName")
private String creatorUserName;
/** 采购部门 **/
@JsonProperty("departmentId")
private String departmentId;
/** 币别 **/
@JsonProperty("currency")
private String currency;
/** 对方合同 **/
@ -49,6 +48,11 @@ public class SaleorderListVO{
private String contractNo;
/** 垫资金额 **/
@JsonProperty("advanceAmount")
private String advanceAmount;
/** 数量 **/
@JsonProperty("num")
private String num;
@ -64,11 +68,6 @@ public class SaleorderListVO{
private String notPrice;
/** 币别 **/
@JsonProperty("currency")
private String currency;
/** 备注信息 **/
@JsonProperty("remark")
private String remark;
@ -104,4 +103,9 @@ public class SaleorderListVO{
private String status;
/** 制单人 **/
@JsonProperty("creatorUserName")
private String creatorUserName;
}

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

@ -11,7 +11,7 @@ import java.util.List;
* @版本： V3.2.0
* @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队
* @日期： 2023-01-31
* @日期： 2023-02-03
*/
@Data
public class SaleorderPagination extends Pagination {

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

@ -9,7 +9,7 @@ import java.util.*;
* @版本： V3.2.0
* @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队
* @日期： 2023-01-31
* @日期： 2023-02-03
*/
@Data
public class SaleorderPaginationExportModel extends Pagination {

60
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderUpForm.java
Unescape View File

@ -3,10 +3,11 @@
package jnpf.saleorder.model.saleorder;
import jnpf.saleorder.model.saleorder.Salesorder_item0Model;
import jnpf.saleorder.model.saleorder.ReceiptoutitemModel;
import jnpf.saleorder.model.saleorder.CollectionitemModel;
import jnpf.saleorder.model.saleorder.ArinvoicesitemModel;
import jnpf.saleorder.model.saleorder.SalesbackitemModel;
import jnpf.saleorder.model.saleorder.ReceiptoutsoitemModel;
import jnpf.saleorder.model.saleorder.CollectionsoitemModel;
import jnpf.saleorder.model.saleorder.Arinvoices_item0soitemModel;
import jnpf.saleorder.model.saleorder.SalesbacksoitemModel;
import jnpf.saleorder.model.saleorder.PaymentsoitemModel;
import lombok.Data;
import java.util.List;
import java.math.BigDecimal;
@ -20,7 +21,7 @@ import lombok.Data;
* @版本： V3.2.0
* @版权： LINKAGE-BOOT
* @作者： LINKAGE-BOOT研发团队
* @日期： 2023-01-31
* @日期： 2023-02-03
*/
@Data
public class SaleorderUpForm{
@ -32,20 +33,19 @@ public class SaleorderUpForm{
@JsonProperty("documentNo")
private String documentNo;
/** 合同编码 **/
@JsonProperty("contractCode")
private String contractCode;
/** 合同名称 **/
@JsonProperty("contractName")
private String contractName;
/** 制单人 **/
@JsonProperty("creatorUserName")
private String creatorUserName;
/** 采购部门 **/
@JsonProperty("departmentId")
private String departmentId;
/** 币别 **/
@JsonProperty("currency")
private String currency;
/** 对方合同 **/
@ -53,6 +53,11 @@ public class SaleorderUpForm{
private String contractNo;
/** 垫资金额 **/
@JsonProperty("advanceAmount")
private String advanceAmount;
/** 数量 **/
@JsonProperty("num")
private String num;
@ -68,11 +73,6 @@ public class SaleorderUpForm{
private String notPrice;
/** 币别 **/
@JsonProperty("currency")
private String currency;
/** 备注信息 **/
@JsonProperty("remark")
private String remark;
@ -107,20 +107,28 @@ public class SaleorderUpForm{
@JsonProperty("status")
private String status;
/** 制单人 **/
@JsonProperty("creatorUserName")
private String creatorUserName;
/** 子表数据 **/
@JsonProperty("salesorder_item0List")
private List<Salesorder_item0Model> salesorder_item0List;
/** 子表数据 **/
@JsonProperty("receiptoutitemList")
private List<ReceiptoutitemModel> receiptoutitemList;
@JsonProperty("receiptoutsoitemList")
private List<ReceiptoutsoitemModel> receiptoutsoitemList;
/** 子表数据 **/
@JsonProperty("collectionsoitemList")
private List<CollectionsoitemModel> collectionsoitemList;
/** 子表数据 **/
@JsonProperty("collectionitemList")
private List<CollectionitemModel> collectionitemList;
@JsonProperty("arinvoices_item0soitemList")
private List<Arinvoices_item0soitemModel> arinvoices_item0soitemList;
/** 子表数据 **/
@JsonProperty("arinvoicesitemList")
private List<ArinvoicesitemModel> arinvoicesitemList;
@JsonProperty("salesbacksoitemList")
private List<SalesbacksoitemModel> salesbacksoitemList;
/** 子表数据 **/
@JsonProperty("salesbackitemList")
private List<SalesbackitemModel> salesbackitemList;
@JsonProperty("paymentsoitemList")
private List<PaymentsoitemModel> paymentsoitemList;
}

7
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SalesbackitemModel.java → SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SalesbacksoitemModel.java
Unescape View File

@ -13,10 +13,10 @@ import com.alibaba.fastjson.annotation.JSONField;
* 版本： V3.2.0
* 版权: LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-31
* 日期： 2023-02-03
*/
@Data
public class SalesbackitemModel {
public class SalesbacksoitemModel {
/** 退货单号 **/
@JsonProperty("documentNo")
@ -30,5 +30,8 @@ public class SalesbackitemModel {
@JsonProperty("refundAmount")
private String refundAmount;
/** 退货日期 **/
@JsonProperty("creatorTime")
private Long creatorTime;
}

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

@ -13,7 +13,7 @@ import com.alibaba.fastjson.annotation.JSONField;
* 版本： V3.2.0
* 版权: LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-31
* 日期： 2023-02-03
*/
@Data
public class Salesorder_item0Model {
@ -62,5 +62,13 @@ public class Salesorder_item0Model {
@JsonProperty("noPrice")
private String noPrice;
/** 磅单图片 **/
@JsonProperty("poundPictures")
private String poundPictures;
/** 车辆图片 **/
@JsonProperty("vehiclePictures")
private String vehiclePictures;
}

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

@ -0,0 +1,15 @@
package jnpf.saleorder.service;
import jnpf.saleorder.entity.Arinvoices_item0soitemEntity;
import com.baomidou.mybatisplus.extension.service.IService;
/**
*
* jg_arinvoices_item0
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-03
*/
public interface Arinvoices_item0soitemService extends IService<Arinvoices_item0soitemEntity> {
}

6
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/CollectionitemService.java → SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/CollectionsoitemService.java
Unescape View File

@ -1,6 +1,6 @@
package jnpf.saleorder.service;
import jnpf.saleorder.entity.CollectionitemEntity;
import jnpf.saleorder.entity.CollectionsoitemEntity;
import com.baomidou.mybatisplus.extension.service.IService;
/**
*
@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-31
* 日期： 2023-02-03
*/
public interface CollectionitemService extends IService<CollectionitemEntity> {
public interface CollectionsoitemService extends IService<CollectionsoitemEntity> {
}

8
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/SalesbackitemService.java → SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/PaymentsoitemService.java
Unescape View File

@ -1,15 +1,15 @@
package jnpf.saleorder.service;
import jnpf.saleorder.entity.SalesbackitemEntity;
import jnpf.saleorder.entity.PaymentsoitemEntity;
import com.baomidou.mybatisplus.extension.service.IService;
/**
*
* jg_salesback
* jg_payment
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-31
* 日期： 2023-02-03
*/
public interface SalesbackitemService extends IService<SalesbackitemEntity> {
public interface PaymentsoitemService extends IService<PaymentsoitemEntity> {
}

6
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/ReceiptoutitemService.java → SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/ReceiptoutsoitemService.java
Unescape View File

@ -1,6 +1,6 @@
package jnpf.saleorder.service;
import jnpf.saleorder.entity.ReceiptoutitemEntity;
import jnpf.saleorder.entity.ReceiptoutsoitemEntity;
import com.baomidou.mybatisplus.extension.service.IService;
/**
*
@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-31
* 日期： 2023-02-03
*/
public interface ReceiptoutitemService extends IService<ReceiptoutitemEntity> {
public interface ReceiptoutsoitemService extends IService<ReceiptoutsoitemEntity> {
}

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

@ -1,9 +1,11 @@
package jnpf.saleorder.service;
import jnpf.saleorder.entity.Salesorder_item0Entity;
import jnpf.saleorder.entity.ReceiptoutitemEntity;
import jnpf.saleorder.entity.CollectionitemEntity;
import jnpf.saleorder.entity.ArinvoicesitemEntity;
import jnpf.saleorder.entity.SalesbackitemEntity;
import jnpf.saleorder.entity.ReceiptoutsoitemEntity;
import jnpf.saleorder.entity.CollectionsoitemEntity;
import jnpf.saleorder.entity.Arinvoices_item0soitemEntity;
import jnpf.saleorder.entity.SalesbacksoitemEntity;
import jnpf.saleorder.entity.PaymentsoitemEntity;
import jnpf.saleorder.entity.SaleorderitemEntity;
import com.baomidou.mybatisplus.extension.service.IService;
import jnpf.saleorder.model.saleorder.SaleorderPagination;
@ -14,7 +16,7 @@ import java.util.*;
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-31
* 日期： 2023-02-03
*/
public interface SaleorderitemService extends IService<SaleorderitemEntity> {
@ -34,10 +36,11 @@ public interface SaleorderitemService extends IService<SaleorderitemEntity> {
// 子表方法
List<Salesorder_item0Entity> GetSalesorder_item0List(String id);
List<ReceiptoutitemEntity> GetReceiptoutitemList(String id);
List<CollectionitemEntity> GetCollectionitemList(String id);
List<ArinvoicesitemEntity> GetArinvoicesitemList(String id);
List<SalesbackitemEntity> GetSalesbackitemList(String id);
List<ReceiptoutsoitemEntity> GetReceiptoutsoitemList(String id);
List<CollectionsoitemEntity> GetCollectionsoitemList(String id);
List<Arinvoices_item0soitemEntity> GetArinvoices_item0soitemList(String id);
List<SalesbacksoitemEntity> GetSalesbacksoitemList(String id);
List<PaymentsoitemEntity> GetPaymentsoitemList(String id);
//列表子表数据方法
}

8
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/ArinvoicesitemService.java → SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/SalesbacksoitemService.java
Unescape View File

@ -1,15 +1,15 @@
package jnpf.saleorder.service;
import jnpf.saleorder.entity.ArinvoicesitemEntity;
import jnpf.saleorder.entity.SalesbacksoitemEntity;
import com.baomidou.mybatisplus.extension.service.IService;
/**
*
* jg_arinvoices
* jg_salesback
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-31
* 日期： 2023-02-03
*/
public interface ArinvoicesitemService extends IService<ArinvoicesitemEntity> {
public interface SalesbacksoitemService extends IService<SalesbacksoitemEntity> {
}

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

@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-31
* 日期： 2023-02-03
*/
public interface Salesorder_item0Service extends IService<Salesorder_item0Entity> {

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

@ -0,0 +1,41 @@
package jnpf.saleorder.service.impl;
import jnpf.saleorder.entity.*;
import jnpf.saleorder.mapper.Arinvoices_item0soitemMapper;
import jnpf.saleorder.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_arinvoices_item0
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-02-03
*/
@Service
public class Arinvoices_item0soitemServiceImpl extends ServiceImpl<Arinvoices_item0soitemMapper, Arinvoices_item0soitemEntity> implements Arinvoices_item0soitemService{
}

6
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/CollectionitemServiceImpl.java → SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/CollectionsoitemServiceImpl.java
Unescape View File

@ -1,7 +1,7 @@
package jnpf.saleorder.service.impl;
import jnpf.saleorder.entity.*;
import jnpf.saleorder.mapper.CollectionitemMapper;
import jnpf.saleorder.mapper.CollectionsoitemMapper;
import jnpf.saleorder.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.util.RandomUtil;
@ -32,10 +32,10 @@ import java.util.*;
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-31
* 日期： 2023-02-03
*/
@Service
public class CollectionitemServiceImpl extends ServiceImpl<CollectionitemMapper, CollectionitemEntity> implements CollectionitemService{
public class CollectionsoitemServiceImpl extends ServiceImpl<CollectionsoitemMapper, CollectionsoitemEntity> implements CollectionsoitemService{
}

8
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/ArinvoicesitemServiceImpl.java → SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/PaymentsoitemServiceImpl.java
Unescape View File

@ -1,7 +1,7 @@
package jnpf.saleorder.service.impl;
import jnpf.saleorder.entity.*;
import jnpf.saleorder.mapper.ArinvoicesitemMapper;
import jnpf.saleorder.mapper.PaymentsoitemMapper;
import jnpf.saleorder.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.util.RandomUtil;
@ -28,14 +28,14 @@ import java.util.*;
/**
*
* jg_arinvoices
* jg_payment
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-31
* 日期： 2023-02-03
*/
@Service
public class ArinvoicesitemServiceImpl extends ServiceImpl<ArinvoicesitemMapper, ArinvoicesitemEntity> implements ArinvoicesitemService{
public class PaymentsoitemServiceImpl extends ServiceImpl<PaymentsoitemMapper, PaymentsoitemEntity> implements PaymentsoitemService{
}

6
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/ReceiptoutitemServiceImpl.java → SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/ReceiptoutsoitemServiceImpl.java
Unescape View File

@ -1,7 +1,7 @@
package jnpf.saleorder.service.impl;
import jnpf.saleorder.entity.*;
import jnpf.saleorder.mapper.ReceiptoutitemMapper;
import jnpf.saleorder.mapper.ReceiptoutsoitemMapper;
import jnpf.saleorder.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jnpf.util.RandomUtil;
@ -32,10 +32,10 @@ import java.util.*;
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-31
* 日期： 2023-02-03
*/
@Service
public class ReceiptoutitemServiceImpl extends ServiceImpl<ReceiptoutitemMapper, ReceiptoutitemEntity> implements ReceiptoutitemService{
public class ReceiptoutsoitemServiceImpl extends ServiceImpl<ReceiptoutsoitemMapper, ReceiptoutsoitemEntity> implements ReceiptoutsoitemService{
}

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

@ -29,7 +29,7 @@ import java.util.*;
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-31
* 日期： 2023-02-03
*/
@Service
public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, SaleorderitemEntity> implements SaleorderitemService {
@ -46,16 +46,19 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
private Salesorder_item0Service salesorder_item0Service;
@Autowired
private ReceiptoutitemService receiptoutitemService;
private ReceiptoutsoitemService receiptoutsoitemService;
@Autowired
private CollectionitemService collectionitemService;
private CollectionsoitemService collectionsoitemService;
@Autowired
private ArinvoicesitemService arinvoicesitemService;
private Arinvoices_item0soitemService arinvoices_item0soitemService;
@Autowired
private SalesbackitemService salesbackitemService;
private SalesbacksoitemService salesbacksoitemService;
@Autowired
private PaymentsoitemService paymentsoitemService;
@ -69,14 +72,16 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
QueryWrapper<SaleorderitemEntity> saleorderQueryWrapper=new QueryWrapper<>();
int salesorder_item0Num =0;
QueryWrapper<Salesorder_item0Entity> salesorder_item0QueryWrapper=new QueryWrapper<>();
int receiptoutitemNum =0;
QueryWrapper<ReceiptoutitemEntity> receiptoutitemQueryWrapper=new QueryWrapper<>();
int collectionitemNum =0;
QueryWrapper<CollectionitemEntity> collectionitemQueryWrapper=new QueryWrapper<>();
int arinvoicesitemNum =0;
QueryWrapper<ArinvoicesitemEntity> arinvoicesitemQueryWrapper=new QueryWrapper<>();
int salesbackitemNum =0;
QueryWrapper<SalesbackitemEntity> salesbackitemQueryWrapper=new QueryWrapper<>();
int receiptoutsoitemNum =0;
QueryWrapper<ReceiptoutsoitemEntity> receiptoutsoitemQueryWrapper=new QueryWrapper<>();
int collectionsoitemNum =0;
QueryWrapper<CollectionsoitemEntity> collectionsoitemQueryWrapper=new QueryWrapper<>();
int salesbacksoitemNum =0;
QueryWrapper<SalesbacksoitemEntity> salesbacksoitemQueryWrapper=new QueryWrapper<>();
int paymentsoitemNum =0;
QueryWrapper<PaymentsoitemEntity> paymentsoitemQueryWrapper=new QueryWrapper<>();
int arinvoices_item0soitemNum =0;
QueryWrapper<Arinvoices_item0soitemEntity> arinvoices_item0soitemQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
@ -96,33 +101,40 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
salesorder_item0QueryWrapper = (QueryWrapper<Salesorder_item0Entity>)salesorder_item0Obj;
salesorder_item0Num++;
}
Object receiptoutitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutitemQueryWrapper,saleorderPagination.getMenuId(),"receiptoutitem"));
if (ObjectUtil.isEmpty(receiptoutitemObj)){
Object receiptoutsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutsoitemQueryWrapper,saleorderPagination.getMenuId(),"receiptoutsoitem"));
if (ObjectUtil.isEmpty(receiptoutsoitemObj)){
return new ArrayList<>();
} else {
receiptoutsoitemQueryWrapper = (QueryWrapper<ReceiptoutsoitemEntity>)receiptoutsoitemObj;
receiptoutsoitemNum++;
}
Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderPagination.getMenuId(),"collectionsoitem"));
if (ObjectUtil.isEmpty(collectionsoitemObj)){
return new ArrayList<>();
} else {
receiptoutitemQueryWrapper = (QueryWrapper<ReceiptoutitemEntity>)receiptoutitemObj;
receiptoutitemNum++;
collectionsoitemQueryWrapper = (QueryWrapper<CollectionsoitemEntity>)collectionsoitemObj;
collectionsoitemNum++;
}
Object collectionitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper,saleorderPagination.getMenuId(),"collectionitem"));
if (ObjectUtil.isEmpty(collectionitemObj)){
Object salesbacksoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbacksoitemQueryWrapper,saleorderPagination.getMenuId(),"salesbacksoitem"));
if (ObjectUtil.isEmpty(salesbacksoitemObj)){
return new ArrayList<>();
} else {
collectionitemQueryWrapper = (QueryWrapper<CollectionitemEntity>)collectionitemObj;
collectionitemNum++;
salesbacksoitemQueryWrapper = (QueryWrapper<SalesbacksoitemEntity>)salesbacksoitemObj;
salesbacksoitemNum++;
}
Object arinvoicesitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoicesitemQueryWrapper,saleorderPagination.getMenuId(),"arinvoicesitem"));
if (ObjectUtil.isEmpty(arinvoicesitemObj)){
Object paymentsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentsoitemQueryWrapper,saleorderPagination.getMenuId(),"paymentsoitem"));
if (ObjectUtil.isEmpty(paymentsoitemObj)){
return new ArrayList<>();
} else {
arinvoicesitemQueryWrapper = (QueryWrapper<ArinvoicesitemEntity>)arinvoicesitemObj;
arinvoicesitemNum++;
paymentsoitemQueryWrapper = (QueryWrapper<PaymentsoitemEntity>)paymentsoitemObj;
paymentsoitemNum++;
}
Object salesbackitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbackitemQueryWrapper,saleorderPagination.getMenuId(),"salesbackitem"));
if (ObjectUtil.isEmpty(salesbackitemObj)){
Object arinvoices_item0soitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0soitemQueryWrapper,saleorderPagination.getMenuId(),"arinvoices_item0soitem"));
if (ObjectUtil.isEmpty(arinvoices_item0soitemObj)){
return new ArrayList<>();
} else {
salesbackitemQueryWrapper = (QueryWrapper<SalesbackitemEntity>)salesbackitemObj;
salesbackitemNum++;
arinvoices_item0soitemQueryWrapper = (QueryWrapper<Arinvoices_item0soitemEntity>)arinvoices_item0soitemObj;
arinvoices_item0soitemNum++;
}
}
}
@ -146,39 +158,48 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
}
Object receiptoutitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutitemQueryWrapper,saleorderPagination.getMenuId(),"receiptoutitem"));
if (ObjectUtil.isEmpty(receiptoutitemObj)){
Object receiptoutsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutsoitemQueryWrapper,saleorderPagination.getMenuId(),"receiptoutsoitem"));
if (ObjectUtil.isEmpty(receiptoutsoitemObj)){
return new ArrayList<>();
} else {
receiptoutsoitemQueryWrapper = (QueryWrapper<ReceiptoutsoitemEntity>)receiptoutsoitemObj;
receiptoutsoitemNum++;
}
Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderPagination.getMenuId(),"collectionsoitem"));
if (ObjectUtil.isEmpty(collectionsoitemObj)){
return new ArrayList<>();
} else {
receiptoutitemQueryWrapper = (QueryWrapper<ReceiptoutitemEntity>)receiptoutitemObj;
receiptoutitemNum++;
collectionsoitemQueryWrapper = (QueryWrapper<CollectionsoitemEntity>)collectionsoitemObj;
collectionsoitemNum++;
}
Object collectionitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper,saleorderPagination.getMenuId(),"collectionitem"));
if (ObjectUtil.isEmpty(collectionitemObj)){
Object salesbacksoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbacksoitemQueryWrapper,saleorderPagination.getMenuId(),"salesbacksoitem"));
if (ObjectUtil.isEmpty(salesbacksoitemObj)){
return new ArrayList<>();
} else {
collectionitemQueryWrapper = (QueryWrapper<CollectionitemEntity>)collectionitemObj;
collectionitemNum++;
salesbacksoitemQueryWrapper = (QueryWrapper<SalesbacksoitemEntity>)salesbacksoitemObj;
salesbacksoitemNum++;
}
Object arinvoicesitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoicesitemQueryWrapper,saleorderPagination.getMenuId(),"arinvoicesitem"));
if (ObjectUtil.isEmpty(arinvoicesitemObj)){
Object paymentsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentsoitemQueryWrapper,saleorderPagination.getMenuId(),"paymentsoitem"));
if (ObjectUtil.isEmpty(paymentsoitemObj)){
return new ArrayList<>();
} else {
arinvoicesitemQueryWrapper = (QueryWrapper<ArinvoicesitemEntity>)arinvoicesitemObj;
arinvoicesitemNum++;
paymentsoitemQueryWrapper = (QueryWrapper<PaymentsoitemEntity>)paymentsoitemObj;
paymentsoitemNum++;
}
Object salesbackitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbackitemQueryWrapper,saleorderPagination.getMenuId(),"salesbackitem"));
if (ObjectUtil.isEmpty(salesbackitemObj)){
Object arinvoices_item0soitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0soitemQueryWrapper,saleorderPagination.getMenuId(),"arinvoices_item0soitem"));
if (ObjectUtil.isEmpty(arinvoices_item0soitemObj)){
return new ArrayList<>();
} else {
salesbackitemQueryWrapper = (QueryWrapper<SalesbackitemEntity>)salesbackitemObj;
salesbackitemNum++;
arinvoices_item0soitemQueryWrapper = (QueryWrapper<Arinvoices_item0soitemEntity>)arinvoices_item0soitemObj;
arinvoices_item0soitemNum++;
}
@ -230,14 +251,16 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
QueryWrapper<SaleorderitemEntity> saleorderQueryWrapper=new QueryWrapper<>();
int salesorder_item0Num =0;
QueryWrapper<Salesorder_item0Entity> salesorder_item0QueryWrapper=new QueryWrapper<>();
int receiptoutitemNum =0;
QueryWrapper<ReceiptoutitemEntity> receiptoutitemQueryWrapper=new QueryWrapper<>();
int collectionitemNum =0;
QueryWrapper<CollectionitemEntity> collectionitemQueryWrapper=new QueryWrapper<>();
int arinvoicesitemNum =0;
QueryWrapper<ArinvoicesitemEntity> arinvoicesitemQueryWrapper=new QueryWrapper<>();
int salesbackitemNum =0;
QueryWrapper<SalesbackitemEntity> salesbackitemQueryWrapper=new QueryWrapper<>();
int receiptoutsoitemNum =0;
QueryWrapper<ReceiptoutsoitemEntity> receiptoutsoitemQueryWrapper=new QueryWrapper<>();
int collectionsoitemNum =0;
QueryWrapper<CollectionsoitemEntity> collectionsoitemQueryWrapper=new QueryWrapper<>();
int salesbacksoitemNum =0;
QueryWrapper<SalesbacksoitemEntity> salesbacksoitemQueryWrapper=new QueryWrapper<>();
int paymentsoitemNum =0;
QueryWrapper<PaymentsoitemEntity> paymentsoitemQueryWrapper=new QueryWrapper<>();
int arinvoices_item0soitemNum =0;
QueryWrapper<Arinvoices_item0soitemEntity> arinvoices_item0soitemQueryWrapper=new QueryWrapper<>();
boolean pcPermission = false;
boolean appPermission = false;
boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
@ -257,33 +280,40 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
salesorder_item0QueryWrapper = (QueryWrapper<Salesorder_item0Entity>)salesorder_item0Obj;
salesorder_item0Num++;
}
Object receiptoutitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutitemQueryWrapper,saleorderPagination.getMenuId(),"receiptoutitem"));
if (ObjectUtil.isEmpty(receiptoutitemObj)){
Object receiptoutsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutsoitemQueryWrapper,saleorderPagination.getMenuId(),"receiptoutsoitem"));
if (ObjectUtil.isEmpty(receiptoutsoitemObj)){
return new ArrayList<>();
} else {
receiptoutitemQueryWrapper = (QueryWrapper<ReceiptoutitemEntity>)receiptoutitemObj;
receiptoutitemNum++;
receiptoutsoitemQueryWrapper = (QueryWrapper<ReceiptoutsoitemEntity>)receiptoutsoitemObj;
receiptoutsoitemNum++;
}
Object collectionitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper,saleorderPagination.getMenuId(),"collectionitem"));
if (ObjectUtil.isEmpty(collectionitemObj)){
Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderPagination.getMenuId(),"collectionsoitem"));
if (ObjectUtil.isEmpty(collectionsoitemObj)){
return new ArrayList<>();
} else {
collectionitemQueryWrapper = (QueryWrapper<CollectionitemEntity>)collectionitemObj;
collectionitemNum++;
collectionsoitemQueryWrapper = (QueryWrapper<CollectionsoitemEntity>)collectionsoitemObj;
collectionsoitemNum++;
}
Object arinvoicesitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoicesitemQueryWrapper,saleorderPagination.getMenuId(),"arinvoicesitem"));
if (ObjectUtil.isEmpty(arinvoicesitemObj)){
Object salesbacksoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbacksoitemQueryWrapper,saleorderPagination.getMenuId(),"salesbacksoitem"));
if (ObjectUtil.isEmpty(salesbacksoitemObj)){
return new ArrayList<>();
} else {
arinvoicesitemQueryWrapper = (QueryWrapper<ArinvoicesitemEntity>)arinvoicesitemObj;
arinvoicesitemNum++;
salesbacksoitemQueryWrapper = (QueryWrapper<SalesbacksoitemEntity>)salesbacksoitemObj;
salesbacksoitemNum++;
}
Object salesbackitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbackitemQueryWrapper,saleorderPagination.getMenuId(),"salesbackitem"));
if (ObjectUtil.isEmpty(salesbackitemObj)){
Object paymentsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentsoitemQueryWrapper,saleorderPagination.getMenuId(),"paymentsoitem"));
if (ObjectUtil.isEmpty(paymentsoitemObj)){
return new ArrayList<>();
} else {
salesbackitemQueryWrapper = (QueryWrapper<SalesbackitemEntity>)salesbackitemObj;
salesbackitemNum++;
paymentsoitemQueryWrapper = (QueryWrapper<PaymentsoitemEntity>)paymentsoitemObj;
paymentsoitemNum++;
}
Object arinvoices_item0soitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0soitemQueryWrapper,saleorderPagination.getMenuId(),"arinvoices_item0soitem"));
if (ObjectUtil.isEmpty(arinvoices_item0soitemObj)){
return new ArrayList<>();
} else {
arinvoices_item0soitemQueryWrapper = (QueryWrapper<Arinvoices_item0soitemEntity>)arinvoices_item0soitemObj;
arinvoices_item0soitemNum++;
}
}
}
@ -307,39 +337,48 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
}
Object receiptoutitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutitemQueryWrapper,saleorderPagination.getMenuId(),"receiptoutitem"));
if (ObjectUtil.isEmpty(receiptoutitemObj)){
Object receiptoutsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(receiptoutsoitemQueryWrapper,saleorderPagination.getMenuId(),"receiptoutsoitem"));
if (ObjectUtil.isEmpty(receiptoutsoitemObj)){
return new ArrayList<>();
} else {
receiptoutsoitemQueryWrapper = (QueryWrapper<ReceiptoutsoitemEntity>)receiptoutsoitemObj;
receiptoutsoitemNum++;
}
Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderPagination.getMenuId(),"collectionsoitem"));
if (ObjectUtil.isEmpty(collectionsoitemObj)){
return new ArrayList<>();
} else {
receiptoutitemQueryWrapper = (QueryWrapper<ReceiptoutitemEntity>)receiptoutitemObj;
receiptoutitemNum++;
collectionsoitemQueryWrapper = (QueryWrapper<CollectionsoitemEntity>)collectionsoitemObj;
collectionsoitemNum++;
}
Object collectionitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper,saleorderPagination.getMenuId(),"collectionitem"));
if (ObjectUtil.isEmpty(collectionitemObj)){
Object salesbacksoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbacksoitemQueryWrapper,saleorderPagination.getMenuId(),"salesbacksoitem"));
if (ObjectUtil.isEmpty(salesbacksoitemObj)){
return new ArrayList<>();
} else {
collectionitemQueryWrapper = (QueryWrapper<CollectionitemEntity>)collectionitemObj;
collectionitemNum++;
salesbacksoitemQueryWrapper = (QueryWrapper<SalesbacksoitemEntity>)salesbacksoitemObj;
salesbacksoitemNum++;
}
Object arinvoicesitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoicesitemQueryWrapper,saleorderPagination.getMenuId(),"arinvoicesitem"));
if (ObjectUtil.isEmpty(arinvoicesitemObj)){
Object paymentsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(paymentsoitemQueryWrapper,saleorderPagination.getMenuId(),"paymentsoitem"));
if (ObjectUtil.isEmpty(paymentsoitemObj)){
return new ArrayList<>();
} else {
arinvoicesitemQueryWrapper = (QueryWrapper<ArinvoicesitemEntity>)arinvoicesitemObj;
arinvoicesitemNum++;
paymentsoitemQueryWrapper = (QueryWrapper<PaymentsoitemEntity>)paymentsoitemObj;
paymentsoitemNum++;
}
Object salesbackitemObj=authorizeService.getCondition(new AuthorizeConditionModel(salesbackitemQueryWrapper,saleorderPagination.getMenuId(),"salesbackitem"));
if (ObjectUtil.isEmpty(salesbackitemObj)){
Object arinvoices_item0soitemObj=authorizeService.getCondition(new AuthorizeConditionModel(arinvoices_item0soitemQueryWrapper,saleorderPagination.getMenuId(),"arinvoices_item0soitem"));
if (ObjectUtil.isEmpty(arinvoices_item0soitemObj)){
return new ArrayList<>();
} else {
salesbackitemQueryWrapper = (QueryWrapper<SalesbackitemEntity>)salesbackitemObj;
salesbackitemNum++;
arinvoices_item0soitemQueryWrapper = (QueryWrapper<Arinvoices_item0soitemEntity>)arinvoices_item0soitemObj;
arinvoices_item0soitemNum++;
}
@ -418,28 +457,34 @@ public class SaleorderitemServiceImpl extends ServiceImpl<SaleorderitemMapper, S
return salesorder_item0Service.list(queryWrapper);
}
@Override
public List<ReceiptoutitemEntity> GetReceiptoutitemList(String id){
QueryWrapper<ReceiptoutitemEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(ReceiptoutitemEntity::getSourceNo, id);
return receiptoutitemService.list(queryWrapper);
public List<ReceiptoutsoitemEntity> GetReceiptoutsoitemList(String id){
QueryWrapper<ReceiptoutsoitemEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(ReceiptoutsoitemEntity::getSourceNo, id);
return receiptoutsoitemService.list(queryWrapper);
}
@Override
public List<CollectionsoitemEntity> GetCollectionsoitemList(String id){
QueryWrapper<CollectionsoitemEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(CollectionsoitemEntity::getSalesOrderNo, id);
return collectionsoitemService.list(queryWrapper);
}
@Override
public List<CollectionitemEntity> GetCollectionitemList(String id){
QueryWrapper<CollectionitemEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(CollectionitemEntity::getSalesOrderNo, id);
return collectionitemService.list(queryWrapper);
public List<Arinvoices_item0soitemEntity> GetArinvoices_item0soitemList(String id){
QueryWrapper<Arinvoices_item0soitemEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(Arinvoices_item0soitemEntity::getSalesOrderNo, id);
return arinvoices_item0soitemService.list(queryWrapper);
}
@Override
public List<ArinvoicesitemEntity> GetArinvoicesitemList(String id){
QueryWrapper<ArinvoicesitemEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(ArinvoicesitemEntity::getSalesOrderNo, id);
return arinvoicesitemService.list(queryWrapper);
public List<SalesbacksoitemEntity> GetSalesbacksoitemList(String id){
QueryWrapper<SalesbacksoitemEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SalesbacksoitemEntity::getSalesOrderId, id);
return salesbacksoitemService.list(queryWrapper);
}
@Override
public List<SalesbackitemEntity> GetSalesbackitemList(String id){
QueryWrapper<SalesbackitemEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SalesbackitemEntity::getSalesOrderId, id);
return salesbackitemService.list(queryWrapper);
public List<PaymentsoitemEntity> GetPaymentsoitemList(String id){
QueryWrapper<PaymentsoitemEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(PaymentsoitemEntity::getPaymentno, id);
return paymentsoitemService.list(queryWrapper);
}
//列表子表数据方法

14
SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SalesbackitemServiceImpl.java → SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SalesbacksoitemServiceImpl.java
Unescape View File

@ -1,21 +1,13 @@
package jnpf.saleorder.service.impl;
import jnpf.saleorder.entity.*;
import jnpf.saleorder.mapper.SalesbackitemMapper;
import jnpf.saleorder.mapper.SalesbacksoitemMapper;
import jnpf.saleorder.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;
@ -32,10 +24,10 @@ import java.util.*;
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-31
* 日期： 2023-02-03
*/
@Service
public class SalesbackitemServiceImpl extends ServiceImpl<SalesbackitemMapper, SalesbackitemEntity> implements SalesbackitemService{
public class SalesbacksoitemServiceImpl extends ServiceImpl<SalesbacksoitemMapper, SalesbacksoitemEntity> implements SalesbacksoitemService{
}

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

@ -32,7 +32,7 @@ import java.util.*;
* 版本： V3.2.0
* 版权： LINKAGE-BOOT
* 作者： LINKAGE-BOOT研发团队
* 日期： 2023-01-31
* 日期： 2023-02-03
*/
@Service
public class Salesorder_item0ServiceImpl extends ServiceImpl<Salesorder_item0Mapper, Salesorder_item0Entity> implements Salesorder_item0Service{

1
SC-web/src/components/Generator/generator/config.js
Unescape View File

@ -839,7 +839,6 @@ export const selectComponents = [
labelWidth: undefined,
showLabel: true,
tag: "el-input",
defaultValue: "",
tagIcon: "icon-ym icon-ym-generator-documents",
defaultValue: null,
layout: "colFormItem",

254
SC-web/src/views/scm/basicInformation/purchaseorder/Detail.vue
Unescape View File

@ -1,14 +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="详情"/>
<div class="options">
<el-button @click="goBack">取 消</el-button>
</div>
</div>
<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '1000px'}">
<el-dialog title="详情"
: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" size="small" label-width="100px" label-position="right" >
<template v-if="!loading">
<el-col :span="8" >
@ -17,12 +12,6 @@
<p>{{dataForm.documentNo}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="供应商"
prop="supplierName" >
<p>{{dataForm.supplierName}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="合同名称"
prop="contractName" >
@ -30,25 +19,31 @@
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="制单人"
prop="creatorUserName" >
<p>{{dataForm.creatorUserName}}</p>
<el-form-item label="供应商名称"
prop="supplierName" >
<p>{{dataForm.supplierName}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="部门id"
prop="departmentId" >
<p>{{dataForm.departmentId}}</p>
<el-form-item label="币种"
prop="currency" >
<p>{{ dataForm.currency | dynamicText(currencyOptions) }} </p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="对方合同"
<el-form-item label="对方合同号"
prop="contractNo" >
<p>{{dataForm.contractNo}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="数量"
<el-form-item label="垫资金额"
prop="advanceAmount" >
<p>{{dataForm.advanceAmount}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="重量"
prop="num" >
<p>{{dataForm.num}}</p>
</el-form-item>
@ -65,22 +60,22 @@
<p>{{dataForm.notAmount}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="币别 "
prop="currency" >
<p>{{ dataForm.currency | dynamicText(currencyOptions) }} </p>
</el-form-item>
</el-col>
<el-col :span="16" >
<el-form-item label="备注信息"
prop="remark" >
<p>{{dataForm.remark}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="制单人"
prop="creatorUserName" >
<p>{{dataForm.creatorUserName}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="制单时间"
prop="creatorTime" >
<p>{{jnpf.dateFormat(dataForm.creatorTime)}}</p>
<p>{{dataForm.creatorTime}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
@ -107,12 +102,6 @@
<p>{{dataForm.invoiceAmount}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="垫资金额"
prop="advanceAmount" >
<p>{{dataForm.advanceAmount}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="单据状态 "
prop="status" >
@ -120,7 +109,7 @@
</el-form-item>
</el-col>
<el-col :span="24">
<el-tabs v-model="activenfqest" tab-position="top" class="mb-20">
<el-tabs v-model="activedhrfmu" tab-position="top" class="mb-20">
<el-tab-pane label="磅单信息">
<el-col :span="24" >
<el-form-item label-width="0">
@ -139,7 +128,7 @@
<p>{{scope.row.materialName}}</p>
</template>
</el-table-column>
<el-table-column prop="pountType" label="磅单类型 ">
<el-table-column prop="pountType" label="类型 ">
<template slot-scope="scope">
<p>{{ scope.row.pountType | dynamicText(pountTypeOptions) }}</p>
</template>
@ -188,6 +177,20 @@
<template slot-scope="scope">
<p>{{scope.row.remark}}</p>
</template>
</el-table-column>
<el-table-column prop="poundPictures" label="磅单图片">
<template slot-scope="scope">
<!-- <p>{{scope.row.poundPictures}}</p>-->
<JNPF-UploadImg v-model="scope.row.poundPictures"
disabled
detailed :fileSize="500" sizeUnit="MB" :limit="9" >
</JNPF-UploadImg>
</template>
</el-table-column>
<el-table-column prop="vehiclePictures" label="车辆图片">
<template slot-scope="scope">
<p>{{scope.row.vehiclePictures}}</p>
</template>
</el-table-column>
</el-table>
</el-form-item>
@ -199,11 +202,60 @@
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.invoicesitemList" size='mini' >
<el-table :data="dataForm.invoices_item0itemList" size='mini' >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="documentNo" label="单据编号">
<el-table-column prop="invoiceNo" label="发票编号">
<template slot-scope="scope">
<p>{{scope.row.documentNo}}</p>
<p>{{scope.row.invoiceNo}}</p>
</template>
</el-table-column>
<el-table-column prop="invoiceCode" label="发票代码">
<template slot-scope="scope">
<p>{{scope.row.invoiceCode}}</p>
</template>
</el-table-column>
<el-table-column prop="invoiceAmount" label="金额">
<template slot-scope="scope">
<p>{{scope.row.invoiceAmount}}</p>
</template>
</el-table-column>
<el-table-column prop="taxRate" label="税率 ">
<template slot-scope="scope">
<p>{{ scope.row.taxRate | dynamicText(taxRateOptions) }}</p>
</template>
</el-table-column>
<el-table-column prop="amountNotTax" label="不含税金额">
<template slot-scope="scope">
<p>{{scope.row.amountNotTax}}</p>
</template>
</el-table-column>
<el-table-column prop="taxAmount" label="税额">
<template slot-scope="scope">
<p>{{scope.row.taxAmount}}</p>
</template>
</el-table-column>
<el-table-column prop="invoiceStatus" label="发票状态 ">
<template slot-scope="scope">
<p>{{ scope.row.invoiceStatus | dynamicText(invoiceStatusOptions) }}</p>
</template>
</el-table-column>
<el-table-column prop="invoicingDate" label="开票时间">
<template slot-scope="scope">
<p>{{jnpf.dateFormat(scope.row.invoicingDate)}}</p>
</template>
</el-table-column>
<el-table-column prop="creatorUserName" label="开票人">
<template slot-scope="scope">
<p>{{scope.row.creatorUserName}}</p>
</template>
</el-table-column>
<el-table-column prop="invoiceAttachment" label="发票附件">
<template slot-scope="scope">
<p>{{scope.row.invoiceAttachment}}</p>
<!-- <JNPF-UploadFz v-model="scope.row.invoiceAttachment"-->
<!-- disabled-->
<!-- detailed :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" >-->
<!-- </JNPF-UploadFz>-->
</template>
</el-table-column>
</el-table>
@ -216,27 +268,37 @@
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.paymentdocitemList" size='mini' >
<el-table :data="dataForm.paymentitemList" size='mini' >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="documentNo" label="付款单号">
<el-table-column prop="paymentno" label="付款单号">
<template slot-scope="scope">
<p>{{scope.row.documentNo}}</p>
<p>{{scope.row.documentno}}</p>
</template>
</el-table-column>
<el-table-column prop="paymentAmount" label="付款金额">
<el-table-column prop="duedate" label="付款时间">
<template slot-scope="scope">
<p>{{scope.row.paymentAmount}}</p>
<p>{{jnpf.dateFormat(scope.row.duedate)}}</p>
</template>
</el-table-column>
<el-table-column prop="paymentType" label="付款类型 ">
<el-table-column prop="paymentamount" label="付款金额">
<template slot-scope="scope">
<p>{{ scope.row.paymentType | dynamicText(paymentTypeOptions) }}</p>
<p>{{scope.row.paymentamount}}</p>
</template>
</el-table-column>
<el-table-column prop="settlementtype" label="付款方式">
<template slot-scope="scope">
<p>{{ scope.row.settlementtype | dynamicText(settlementtypeOptions) }}</p>
</template>
</el-table-column>
<el-table-column prop="remark" label="备注">
<template slot-scope="scope">
<p>{{scope.row.remark}}</p>
</template>
</el-table-column>
<el-table-column prop="creatorUserName" label="付款人">
<template slot-scope="scope">
<p>{{scope.row.creatorUserName}}</p>
</template>
</el-table-column>
</el-table>
</el-form-item>
@ -254,30 +316,77 @@
<template slot-scope="scope">
<p>{{scope.row.documentNo}}</p>
</template>
</el-table-column>
<el-table-column prop="creatorTime" label="退货时间">
<template slot-scope="scope">
<p>{{jnpf.dateFormat(scope.row.creatorTime)}}</p>
</template>
</el-table-column>
<el-table-column prop="refundNum" label="退货数量">
<template slot-scope="scope">
<p>{{scope.row.refundNum}}</p>
</template>
</el-table-column>
<el-table-column prop="refundAmount" label="退款金额">
<el-table-column prop="refundAmount" label="应退金额">
<template slot-scope="scope">
<p>{{scope.row.refundAmount}}</p>
</template>
</el-table-column>
<el-table-column prop="creatorUserName" label="退货人">
<template slot-scope="scope">
<p>{{scope.row.creatorUserName}}</p>
</template>
</el-table-column>
</el-table>
</el-form-item>
</el-col>
</el-tab-pane >
<el-tab-pane label="退款信息">
<el-col :span="24" >
<el-form-item label-width="0">
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.collectionitemList" size='mini' >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="salesOrderNo" label="收款单号">
<template slot-scope="scope">
<p>{{scope.row.salesOrderNo}}</p>
</template>
</el-table-column>
<el-table-column prop="creatorTime" label="收款时间">
<template slot-scope="scope">
<p>{{jnpf.dateFormat(scope.row.creatorTime)}}</p>
</template>
</el-table-column>
<el-table-column prop="amountCollected" label="收款金额">
<template slot-scope="scope">
<p>{{scope.row.amountCollected}}</p>
</template>
</el-table-column>
<el-table-column prop="settlementType" label="付款方式">
<template slot-scope="scope">
<p>{{ scope.row.settlementType | dynamicText(settlementTypeOptions) }}</p>
</template>
</el-table-column>
<el-table-column prop="remark" label="备注">
<template slot-scope="scope">
<p>{{scope.row.remark}}</p>
</template>
</el-table-column>
</el-table>
</el-form-item>
</el-col>
</el-tab-pane >
</el-tabs>
</el-col>
</template>
</el-form>
</el-row>
</div>
</transition>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false"> 取 消</el-button>
</span>
</el-dialog>
</template>
<script>
import request from '@/utils/request'
@ -295,29 +404,29 @@
dataForm: {
id :'',
documentNo : '',
contractName : "",
supplierName : '',
contractName : '',
creatorUserName : '',
departmentId : '',
currency : "0",
contractNo : '',
advanceAmount : '',
num : '',
amount : '',
notAmount : '',
currency : "0",
remark : '',
creatorTime : '',
creatorUserName : "",
creatorTime : "",
erpNo : '',
payPrice : '',
invoiceNum : '',
invoiceAmount : '',
advanceAmount : '',
status : "0",
purchaseorder_item0List:[],
invoicesitemList:[],
paymentdocitemList:[],
invoices_item0itemList:[],
paymentitemList:[],
purchasebackitemList:[],
collectionitemList:[],
},
activenfqest:'0',
activedhrfmu:'4',
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"}],
@ -325,7 +434,10 @@
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"}],
taxRateOptions:[{"fullName":"13","id":"0"},{"fullName":"9","id":"1"},{"fullName":"6","id":"2"},{"fullName":"5","id":"3"},{"fullName":"3","id":"4"},{"fullName":"0","id":"5"}],
invoiceStatusOptions:[{"fullName":"正常","id":"0"},{"fullName":"红冲","id":"1"},{"fullName":"作废","id":"2"}],
settlementtypeOptions:[{"fullName":"现金","id":"0"},{"fullName":"赊购","id":"1"},{"fullName":"网银","id":"2"},{"fullName":"银企直连","id":"3"},{"fullName":"银票","id":"4"},{"fullName":"商票","id":"5"}],
settlementTypeOptions:[{"fullName":"现金","id":"0"},{"fullName":"赊购","id":"1"},{"fullName":"网银","id":"2"},{"fullName":"银企直连","id":"3"},{"fullName":"银票","id":"4"},{"fullName":"商票","id":"5"}],
}
},
computed: {},
@ -340,21 +452,25 @@
for(let i=0;i<_dataAll.purchaseorder_item0List.length;i++){
var _list = _dataAll.purchaseorder_item0List[i];
}
for(let i=0;i<_dataAll.invoicesitemList.length;i++){
var _list = _dataAll.invoicesitemList[i];
for(let i=0;i<_dataAll.invoices_item0itemList.length;i++){
var _list = _dataAll.invoices_item0itemList[i];
_list.invoicingDate = _list.invoicingDate ? jnpf.dateFormat(_list.invoicingDate) : ''
}
for(let i=0;i<_dataAll.paymentdocitemList.length;i++){
var _list = _dataAll.paymentdocitemList[i];
for(let i=0;i<_dataAll.paymentitemList.length;i++){
var _list = _dataAll.paymentitemList[i];
_list.duedate = _list.duedate ? jnpf.dateFormat(_list.duedate) : ''
}
for(let i=0;i<_dataAll.purchasebackitemList.length;i++){
var _list = _dataAll.purchasebackitemList[i];
_list.creatorTime = _list.creatorTime ? jnpf.dateFormat(_list.creatorTime) : ''
}
for(let i=0;i<_dataAll.collectionitemList.length;i++){
var _list = _dataAll.collectionitemList[i];
_list.creatorTime = _list.creatorTime ? jnpf.dateFormat(_list.creatorTime) : ''
}
this.dataForm = _dataAll
},
goBack() {
this.$emit('refresh')
},
init(id) {
this.dataForm.id = id || 0;
this.visible = true;

619
SC-web/src/views/scm/basicInformation/purchaseorder/Form.vue
Unescape View File

@ -1,25 +1,16 @@
<template>
<el-dialog :title="!dataForm.id ? '新建' : isDetail ? '详情':'编辑'"
<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-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="单据编号"
prop="documentNo" >
<el-input v-model="dataForm.documentNo"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="供应商"
prop="supplierName" >
<el-input v-model="dataForm.supplierName"
placeholder="请输入" clearable :style='{"width":"100%"}'>
placeholder="系统自动生成" readonly >
</el-input>
</el-form-item>
@ -27,41 +18,52 @@
<el-col :span="8" >
<el-form-item label="合同名称"
prop="contractName" >
<el-input v-model="dataForm.contractName"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<popupSelect v-model="dataForm.contractName"
placeholder="请选择" clearable field="contractName" interfaceId="390143765857220229" :columnOptions="contractNamecolumnOptions" propsValue="contract_name" relationField="contract_name" popupType="dialog"
popupTitle="选择数据" popupWidth="800px" @change="popupSelectChange">
</el-input>
</popupSelect>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="制单人"
prop="creatorUserName" >
<el-input v-model="dataForm.creatorUserName"
<el-form-item label="供应商名称"
prop="supplierName" >
<el-input v-model="dataForm.supplierName"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="部门id"
prop="departmentId" >
<dep-select v-model="dataForm.departmentId"
placeholder="请选择" clearable >
<el-form-item label="币种"
prop="currency" >
<el-select v-model="dataForm.currency"
placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in currencyOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
</dep-select>
</el-select>
</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%"}' >
</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="数量"
<el-form-item label="重量"
prop="num" >
<el-input v-model="dataForm.num"
placeholder="请输入" clearable :style='{"width":"100%"}'>
@ -87,16 +89,6 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="币别 "
prop="currency" >
<el-select v-model="dataForm.currency"
placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in currencyOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="16" >
<el-form-item label="备注信息"
prop="remark" >
@ -106,9 +98,72 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="制单人"
prop="creatorUserName" >
<el-input v-model="dataForm.creatorUserName"
placeholder="系统自动生成" readonly >
</el-input>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="制单时间"
prop="creatorTime" >
<el-input v-model="dataForm.creatorTime"
placeholder="系统自动生成" readonly >
</el-input>
</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="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-tabs v-model="activedhrfmu" tab-position="top" class="mb-20">
<el-tab-pane label="磅单信息">
<el-col :span="24" >
<el-form-item label-width="0">
@ -119,27 +174,26 @@
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="licenseNum" label="车牌号">
<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 v-model="scope.row.licenseNum"
placeholder="请选择" clearable :field="'licenseNum'+scope.$index" interfaceId="389754644018016581"
:bissId="dataForm.contractCode" :columnOptions="purchaseorder_item0licenseNumcolumnOptions" propsValue="license_no"
relationField="license_no" popupType="dialog" @change="popupSelectChange2"
popupWidth="800px"
>
</popupSelect>
</template>
</el-table-column>
<el-table-column prop="materialName" label="物料名称">
<template slot-scope="scope">
<el-input v-model="scope.row.materialName"
placeholder="请输入" clearable :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"300%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="pountType" label="磅单类型 ">
<el-table-column prop="pountType" label="类型 ">
<template slot-scope="scope">
<el-select v-model="scope.row.pountType"
placeholder="请选择" clearable :style='{"width":"100%"}'>
placeholder="请选择" clearable :style='{"width":"300%"}'>
<el-option v-for="(item, index) in pountTypeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
</el-select>
</template>
@ -147,14 +201,14 @@
<el-table-column prop="netWeight" label="净重">
<template slot-scope="scope">
<el-input v-model="scope.row.netWeight"
placeholder="请输入" clearable :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"300%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="unit" label="单位 ">
<template slot-scope="scope">
<el-select v-model="scope.row.unit"
placeholder="请选择" clearable :style='{"width":"100%"}'>
placeholder="请选择" clearable :style='{"width":"200%"}'>
<el-option v-for="(item, index) in unitOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
</el-select>
</template>
@ -170,21 +224,21 @@
<el-table-column prop="price" label="单价">
<template slot-scope="scope">
<el-input v-model="scope.row.price"
placeholder="请输入" clearable :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"300%"}' >
</el-input>
</template>
</el-table-column>
<el-table-column prop="settlement" label="结算重量 ">
<template slot-scope="scope">
<el-input v-model="scope.row.settlement"
placeholder="请输入" clearable :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"300%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="rate" label="税率 ">
<template slot-scope="scope">
<el-select v-model="scope.row.rate"
placeholder="请选择" clearable :style='{"width":"100%"}'>
placeholder="请选择" clearable :style='{"width":"100%"}' ref="rateRef" @change="Addsum">
<el-option v-for="(item, index) in rateOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
</el-select>
</template>
@ -192,21 +246,40 @@
<el-table-column prop="amount" label="金额">
<template slot-scope="scope">
<el-input v-model="scope.row.amount"
placeholder="请输入" clearable :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"300%"}' >
</el-input>
</template>
</el-table-column>
<el-table-column prop="notAmount" label="不含税金额">
<template slot-scope="scope">
<el-input v-model="scope.row.notAmount"
placeholder="请输入" clearable :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"300%"}'
>
</el-input>
</template>
</el-table-column>
<el-table-column prop="remark" label="备注">
<template slot-scope="scope">
<el-input v-model="scope.row.remark"
placeholder="请输入" clearable :style='{"width":"100%"}'>
placeholder="请输入" clearable :style='{"width":"300%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="poundPictures" label="磅单图片">
<template slot-scope="scope">
<JNPF-UploadImg v-model="scope.row.poundPictures" :fileSize="500" sizeUnit="MB" :limit="9">
</JNPF-UploadImg>
<!-- <el-input v-model="scope.row.poundPictures"-->
<!-- placeholder="请输入" clearable :style='{"width":"100%"}'>-->
<!-- </el-input>-->
</template>
</el-table-column>
<el-table-column prop="vehiclePictures" label="车辆图片">
<template slot-scope="scope">
<el-input v-model="scope.row.vehiclePictures"
placeholder="请输入" clearable :style='{"width":"300%"}'>
</el-input>
</template>
</el-table-column>
@ -222,28 +295,95 @@
</el-form-item>
</el-col>
</el-tab-pane >
<el-tab-pane label="发票信息">
<el-tab-pane v-if="" label="发票信息">
<el-col :span="24" >
<el-form-item label-width="0">
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.invoicesitemList" size='mini' >
<el-table :data="dataForm.invoices_item0itemList" size='mini' >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="documentNo" label="单据编号">
<el-table-column prop="invoiceNo" label="发票编号">
<template slot-scope="scope">
<el-input v-model="scope.row.documentNo"
<el-input v-model="scope.row.invoiceNo"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="invoiceCode" label="发票代码">
<template slot-scope="scope">
<el-input v-model="scope.row.invoiceCode"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="invoiceAmount" label="金额">
<template slot-scope="scope">
<el-input v-model="scope.row.invoiceAmount"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="taxRate" label="税率 ">
<template slot-scope="scope">
<el-select v-model="scope.row.taxRate"
placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in taxRateOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column prop="amountNotTax" label="不含税金额">
<template slot-scope="scope">
<el-input v-model="scope.row.amountNotTax"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="taxAmount" label="税额">
<template slot-scope="scope">
<el-input v-model="scope.row.taxAmount"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="invoiceStatus" label="发票状态 ">
<template slot-scope="scope">
<el-select v-model="scope.row.invoiceStatus"
placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in invoiceStatusOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column prop="invoicingDate" label="开票时间">
<template slot-scope="scope">
<el-date-picker v-model="scope.row.invoicingDate"
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >
</el-date-picker>
</template>
</el-table-column>
<el-table-column prop="creatorUserName" label="开票人">
<template slot-scope="scope">
<el-input v-model="scope.row.creatorUserName"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="invoiceAttachment" label="发票附件">
<template slot-scope="scope">
<el-input v-model="scope.row.invoiceAttachment"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column label="操作" width="50" >
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delinvoicesitemList(scope.$index)">删除</el-button>
<el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delinvoices_item0itemList(scope.$index)">删除</el-button>
</template>
</el-table-column>
</el-table>
<div class="table-actions" @click="addinvoicesitemList()">
<div class="table-actions" @click="addinvoices_item0itemList()">
<el-button type="text" icon="el-icon-plus">添加</el-button>
</div>
</el-form-item>
@ -255,44 +395,58 @@
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.paymentdocitemList" size='mini' >
<el-table :data="dataForm.paymentitemList" size='mini' >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="documentNo" label="付款单号">
<el-table-column prop="paymentno" label="付款单号">
<template slot-scope="scope">
<el-input v-model="scope.row.documentNo"
<el-input v-model="scope.row.documentno"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="paymentAmount" label="付款金额">
<el-table-column prop="duedate" label="付款时间">
<template slot-scope="scope">
<el-input v-model="scope.row.paymentAmount"
<el-date-picker v-model="scope.row.duedate"
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >
</el-date-picker>
</template>
</el-table-column>
<el-table-column prop="paymentamount" label="付款金额">
<template slot-scope="scope">
<el-input v-model="scope.row.paymentamount"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="paymentType" label="付款类型 ">
<el-table-column prop="settlementtype" label="付款方式">
<template slot-scope="scope">
<el-select v-model="scope.row.paymentType"
<el-select v-model="scope.row.settlementtype"
placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in paymentTypeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
<el-option v-for="(item, index) in settlementtypeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column prop="remark" label="备注">
<template slot-scope="scope">
<el-input v-model="scope.row.remark"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="creatorUserName" label="付款人">
<template slot-scope="scope">
<el-input v-model="scope.row.creatorUserName"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column label="操作" width="50" >
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delpaymentdocitemList(scope.$index)">删除</el-button>
<el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delpaymentitemList(scope.$index)">删除</el-button>
</template>
</el-table-column>
</el-table>
<div class="table-actions" @click="addpaymentdocitemList()">
<div class="table-actions" @click="addpaymentitemList()">
<el-button type="text" icon="el-icon-plus">添加</el-button>
</div>
</el-form-item>
@ -312,6 +466,13 @@
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="creatorTime" label="退货时间">
<template slot-scope="scope">
<el-date-picker v-model="scope.row.creatorTime"
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >
</el-date-picker>
</template>
</el-table-column>
<el-table-column prop="refundNum" label="退货数量">
<template slot-scope="scope">
@ -320,9 +481,16 @@
</el-input>
</template>
</el-table-column>
<el-table-column prop="refundAmount" label="退款金额">
<el-table-column prop="refundAmount" label="应退金额">
<template slot-scope="scope">
<el-input v-model="scope.row.refundAmount"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="creatorUserName" label="退货人">
<template slot-scope="scope">
<el-input v-model="scope.row.creatorUserName"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
@ -340,7 +508,65 @@
</el-col>
</el-tab-pane >
<el-tab-pane label="退款信息">
<el-col :span="24" >
<el-form-item label-width="0">
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.collectionitemList" size='mini' >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="salesOrderNo" label="收款单号">
<template slot-scope="scope">
<el-input v-model="scope.row.documentNo"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="creatorTime" label="收款时间">
<template slot-scope="scope">
<el-date-picker v-model="scope.row.creatorTime"
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >
</el-date-picker>
</template>
</el-table-column>
<el-table-column prop="amountCollected" label="收款金额">
<template slot-scope="scope">
<el-input v-model="scope.row.amountCollected"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="settlementType" label="付款方式">
<template slot-scope="scope">
<el-select v-model="scope.row.settlementType"
placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in settlementTypeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column prop="remark" label="备注">
<template slot-scope="scope">
<el-input v-model="scope.row.remark"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column label="操作" width="50" >
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delcollectionitemList(scope.$index)">删除</el-button>
</template>
</el-table-column>
</el-table>
<div class="table-actions" @click="addcollectionitemList()">
<el-button type="text" icon="el-icon-plus">添加</el-button>
</div>
</el-form-item>
</el-col>
</el-tab-pane >
</el-tabs>
</el-col>
</template>
@ -361,109 +587,130 @@
props: [],
data() {
return {
bissId: 'HT001',
visible: false,
loading: false,
isDetail: false,
dataForm: {
documentNo : '',
contractCode : '',
contractName : "",
supplierName : '',
contractName : '',
creatorUserName : '',
departmentId : '',
currency : "0",
contractNo : '',
advanceAmount : '',
num : '',
amount : '',
notAmount : '',
currency : "0",
remark : '',
creatorTime : '',
creatorUserName : "",
creatorTime : "",
erpNo : '',
payPrice : '',
invoiceNum : '',
invoiceAmount : '',
advanceAmount : '',
status : "0",
purchaseorder_item0List:[],
invoicesitemList:[],
paymentdocitemList:[],
invoices_item0itemList:[],
paymentitemList:[],
purchasebackitemList:[],
collectionitemList:[],
},
activenfqest:'0',
activedhrfmu:'4',
rules:
{
contractName: [
{
required: true,
message: '请选择',
trigger: 'change'
},
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'
}]
],
},
contractNamecolumnOptions:[ {"label":"合同编码","value":"contract_code"}, {"label":"合同名称","value":"contract_name"}, {"label":"合同类型","value":"contract_type"}, {"label":"供应商/客户名称","value":"name"}],
currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
statusOptions:[{"fullName":"待开票","id":"0"},{"fullName":"开票中","id":"1"},{"fullName":"付款中","id":"2"},{"fullName":"归档","id":"3"}],
purchaseorder_item0licenseNumcolumnOptions:[ {"label":"车牌号","value":"license_no"}, {"label":"物料名称","value":"material_name"},{"label":"磅单类型","value":"pound_type"},{"label":"净重","value":"net_weight"},
{"label":"计量单位","value":"unit"}, {"label":"是否垫资","value":"advance"},{"label":"采购单价","value":"purchase_price"},
{"label":"结算重量","value":"settlement"}, {"label":"税率","value":"rate"}, {"label":"备注","value":"remark"},
{"label":"磅单图片","value":"pound_pictures"},{"label":"车辆图片","value":"vehicle_pictures"}, ],
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"}],
taxRateOptions:[{"fullName":"13","id":"0"},{"fullName":"9","id":"1"},{"fullName":"6","id":"2"},{"fullName":"5","id":"3"},{"fullName":"3","id":"4"},{"fullName":"0","id":"5"}],
invoiceStatusOptions:[{"fullName":"正常","id":"0"},{"fullName":"红冲","id":"1"},{"fullName":"作废","id":"2"}],
settlementtypeOptions:[{"fullName":"现金","id":"0"},{"fullName":"赊购","id":"1"},{"fullName":"网银","id":"2"},{"fullName":"银企直连","id":"3"},{"fullName":"银票","id":"4"},{"fullName":"商票","id":"5"}],
settlementTypeOptions:[{"fullName":"现金","id":"0"},{"fullName":"赊购","id":"1"},{"fullName":"网银","id":"2"},{"fullName":"银企直连","id":"3"},{"fullName":"银票","id":"4"},{"fullName":"商票","id":"5"}],
}
},
computed: {},
watch: {},
watch: {
dataForm: {
deep: true,
handler: function() {
this.amountSum();
this.notAmountSum();
this.settlementSum();
this.advanceSum();
}
}
},
created() {
},
mounted() {},
methods: {
Addsum(){
for (let i = 0;i<this.dataForm.purchaseorder_item0List.length;i++) {
this.dataForm.purchaseorder_item0List[i].notAmount = this.dataForm.purchaseorder_item0List[i].amount * this.dataForm.purchaseorder_item0List[i].rate;
}
},
amountSum(){
for (let i = 0;i<this.dataForm.purchaseorder_item0List.length;i++){
this.dataForm.amount = this.dataForm.purchaseorder_item0List.reduce((sum,e) => sum + Number(e.amount || 0),0);
}
},
settlementSum(){
for (let i = 0;i<this.dataForm.purchaseorder_item0List.length;i++){
this.dataForm.num = this.dataForm.purchaseorder_item0List.reduce((sum,e) => sum + Number(e.settlement || 0),0);
}
},
notAmountSum(){
for (let i = 0;i<this.dataForm.purchaseorder_item0List.length;i++){
this.dataForm.notAmount = this.dataForm.purchaseorder_item0List.reduce((sum,e) => sum + Number(e.notAmount || 0),0);
}
},
advanceSum(){
let sum = 0;
for (let i = 0;i<this.dataForm.purchaseorder_item0List.length;i++){
if (this.dataForm.purchaseorder_item0List[i].advance == 1){
sum = sum + this.dataForm.purchaseorder_item0List[i].amount;
}
}
this.dataForm.advanceAmount = sum;
},
popupSelectChange(e,d){
this.dataForm.supplierName = d.name;
this.dataForm.contractCode = d.contract_code;
},
popupSelectChange2(a, b){
for (let i = 0; i < this.dataForm.purchaseorder_item0List.length; i++) {
if(a == this.dataForm.purchaseorder_item0List[i].licenseNum){
this.dataForm.purchaseorder_item0List[i].materialName = b.material_name;
this.dataForm.purchaseorder_item0List[i].pountType = b.pount_type;
this.dataForm.purchaseorder_item0List[i].settlement = b.settlement;
this.dataForm.purchaseorder_item0List[i].netWeight = b.net_weight;
this.dataForm.purchaseorder_item0List[i].unit = b.unit;
this.dataForm.purchaseorder_item0List[i].advance = b.advance;
this.dataForm.purchaseorder_item0List[i].price = b.price;
this.dataForm.purchaseorder_item0List[i].settlement = b.settlement;
this.dataForm.purchaseorder_item0List[i].price = b.purchase_price;
this.dataForm.purchaseorder_item0List[i].rate = b.rate;
this.dataForm.purchaseorder_item0List[i].amount = b.amount;
this.dataForm.purchaseorder_item0List[i].notAmount = b.not_amount;
this.dataForm.purchaseorder_item0List[i].pountUser = b.pount_user;
this.dataForm.purchaseorder_item0List[i].remark = b.remark;
this.dataForm.purchaseorder_item0List[i].poundPictures = b.pound_pictures;
this.dataForm.purchaseorder_item0List[i].vehiclePictures = b.vehicle_pictures;
this.dataForm.purchaseorder_item0List[i].pountType = b.pound_type;
// a = a + pound_pictures;
// }{
// a = a + this.dataForm.purchaseorder_item0List[i].poundPictures;
}
}
},
@ -474,17 +721,17 @@
}
return isOk;
},
invoicesitemExist() {
invoices_item0itemExist() {
let isOk = true;
for(let i=0;i<this.dataForm.invoicesitemList.length;i++){
const e = this.dataForm.invoicesitemList[i];
for(let i=0;i<this.dataForm.invoices_item0itemList.length;i++){
const e = this.dataForm.invoices_item0itemList[i];
}
return isOk;
},
paymentdocitemExist() {
paymentitemExist() {
let isOk = true;
for(let i=0;i<this.dataForm.paymentdocitemList.length;i++){
const e = this.dataForm.paymentdocitemList[i];
for(let i=0;i<this.dataForm.paymentitemList.length;i++){
const e = this.dataForm.paymentitemList[i];
}
return isOk;
},
@ -495,8 +742,12 @@
}
return isOk;
},
goBack() {
this.$emit('refresh')
collectionitemExist() {
let isOk = true;
for(let i=0;i<this.dataForm.collectionitemList.length;i++){
const e = this.dataForm.collectionitemList[i];
}
return isOk;
},
clearData(data){
for (let key in data) {
@ -535,9 +786,10 @@
this.$refs['elForm'].validate((valid) => {
if (valid) {
if (!this.purchaseorder_item0Exist()) return
if (!this.invoicesitemExist()) return
if (!this.paymentdocitemExist()) return
if (!this.invoices_item0itemExist()) return
if (!this.paymentitemExist()) return
if (!this.purchasebackitemExist()) return
if (!this.collectionitemExist()) return
this.request()
}
})
@ -592,58 +844,90 @@
amount:undefined,
notAmount:undefined,
remark:undefined,
poundPictures:undefined,
vehiclePictures:undefined,
}
this.dataForm.purchaseorder_item0List.push(item)
},
delpurchaseorder_item0List(index) {
this.dataForm.purchaseorder_item0List.splice(index, 1);
},
addinvoicesitemList(){
addinvoices_item0itemList(){
let item = {
documentNo:undefined,
invoiceNo:undefined,
invoiceCode:undefined,
invoiceAmount:undefined,
taxRate:undefined,
amountNotTax:undefined,
taxAmount:undefined,
invoiceStatus:undefined,
invoicingDate:undefined,
creatorUserName:undefined,
invoiceAttachment:undefined,
}
this.dataForm.invoicesitemList.push(item)
this.dataForm.invoices_item0itemList.push(item)
},
delinvoicesitemList(index) {
this.dataForm.invoicesitemList.splice(index, 1);
delinvoices_item0itemList(index) {
this.dataForm.invoices_item0itemList.splice(index, 1);
},
addpaymentdocitemList(){
addpaymentitemList(){
let item = {
documentNo:undefined,
paymentAmount:undefined,
paymentType:undefined,
paymentno:undefined,
duedate:undefined,
paymentamount:undefined,
settlementtype:undefined,
remark:undefined,
creatorUserName:undefined,
}
this.dataForm.paymentdocitemList.push(item)
this.dataForm.paymentitemList.push(item)
},
delpaymentdocitemList(index) {
this.dataForm.paymentdocitemList.splice(index, 1);
delpaymentitemList(index) {
this.dataForm.paymentitemList.splice(index, 1);
},
addpurchasebackitemList(){
let item = {
documentNo:undefined,
creatorTime:undefined,
refundNum:undefined,
refundAmount:undefined,
creatorUserName:undefined,
}
this.dataForm.purchasebackitemList.push(item)
},
delpurchasebackitemList(index) {
this.dataForm.purchasebackitemList.splice(index, 1);
},
addcollectionitemList(){
let item = {
documentNo:undefined,
salesOrderNo:undefined,
creatorTime:undefined,
amountCollected:undefined,
settlementType:undefined,
remark:undefined,
}
this.dataForm.collectionitemList.push(item)
},
delcollectionitemList(index) {
this.dataForm.collectionitemList.splice(index, 1);
},
dataList(){
var _data = JSON.parse(JSON.stringify(this.dataForm));
for(let i=0;i<_data.purchaseorder_item0List.length;i++){
var _list = _data.purchaseorder_item0List[i];
}
for(let i=0;i<_data.invoicesitemList.length;i++){
var _list = _data.invoicesitemList[i];
for(let i=0;i<_data.invoices_item0itemList.length;i++){
var _list = _data.invoices_item0itemList[i];
}
for(let i=0;i<_data.paymentdocitemList.length;i++){
var _list = _data.paymentdocitemList[i];
for(let i=0;i<_data.paymentitemList.length;i++){
var _list = _data.paymentitemList[i];
}
for(let i=0;i<_data.purchasebackitemList.length;i++){
var _list = _data.purchasebackitemList[i];
}
for(let i=0;i<_data.collectionitemList.length;i++){
var _list = _data.collectionitemList[i];
}
return _data;
},
dataInfo(dataAll){
@ -651,15 +935,18 @@
for(let i=0;i<_dataAll.purchaseorder_item0List.length;i++){
var _list = _dataAll.purchaseorder_item0List[i];
}
for(let i=0;i<_dataAll.invoicesitemList.length;i++){
var _list = _dataAll.invoicesitemList[i];
for(let i=0;i<_dataAll.invoices_item0itemList.length;i++){
var _list = _dataAll.invoices_item0itemList[i];
}
for(let i=0;i<_dataAll.paymentdocitemList.length;i++){
var _list = _dataAll.paymentdocitemList[i];
for(let i=0;i<_dataAll.paymentitemList.length;i++){
var _list = _dataAll.paymentitemList[i];
}
for(let i=0;i<_dataAll.purchasebackitemList.length;i++){
var _list = _dataAll.purchasebackitemList[i];
}
for(let i=0;i<_dataAll.collectionitemList.length;i++){
var _list = _dataAll.collectionitemList[i];
}
this.dataForm = _dataAll
},
},

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

@ -26,6 +26,8 @@
</el-button>
<el-button type="text" icon="el-icon-delete" @click="handleBatchRemoveDel()" >批量删除
</el-button>
<el-button type="primary" icon="el-icon-plus" @click="pigeonhole()">归档
</el-button>
</div>
<div class="JNPF-common-head-right">
<el-tooltip effect="dark" content="刷新" placement="top">
@ -42,13 +44,13 @@
/>
<el-table-column prop="contractName" label="合同名称" width="0" align="left"
/>
<el-table-column prop="supplierName" label="供应商" width="0" align="left"
<el-table-column prop="supplierName" label="供应商名称" width="0" align="left"
/>
<el-table-column prop="amount" label="金额" width="0" align="left"
/>
<el-table-column prop="num" label="数量" width="0" align="left"
<el-table-column prop="num" label="重量" width="0" align="left"
/>
<el-table-column label="币别 " width="0" prop="currency" algin="left"
<el-table-column label="币种" width="0" prop="currency" algin="left"
>
<template slot-scope="scope">
{{ scope.row.currency | dynamicText(currencyOptions) }}
@ -80,6 +82,8 @@
</el-button>
<el-button type="text" class="JNPF-table-delBtn" @click="handleDel(scope.row.id)">删除
</el-button>
<el-button type="text" @click="goDetail(scope.row.id)">详情
</el-button>
</template>
</el-table-column>
</JNPF-table>
@ -128,10 +132,10 @@
{prop: 'documentNo', label: '单据编号'},
{prop: 'erpNo', label: 'ERP订单号'},
{prop: 'contractName', label: '合同名称'},
{prop: 'supplierName', label: '供应商'},
{prop: 'supplierName', label: '供应商名称'},
{prop: 'amount', label: '金额'},
{prop: 'num', label: '数量'},
{prop: 'currency', label: '币别 '},
{prop: 'num', label: '重量'},
{prop: 'currency', label: '币种'},
{prop: 'payPrice', label: '已付款金额'},
{prop: 'invoiceNum', label: '发票数量'},
{prop: 'invoiceAmount', label: '发票金额'},
@ -246,6 +250,11 @@
this.$refs.JNPFForm.init(id, isDetail)
})
},
pigeonhole(id,isDetail){
this.$nextTick(() => {
this.$refs.JNPFForm.init(id,isDetail)
})
},
exportData() {
this.exportBoxVisible = true
this.$nextTick(() => {

193
SC-web/src/views/scm/basicInformation/saleorder/Detail.vue
Unescape View File

@ -19,15 +19,9 @@
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="制单人"
prop="creatorUserName" >
<p>{{dataForm.creatorUserName}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="采购部门"
prop="departmentId" >
<p>{{dataForm.departmentId}}</p>
<el-form-item label="币别"
prop="currency" >
<p>{{ dataForm.currency | dynamicText(currencyOptions) }} </p>
</el-form-item>
</el-col>
<el-col :span="8" >
@ -36,6 +30,12 @@
<p>{{dataForm.contractNo}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="垫资金额"
prop="advanceAmount" >
<p>{{dataForm.advanceAmount}}</p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="数量"
prop="num" >
@ -55,12 +55,6 @@
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="币别"
prop="currency" >
<p>{{ dataForm.currency | dynamicText(currencyOptions) }} </p>
</el-form-item>
</el-col>
<el-col :span="24" >
<el-form-item label="备注信息"
prop="remark" >
<p>{{dataForm.remark}}</p>
@ -102,8 +96,14 @@
<p>{{ dataForm.status | dynamicText(statusOptions) }} </p>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="制单人"
prop="creatorUserName" >
<p>{{dataForm.creatorUserName}}</p>
</el-form-item>
</el-col>
<el-col :span="24">
<el-tabs v-model="activevtrqft" tab-position="top" class="mb-20">
<el-tabs v-model="activexvlbvm" tab-position="top" class="mb-20">
<el-tab-pane label="磅单信息">
<el-col :span="24" >
<el-form-item label-width="0">
@ -167,6 +167,20 @@
<p>{{scope.row.noPrice}}</p>
</template>
</el-table-column>
<el-table-column prop="poundPictures" label="磅单图片">
<template slot-scope="scope">
<!-- <p>{{scope.row.poundPictures}}</p>-->
<JNPF-UploadImg v-model="scope.row.poundPictures"
disabled
detailed :fileSize="500" sizeUnit="MB" :limit="9" >
</JNPF-UploadImg>
</template>
</el-table-column>
<el-table-column prop="vehiclePictures" label="车辆图片">
<template slot-scope="scope">
<p>{{scope.row.vehiclePictures}}</p>
</template>
</el-table-column>
</el-table>
</el-form-item>
</el-col>
@ -177,7 +191,7 @@
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.receiptoutitemList" size='mini' >
<el-table :data="dataForm.receiptoutsoitemList" size='mini' >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="documentNo" label="出库单号">
<template slot-scope="scope">
@ -209,7 +223,7 @@
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.collectionitemList" size='mini' >
<el-table :data="dataForm.collectionsoitemList" size='mini' >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="paymentType" label="收款类型 ">
<template slot-scope="scope">
@ -236,17 +250,65 @@
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.arinvoicesitemList" size='mini' >
<el-table :data="dataForm.arinvoices_item0soitemList" size='mini' >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="invoiceAmount" label="发票金额">
<el-table-column prop="invoiceNo" label="发票编号">
<template slot-scope="scope">
<p>{{scope.row.invoiceNo}}</p>
</template>
</el-table-column>
<el-table-column prop="invoiceCode" label="发票代码">
<template slot-scope="scope">
<p>{{scope.row.invoiceCode}}</p>
</template>
</el-table-column>
<el-table-column prop="involceAmount" label="发票金额">
<template slot-scope="scope">
<p>{{scope.row.invoiceAmount}}</p>
<p>{{scope.row.involceAmount}}</p>
</template>
</el-table-column>
<el-table-column prop="invoiceQuantity" label="发票数量">
<template slot-scope="scope">
<p>{{scope.row.invoiceQuantity}}</p>
</template>
</el-table-column>
<el-table-column prop="taxRate" label="税率 ">
<template slot-scope="scope">
<p>{{ scope.row.taxRate | dynamicText(taxRateOptions) }}</p>
</template>
</el-table-column>
<el-table-column prop="amountNotTax" label="不含税金额">
<template slot-scope="scope">
<p>{{scope.row.amountNotTax}}</p>
</template>
</el-table-column>
<el-table-column prop="taxAmount" label="税额">
<template slot-scope="scope">
<p>{{scope.row.taxAmount}}</p>
</template>
</el-table-column>
<el-table-column prop="invoiceStatus" label="发票状态 ">
<template slot-scope="scope">
<p>{{ scope.row.invoiceStatus | dynamicText(invoiceStatusOptions) }}</p>
</template>
</el-table-column>
<el-table-column prop="creatorUserName" label="开票人">
<template slot-scope="scope">
<p>{{scope.row.creatorUserName}}</p>
</template>
</el-table-column>
<el-table-column prop="invoiceDate" label="开票日期">
<template slot-scope="scope">
<p>{{jnpf.dateFormat(scope.row.invoiceDate)}}</p>
</template>
</el-table-column>
<el-table-column prop="attachMent" label="发票附件 ">
<template slot-scope="scope">
<JNPF-UploadFz v-model="scope.row.attachMent"
disabled
detailed :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" >
</JNPF-UploadFz>
</template>
</el-table-column>
</el-table>
</el-form-item>
@ -260,7 +322,7 @@
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.salesbackitemList" size='mini' >
<el-table :data="dataForm.salesbacksoitemList" size='mini' >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="documentNo" label="退货单号">
<template slot-scope="scope">
@ -276,12 +338,52 @@
<template slot-scope="scope">
<p>{{scope.row.refundAmount}}</p>
</template>
</el-table-column>
<el-table-column prop="creatorTime" label="退货日期">
<template slot-scope="scope">
<p>{{jnpf.dateFormat(scope.row.creatorTime)}}</p>
</template>
</el-table-column>
</el-table>
</el-form-item>
</el-col>
</el-tab-pane >
<el-tab-pane label="退款信息">
<el-col :span="24" >
<el-form-item label-width="0">
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.paymentsoitemList" size='mini' >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="documentno" label="付款单号">
<template slot-scope="scope">
<p>{{scope.row.documentno}}</p>
</template>
</el-table-column>
<el-table-column prop="settlementtype" label="付款方式">
<template slot-scope="scope">
<p>{{ scope.row.settlementtype | dynamicText(settlementtypeOptions) }}</p>
</template>
</el-table-column>
<el-table-column prop="duedate" label="付款日期">
<template slot-scope="scope">
<p>{{jnpf.dateFormat(scope.row.duedate)}}</p>
</template>
</el-table-column>
<el-table-column prop="paymentamount" label="付款金额">
<template slot-scope="scope">
<p>{{scope.row.paymentamount}}</p>
</template>
</el-table-column>
<el-table-column prop="remark" label="备注">
<template slot-scope="scope">
<p>{{scope.row.remark}}</p>
</template>
</el-table-column>
</el-table>
</el-form-item>
</el-col>
</el-tab-pane >
<el-tab-pane label="补充信息">
</el-tab-pane >
@ -311,14 +413,13 @@
dataForm: {
id :'',
documentNo : '',
contractName : '',
creatorUserName : '',
departmentId : '',
contractName : "",
currency : "0",
contractNo : '',
advanceAmount : '',
num : '',
price : '',
notPrice : '',
currency : "0",
remark : '',
costomerName : '',
amountCollected : '',
@ -326,13 +427,15 @@
invoiceAmount : '',
sourceSystem : "0",
status : "0",
creatorUserName : "",
salesorder_item0List:[],
receiptoutitemList:[],
collectionitemList:[],
arinvoicesitemList:[],
salesbackitemList:[],
receiptoutsoitemList:[],
collectionsoitemList:[],
arinvoices_item0soitemList:[],
salesbacksoitemList:[],
paymentsoitemList:[],
},
activevtrqft:'0',
activexvlbvm:'0',
currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
sourceSystemOptions:[{"fullName":"人工创建","id":"0"},{"fullName":"商城平台","id":"1"}],
statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"开票中","id":"1"},{"fullName":"付款申请","id":"2"},{"fullName":"待回款","id":"3"},{"fullName":"回款中","id":"4"},{"fullName":"归档","id":"5"}],
@ -342,6 +445,9 @@
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"}],
taxRateOptions:[{"fullName":"13","id":"0"},{"fullName":"9","id":"1"},{"fullName":"6","id":"2"},{"fullName":"5","id":"3"},{"fullName":"3","id":"4"},{"fullName":"0","id":"5"}],
invoiceStatusOptions:[{"fullName":"正常","id":"0"},{"fullName":"红冲","id":"1"},{"fullName":"作废","id":"2"}],
settlementtypeOptions:[{"fullName":"现金","id":"0"},{"fullName":"赊购","id":"1"},{"fullName":"网银","id":"2"},{"fullName":"银企直连","id":"3"},{"fullName":"银票","id":"4"},{"fullName":"商票","id":"5"}],
}
},
computed: {},
@ -356,18 +462,25 @@
for(let i=0;i<_dataAll.salesorder_item0List.length;i++){
var _list = _dataAll.salesorder_item0List[i];
}
for(let i=0;i<_dataAll.receiptoutitemList.length;i++){
var _list = _dataAll.receiptoutitemList[i];
for(let i=0;i<_dataAll.receiptoutsoitemList.length;i++){
var _list = _dataAll.receiptoutsoitemList[i];
_list.issueDate = _list.issueDate ? jnpf.dateFormat(_list.issueDate) : ''
}
for(let i=0;i<_dataAll.collectionitemList.length;i++){
var _list = _dataAll.collectionitemList[i];
for(let i=0;i<_dataAll.collectionsoitemList.length;i++){
var _list = _dataAll.collectionsoitemList[i];
}
for(let i=0;i<_dataAll.arinvoices_item0soitemList.length;i++){
var _list = _dataAll.arinvoices_item0soitemList[i];
_list.invoiceDate = _list.invoiceDate ? jnpf.dateFormat(_list.invoiceDate) : ''
_list.attachMent = _list.attachMent? JSON.parse(_list.attachMent):[]
}
for(let i=0;i<_dataAll.arinvoicesitemList.length;i++){
var _list = _dataAll.arinvoicesitemList[i];
for(let i=0;i<_dataAll.salesbacksoitemList.length;i++){
var _list = _dataAll.salesbacksoitemList[i];
_list.creatorTime = _list.creatorTime ? jnpf.dateFormat(_list.creatorTime) : ''
}
for(let i=0;i<_dataAll.salesbackitemList.length;i++){
var _list = _dataAll.salesbackitemList[i];
for(let i=0;i<_dataAll.paymentsoitemList.length;i++){
var _list = _dataAll.paymentsoitemList[i];
_list.duedate = _list.duedate ? jnpf.dateFormat(_list.duedate) : ''
}
this.dataForm = _dataAll
},
@ -379,7 +492,7 @@
if(this.dataForm.id){
this.loading = true
request({
url: '/api/salesorder/Saleorder/detail/'+this.dataForm.id,
url: '/api/saleorder/Saleorder/detail/'+this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)

446
SC-web/src/views/scm/basicInformation/saleorder/Form.vue
Unescape View File

@ -10,7 +10,7 @@
<el-form-item label="单据编号"
prop="documentNo" >
<el-input v-model="dataForm.documentNo"
placeholder="请输入" clearable :style='{"width":"100%"}'>
placeholder="系统自动生成" readonly >
</el-input>
</el-form-item>
@ -18,34 +18,37 @@
<el-col :span="8" >
<el-form-item label="合同名称"
prop="contractName" >
<el-input v-model="dataForm.contractName"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<popupSelect v-model="dataForm.contractName"
placeholder="请选择" clearable field="contractName" interfaceId="391146878474963333" :columnOptions="contractNamecolumnOptions" propsValue="contract_name" relationField="contract_name" popupType="dialog"
popupTitle="选择数据" popupWidth="800px" @change="popupSelectChange"
>
</el-input>
</popupSelect>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="制单人"
prop="creatorUserName" >
<el-input v-model="dataForm.creatorUserName"
placeholder="请输入" clearable :style='{"width":"100%"}'>
<el-form-item label="币别"
prop="currency" >
<el-select v-model="dataForm.currency"
placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in currencyOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
</el-input>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="采购部门"
prop="departmentId" >
<dep-select v-model="dataForm.departmentId"
placeholder="请选择" clearable >
<el-form-item label="对方合同"
prop="contractNo" >
<el-input v-model="dataForm.contractNo"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</dep-select>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="对方合同"
prop="contractNo" >
<el-input v-model="dataForm.contractNo"
<el-form-item label="垫资金额"
prop="advanceAmount" >
<el-input v-model="dataForm.advanceAmount"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
@ -79,16 +82,6 @@
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="币别"
prop="currency" >
<el-select v-model="dataForm.currency"
placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in currencyOptions" :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-form-item label="备注信息"
prop="remark" >
<el-input v-model="dataForm.remark"
@ -153,8 +146,17 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-form-item label="制单人"
prop="creatorUserName" >
<el-input v-model="dataForm.creatorUserName"
placeholder="系统自动生成" readonly >
</el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-tabs v-model="activevtrqft" tab-position="top" class="mb-20">
<el-tabs v-model="activexvlbvm" tab-position="top" class="mb-20">
<el-tab-pane label="磅单信息">
<el-col :span="24" >
<el-form-item label-width="0">
@ -165,12 +167,12 @@
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="licenseNum" label="车牌号">
<template slot-scope="scope">
<popupSelect v-model="scope.row.licenseNum" placeholder="请选择"
clearable :field="'licenseNum'+scope.$index"
interfaceId="383568082196537541" :bissId="dataForm.id"
:columnOptions="saleback_item0licenseNumcolumnOptions"
propsValue="license_num" relationField="license_num"
popupType="dialog" popupWidth="800px" @change="popupSelectChange2">
<popupSelect v-model="scope.row.licenseNum"
placeholder="请选择" clearable :field="'licenseNum'+scope.$index" interfaceId="391151974030035653"
:bissId="dataForm.contractCode" :columnOptions="salesorder_item0licenseNumcolumnOptions" propsValue="license_no"
relationField="license_no" popupType="dialog" @change="popupSelectChange2"
popupWidth="800px"
>
</popupSelect>
</template>
</el-table-column>
@ -248,6 +250,23 @@
</el-input>
</template>
</el-table-column>
<el-table-column prop="poundPictures" label="磅单图片">
<template slot-scope="scope">
<JNPF-UploadImg v-model="scope.row.poundPictures" :fileSize="500" sizeUnit="MB" :limit="9">
</JNPF-UploadImg>
<!-- <el-input v-model="scope.row.poundPictures"-->
<!-- placeholder="请输入" clearable :style='{"width":"100%"}'>-->
<!-- </el-input>-->
</template>
</el-table-column>
<el-table-column prop="vehiclePictures" label="车辆图片">
<template slot-scope="scope">
<el-input v-model="scope.row.vehiclePictures"
placeholder="请输入" clearable :style='{"width":"300%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column label="操作" width="50" >
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delsalesorder_item0List(scope.$index)">删除</el-button>
@ -266,7 +285,7 @@
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.receiptoutitemList" size='mini' >
<el-table :data="dataForm.receiptoutsoitemList" size='mini' >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="documentNo" label="出库单号">
<template slot-scope="scope">
@ -298,11 +317,11 @@
</el-table-column>
<el-table-column label="操作" width="50" >
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delreceiptoutitemList(scope.$index)">删除</el-button>
<el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delreceiptoutsoitemList(scope.$index)">删除</el-button>
</template>
</el-table-column>
</el-table>
<div class="table-actions" @click="addreceiptoutitemList()">
<div class="table-actions" @click="addreceiptoutsoitemList()">
<el-button type="text" icon="el-icon-plus">添加</el-button>
</div>
</el-form-item>
@ -314,7 +333,7 @@
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.collectionitemList" size='mini' >
<el-table :data="dataForm.collectionsoitemList" size='mini' >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="paymentType" label="收款类型 ">
<template slot-scope="scope">
@ -340,11 +359,11 @@
</el-table-column>
<el-table-column label="操作" width="50" >
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delcollectionitemList(scope.$index)">删除</el-button>
<el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delcollectionsoitemList(scope.$index)">删除</el-button>
</template>
</el-table-column>
</el-table>
<div class="table-actions" @click="addcollectionitemList()">
<div class="table-actions" @click="addcollectionsoitemList()">
<el-button type="text" icon="el-icon-plus">添加</el-button>
</div>
</el-form-item>
@ -356,11 +375,25 @@
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.arinvoicesitemList" size='mini' >
<el-table :data="dataForm.arinvoices_item0soitemList" size='mini' >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="invoiceAmount" label="发票金额">
<el-table-column prop="invoiceNo" label="发票编号">
<template slot-scope="scope">
<el-input v-model="scope.row.invoiceNo"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="invoiceCode" label="发票代码">
<template slot-scope="scope">
<el-input v-model="scope.row.invoiceCode"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="involceAmount" label="发票金额">
<template slot-scope="scope">
<el-input v-model="scope.row.invoiceAmount"
<el-input v-model="scope.row.involceAmount"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
@ -372,13 +405,64 @@
</el-input>
</template>
</el-table-column>
<el-table-column prop="taxRate" label="税率 ">
<template slot-scope="scope">
<el-select v-model="scope.row.taxRate"
placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in taxRateOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column prop="amountNotTax" label="不含税金额">
<template slot-scope="scope">
<el-input v-model="scope.row.amountNotTax"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="taxAmount" label="税额">
<template slot-scope="scope">
<el-input v-model="scope.row.taxAmount"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="invoiceStatus" label="发票状态 ">
<template slot-scope="scope">
<el-select v-model="scope.row.invoiceStatus"
placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in invoiceStatusOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column prop="creatorUserName" label="开票人">
<template slot-scope="scope">
<el-input v-model="scope.row.creatorUserName"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="invoiceDate" label="开票日期">
<template slot-scope="scope">
<el-date-picker v-model="scope.row.invoiceDate"
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >
</el-date-picker>
</template>
</el-table-column>
<el-table-column prop="attachMent" label="发票附件 ">
<template slot-scope="scope">
<JNPF-UploadFz v-model="scope.row.attachMent"
:fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" >
</JNPF-UploadFz>
</template>
</el-table-column>
<el-table-column label="操作" width="50" >
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delarinvoicesitemList(scope.$index)">删除</el-button>
<el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delarinvoices_item0soitemList(scope.$index)">删除</el-button>
</template>
</el-table-column>
</el-table>
<div class="table-actions" @click="addarinvoicesitemList()">
<div class="table-actions" @click="addarinvoices_item0soitemList()">
<el-button type="text" icon="el-icon-plus">添加</el-button>
</div>
</el-form-item>
@ -392,7 +476,7 @@
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.salesbackitemList" size='mini' >
<el-table :data="dataForm.salesbacksoitemList" size='mini' >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="documentNo" label="退货单号">
<template slot-scope="scope">
@ -415,19 +499,80 @@
</el-input>
</template>
</el-table-column>
<el-table-column prop="creatorTime" label="退货日期">
<template slot-scope="scope">
<el-date-picker v-model="scope.row.creatorTime"
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >
</el-date-picker>
</template>
</el-table-column>
<el-table-column label="操作" width="50" >
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delsalesbackitemList(scope.$index)">删除</el-button>
<el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delsalesbacksoitemList(scope.$index)">删除</el-button>
</template>
</el-table-column>
</el-table>
<div class="table-actions" @click="addsalesbackitemList()">
<div class="table-actions" @click="addsalesbacksoitemList()">
<el-button type="text" icon="el-icon-plus">添加</el-button>
</div>
</el-form-item>
</el-col>
</el-tab-pane >
<el-tab-pane label="退款信息">
<el-col :span="24" >
<el-form-item label-width="0">
<div class="JNPF-common-title">
<h2></h2>
</div>
<el-table :data="dataForm.paymentsoitemList" size='mini' >
<el-table-column type="index" width="50" label="序号" align="center" />
<el-table-column prop="documentno" label="付款单号">
<template slot-scope="scope">
<el-input v-model="scope.row.documentno"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="settlementtype" label="付款方式">
<template slot-scope="scope">
<el-select v-model="scope.row.settlementtype"
placeholder="请选择" clearable :style='{"width":"100%"}'>
<el-option v-for="(item, index) in settlementtypeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column prop="duedate" label="付款日期">
<template slot-scope="scope">
<el-date-picker v-model="scope.row.duedate"
placeholder="请选择" clearable :style='{"width":"100%"}' type="date" format="yyyy-MM-dd" value-format="timestamp" >
</el-date-picker>
</template>
</el-table-column>
<el-table-column prop="paymentamount" label="付款金额">
<template slot-scope="scope">
<el-input v-model="scope.row.paymentamount"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column prop="remark" label="备注">
<template slot-scope="scope">
<el-input v-model="scope.row.remark"
placeholder="请输入" clearable :style='{"width":"100%"}'>
</el-input>
</template>
</el-table-column>
<el-table-column label="操作" width="50" >
<template slot-scope="scope">
<el-button size="mini" type="text" class="JNPF-table-delBtn" @click="delpaymentsoitemList(scope.$index)">删除</el-button>
</template>
</el-table-column>
</el-table>
<div class="table-actions" @click="addpaymentsoitemList()">
<el-button type="text" icon="el-icon-plus">添加</el-button>
</div>
</el-form-item>
</el-col>
</el-tab-pane >
<el-tab-pane label="补充信息">
</el-tab-pane >
@ -456,14 +601,13 @@
isDetail: false,
dataForm: {
documentNo : '',
contractName : '',
creatorUserName : '',
departmentId : '',
contractName : "",
currency : "0",
contractNo : '',
advanceAmount : '',
num : '',
price : '',
notPrice : '',
currency : "0",
remark : '',
costomerName : '',
amountCollected : '',
@ -471,26 +615,42 @@
invoiceAmount : '',
sourceSystem : "0",
status : "0",
creatorUserName : "",
salesorder_item0List:[],
receiptoutitemList:[],
collectionitemList:[],
arinvoicesitemList:[],
salesbackitemList:[],
receiptoutsoitemList:[],
collectionsoitemList:[],
arinvoices_item0soitemList:[],
salesbacksoitemList:[],
paymentsoitemList:[],
},
activevtrqft:'0',
activexvlbvm:'0',
rules:
{
contractName: [
{
required: true,
message: '请选择',
trigger: 'change'
},
],
},
contractNamecolumnOptions:[ {"label":"合同编码","value":"contract_code"}, {"label":"合同名称","value":"contract_name"}, {"label":"合同类型","value":"contract_type"}, {"label":"供应商/客户名称","value":"name"},],
currencyOptions:[{"fullName":"人民币","id":"0"},{"fullName":"美元","id":"1"},{"fullName":"英镑","id":"2"}],
sourceSystemOptions:[{"fullName":"人工创建","id":"0"},{"fullName":"商城平台","id":"1"}],
statusOptions:[{"fullName":"已保存","id":"0"},{"fullName":"开票中","id":"1"},{"fullName":"付款申请","id":"2"},{"fullName":"待回款","id":"3"},{"fullName":"回款中","id":"4"},{"fullName":"归档","id":"5"}],
saleback_item0licenseNumcolumnOptions:[ {"label":"车牌号","value":"license_num"}, {"label":"物料名称","value":"material_name"}, {"label":"结算重量","value":"settlement"}, {"label":"计量单位","value":"unit"}, {"label":"采购单价","value":"unit_price"}, {"label":"税率","value":"rate"}, {"label":"应退金额","value":"price"}, {"label":"税额","value":"no_price"}, {"label":"业务员","value":"pound_user"}, {"label":"磅单类型","value":"pound_type"},],
salesorder_item0licenseNumcolumnOptions:[ {"label":"车牌号","value":"license_no"}, {"label":"物料名称","value":"material_name"},{"label":"磅单类型","value":"pound_type"},{"label":"净重","value":"net_weight"},
{"label":"计量单位","value":"unit"}, {"label":"是否垫资","value":"advance"},{"label":"销售单价","value":"sales_price"},
{"label":"结算重量","value":"settlement"}, {"label":"税率","value":"rate"}, {"label":"备注","value":"remark"},
{"label":"磅单图片","value":"pound_pictures"},{"label":"车辆图片","value":"vehicle_pictures"}, ],
poundTypeOptions:[{"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"}],
taxRateOptions:[{"fullName":"13","id":"0"},{"fullName":"9","id":"1"},{"fullName":"6","id":"2"},{"fullName":"5","id":"3"},{"fullName":"3","id":"4"},{"fullName":"0","id":"5"}],
invoiceStatusOptions:[{"fullName":"正常","id":"0"},{"fullName":"红冲","id":"1"},{"fullName":"作废","id":"2"}],
settlementtypeOptions:[{"fullName":"现金","id":"0"},{"fullName":"赊购","id":"1"},{"fullName":"网银","id":"2"},{"fullName":"银企直连","id":"3"},{"fullName":"银票","id":"4"},{"fullName":"商票","id":"5"}],
}
},
computed: {},
@ -499,22 +659,29 @@
},
mounted() {},
methods: {
popupSelectChange2(a, b){
popupSelectChange(e,d){
this.dataForm.costomerName = d.name;
this.dataForm.contractCode = d.contract_code;
},
popupSelectChange2(a, b) {
let settlementSum = 0;
for (let i = 0; i < this.dataForm.salesorder_item0List.length; i++) {
if(a == this.dataForm.salesorder_item0List[i].licenseNum){
if (a == this.dataForm.salesorder_item0List[i].licenseNum) {
this.dataForm.salesorder_item0List[i].materialName = b.material_name;
this.dataForm.salesorder_item0List[i].pountType = b.pount_type;
this.dataForm.salesorder_item0List[i].settlement = b.settlement;
this.dataForm.salesorder_item0List[i].netWeight = b.net_weight;
this.dataForm.salesorder_item0List[i].unit = b.unit;
// this.dataForm.salesorder_item0List[i].advance = b.advance;
this.dataForm.salesorder_item0List[i].price = b.price;
this.dataForm.salesorder_item0List[i].settlement = b.settlement;
this.dataForm.salesorder_item0List[i].advance = b.advance;
this.dataForm.salesorder_item0List[i].rate = b.rate;
this.dataForm.salesorder_item0List[i].amount = b.amount;
this.dataForm.salesorder_item0List[i].notAmount = b.not_amount;
this.dataForm.salesorder_item0List[i].pountUser = b.pount_user;
this.dataForm.salesorder_item0List[i].remark = b.remark;
this.dataForm.salesorder_item0List[i].poundPictures = b.pound_pictures;
this.dataForm.salesorder_item0List[i].vehiclePictures = b.vehicle_pictures;
this.dataForm.salesorder_item0List[i].poundType = b.pound_type;
this.dataForm.salesorder_item0List[i].unitPrice = b.sales_price;
settlementSum = settlementSum + settlement;
}
}
this.dataForm.num = settlementSum;
},
salesorder_item0Exist() {
let isOk = true;
@ -523,31 +690,38 @@
}
return isOk;
},
receiptoutitemExist() {
receiptoutsoitemExist() {
let isOk = true;
for(let i=0;i<this.dataForm.receiptoutitemList.length;i++){
const e = this.dataForm.receiptoutitemList[i];
for(let i=0;i<this.dataForm.receiptoutsoitemList.length;i++){
const e = this.dataForm.receiptoutsoitemList[i];
}
return isOk;
},
collectionitemExist() {
collectionsoitemExist() {
let isOk = true;
for(let i=0;i<this.dataForm.collectionitemList.length;i++){
const e = this.dataForm.collectionitemList[i];
for(let i=0;i<this.dataForm.collectionsoitemList.length;i++){
const e = this.dataForm.collectionsoitemList[i];
}
return isOk;
},
arinvoicesitemExist() {
arinvoices_item0soitemExist() {
let isOk = true;
for(let i=0;i<this.dataForm.arinvoicesitemList.length;i++){
const e = this.dataForm.arinvoicesitemList[i];
for(let i=0;i<this.dataForm.arinvoices_item0soitemList.length;i++){
const e = this.dataForm.arinvoices_item0soitemList[i];
}
return isOk;
},
salesbackitemExist() {
salesbacksoitemExist() {
let isOk = true;
for(let i=0;i<this.dataForm.salesbackitemList.length;i++){
const e = this.dataForm.salesbackitemList[i];
for(let i=0;i<this.dataForm.salesbacksoitemList.length;i++){
const e = this.dataForm.salesbacksoitemList[i];
}
return isOk;
},
paymentsoitemExist() {
let isOk = true;
for(let i=0;i<this.dataForm.paymentsoitemList.length;i++){
const e = this.dataForm.paymentsoitemList[i];
}
return isOk;
},
@ -571,7 +745,7 @@
if(this.dataForm.id){
this.loading = true
request({
url: '/api/salesorder/Saleorder/'+this.dataForm.id,
url: '/api/saleorder/Saleorder/'+this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
@ -588,10 +762,11 @@
this.$refs['elForm'].validate((valid) => {
if (valid) {
if (!this.salesorder_item0Exist()) return
if (!this.receiptoutitemExist()) return
if (!this.collectionitemExist()) return
if (!this.arinvoicesitemExist()) return
if (!this.salesbackitemExist()) return
if (!this.receiptoutsoitemExist()) return
if (!this.collectionsoitemExist()) return
if (!this.arinvoices_item0soitemExist()) return
if (!this.salesbacksoitemExist()) return
if (!this.paymentsoitemExist()) return
this.request()
}
})
@ -600,7 +775,7 @@
var _data =this.dataList()
if (!this.dataForm.id) {
request({
url: '/api/salesorder/Saleorder',
url: '/api/saleorder/Saleorder',
method: 'post',
data: _data
}).then((res) => {
@ -616,7 +791,7 @@
})
}else{
request({
url: '/api/salesorder/Saleorder/'+this.dataForm.id,
url: '/api/saleorder/Saleorder/'+this.dataForm.id,
method: 'PUT',
data: _data
}).then((res) => {
@ -645,72 +820,101 @@
rate:undefined,
price:undefined,
noPrice:undefined,
poundPictures:undefined,
vehiclePictures:undefined,
}
this.dataForm.salesorder_item0List.push(item)
},
delsalesorder_item0List(index) {
this.dataForm.salesorder_item0List.splice(index, 1);
},
addreceiptoutitemList(){
addreceiptoutsoitemList(){
let item = {
documentNo:undefined,
issueDate:undefined,
num:undefined,
amount:undefined,
}
this.dataForm.receiptoutitemList.push(item)
this.dataForm.receiptoutsoitemList.push(item)
},
delreceiptoutitemList(index) {
this.dataForm.receiptoutitemList.splice(index, 1);
delreceiptoutsoitemList(index) {
this.dataForm.receiptoutsoitemList.splice(index, 1);
},
addcollectionitemList(){
addcollectionsoitemList(){
let item = {
paymentType:undefined,
amountCollected:undefined,
remark:undefined,
}
this.dataForm.collectionitemList.push(item)
this.dataForm.collectionsoitemList.push(item)
},
delcollectionitemList(index) {
this.dataForm.collectionitemList.splice(index, 1);
delcollectionsoitemList(index) {
this.dataForm.collectionsoitemList.splice(index, 1);
},
addarinvoicesitemList(){
addarinvoices_item0soitemList(){
let item = {
invoiceAmount:undefined,
invoiceNo:undefined,
invoiceCode:undefined,
involceAmount:undefined,
invoiceQuantity:undefined,
taxRate:undefined,
amountNotTax:undefined,
taxAmount:undefined,
invoiceStatus:undefined,
creatorUserName:undefined,
invoiceDate:undefined,
attachMent:undefined,
}
this.dataForm.arinvoicesitemList.push(item)
this.dataForm.arinvoices_item0soitemList.push(item)
},
delarinvoicesitemList(index) {
this.dataForm.arinvoicesitemList.splice(index, 1);
delarinvoices_item0soitemList(index) {
this.dataForm.arinvoices_item0soitemList.splice(index, 1);
},
addsalesbackitemList(){
addsalesbacksoitemList(){
let item = {
documentNo:undefined,
refundNum:undefined,
refundAmount:undefined,
creatorTime:undefined,
}
this.dataForm.salesbackitemList.push(item)
this.dataForm.salesbacksoitemList.push(item)
},
delsalesbackitemList(index) {
this.dataForm.salesbackitemList.splice(index, 1);
delsalesbacksoitemList(index) {
this.dataForm.salesbacksoitemList.splice(index, 1);
},
addpaymentsoitemList(){
let item = {
documentno:undefined,
settlementtype:undefined,
duedate:undefined,
paymentamount:undefined,
remark:undefined,
}
this.dataForm.paymentsoitemList.push(item)
},
delpaymentsoitemList(index) {
this.dataForm.paymentsoitemList.splice(index, 1);
},
dataList(){
var _data = JSON.parse(JSON.stringify(this.dataForm));
for(let i=0;i<_data.salesorder_item0List.length;i++){
var _list = _data.salesorder_item0List[i];
}
for(let i=0;i<_data.receiptoutitemList.length;i++){
var _list = _data.receiptoutitemList[i];
for(let i=0;i<_data.receiptoutsoitemList.length;i++){
var _list = _data.receiptoutsoitemList[i];
}
for(let i=0;i<_data.collectionitemList.length;i++){
var _list = _data.collectionitemList[i];
for(let i=0;i<_data.collectionsoitemList.length;i++){
var _list = _data.collectionsoitemList[i];
}
for(let i=0;i<_data.arinvoicesitemList.length;i++){
var _list = _data.arinvoicesitemList[i];
for(let i=0;i<_data.arinvoices_item0soitemList.length;i++){
var _list = _data.arinvoices_item0soitemList[i];
_list.attachMent = JSON.stringify(_list.attachMent)
}
for(let i=0;i<_data.salesbackitemList.length;i++){
var _list = _data.salesbackitemList[i];
for(let i=0;i<_data.salesbacksoitemList.length;i++){
var _list = _data.salesbacksoitemList[i];
}
for(let i=0;i<_data.paymentsoitemList.length;i++){
var _list = _data.paymentsoitemList[i];
}
return _data;
},
@ -719,17 +923,21 @@
for(let i=0;i<_dataAll.salesorder_item0List.length;i++){
var _list = _dataAll.salesorder_item0List[i];
}
for(let i=0;i<_dataAll.receiptoutitemList.length;i++){
var _list = _dataAll.receiptoutitemList[i];
for(let i=0;i<_dataAll.receiptoutsoitemList.length;i++){
var _list = _dataAll.receiptoutsoitemList[i];
}
for(let i=0;i<_dataAll.collectionsoitemList.length;i++){
var _list = _dataAll.collectionsoitemList[i];
}
for(let i=0;i<_dataAll.collectionitemList.length;i++){
var _list = _dataAll.collectionitemList[i];
for(let i=0;i<_dataAll.arinvoices_item0soitemList.length;i++){
var _list = _dataAll.arinvoices_item0soitemList[i];
_list.attachMent = JSON.parse(_list.attachMent)
}
for(let i=0;i<_dataAll.arinvoicesitemList.length;i++){
var _list = _dataAll.arinvoicesitemList[i];
for(let i=0;i<_dataAll.salesbacksoitemList.length;i++){
var _list = _dataAll.salesbacksoitemList[i];
}
for(let i=0;i<_dataAll.salesbackitemList.length;i++){
var _list = _dataAll.salesbackitemList[i];
for(let i=0;i<_dataAll.paymentsoitemList.length;i++){
var _list = _dataAll.paymentsoitemList[i];
}
this.dataForm = _dataAll
},

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

@ -185,7 +185,7 @@ width="150" >
menuId:this.menuId
};
request({
url: `/api/salesorder/Saleorder/getList`,
url: `/api/saleorder/Saleorder/getList`,
method: 'post',
data: _query
}).then(res => {
@ -205,7 +205,7 @@ width="150" >
type: 'warning'
}).then(() => {
request({
url: `/api/salesorder/Saleorder/${id}`,
url: `/api/saleorder/Saleorder/${id}`,
method: 'DELETE'
}).then(res => {
this.$message({
@ -237,7 +237,7 @@ width="150" >
type: 'warning'
}).then(() => {
request({
url: `/api/salesorder/Saleorder/batchRemove/${ids}`,
url: `/api/saleorder/Saleorder/batchRemove/${ids}`,
method: 'DELETE'
}).then(res => {
this.$message({
@ -266,7 +266,7 @@ width="150" >
download(data) {
let query = {...data, ...this.listQuery, ...this.query,menuId:this.menuId}
request({
url: `/api/salesorder/Saleorder/Actions/Export`,
url: `/api/saleorder/Saleorder/Actions/Export`,
method: 'GET',
data: query
}).then(res => {

Write Preview
Loading…
Cancel
Save