diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java index 8e85741a..476fbdb2 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/controller/PurchaseorderController.java @@ -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,12 +68,36 @@ 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 list= purchaseorderitemService.getList(purchaseorderPagination); //处理id字段转名称，若无需转或者为空可删除 for(PurchaseorderitemEntity entity:list){ - entity.setDepartmentId(generaterSwapUtil.comSelectValues(entity.getDepartmentId())); + Map contractNameMap = new HashMap<>(); + entity.setContractName(generaterSwapUtil.getPopupSelectValue("390143765857220229","contract_name","contract_name",entity.getContractName(),contractNameMap)); + entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName())); } List 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 InvoicesitemList = JsonUtil.getJsonToList(purchaseorderCrForm.getInvoicesitemList(),InvoicesitemEntity.class); - for(InvoicesitemEntity entitys : InvoicesitemList){ - entitys.setId(RandomUtil.uuId()); - entitys.setPurchaseorderId(entity.getId()); - - invoicesitemService.save(entitys); - } - - List PaymentdocitemList = JsonUtil.getJsonToList(purchaseorderCrForm.getPaymentdocitemList(),PaymentdocitemEntity.class); - for(PaymentdocitemEntity entitys : PaymentdocitemList){ - entitys.setId(RandomUtil.uuId()); - entitys.setPurchaseOrderNo(entity.getId()); - - - - - paymentdocitemService.save(entitys); - } - - List PurchasebackitemList = JsonUtil.getJsonToList(purchaseorderCrForm.getPurchasebackitemList(),PurchasebackitemEntity.class); - for(PurchasebackitemEntity entitys : PurchasebackitemList){ - entitys.setId(RandomUtil.uuId()); - entitys.setPurchaseOrderId(entity.getId()); - - - - purchasebackitemService.save(entitys); - } - - - +// +// List 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 PaymentitemList = JsonUtil.getJsonToList(purchaseorderCrForm.getPaymentitemList(),PaymentitemEntity.class); +// for(PaymentitemEntity entitys : PaymentitemList){ +// entitys.setId(RandomUtil.uuId()); +// entitys.setDocumentno(entity.getDocumentNo()); +// paymentitemService.save(entitys); +// } +// +// List PurchasebackitemList = JsonUtil.getJsonToList(purchaseorderCrForm.getPurchasebackitemList(),PurchasebackitemEntity.class); +// for(PurchasebackitemEntity entitys : PurchasebackitemList){ +// entitys.setId(RandomUtil.uuId()); +// entitys.setPurchaseOrderId(entity.getId()); +// purchasebackitemService.save(entitys); +// } +// +// List 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 list= purchaseorderitemService.getTypeList(purchaseorderPagination,purchaseorderPaginationExportModel.getDataType()); //处理id字段转名称，若无需转或者为空可删除 for(PurchaseorderitemEntity entity:list){ - entity.setDepartmentId(generaterSwapUtil.comSelectValues(entity.getDepartmentId())); + Map contractNameMap = new HashMap<>(); + entity.setContractName(generaterSwapUtil.getPopupSelectValue("390143765857220229","contract_name","contract_name",entity.getContractName(),contractNameMap)); + entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName())); } List 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 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_item0List = purchaseorderitemService.GetPurchaseorder_item0List(id); for(Purchaseorder_item0Entity purchaseorder_item0Entity : Purchaseorder_item0List){ } vo.setPurchaseorder_item0List(JsonUtil.getJsonToList(Purchaseorder_item0List,Purchaseorder_item0Model.class )); - List InvoicesitemList = purchaseorderitemService.GetInvoicesitemList(id); - for(InvoicesitemEntity invoicesitemEntity : InvoicesitemList){ + QueryWrapper invoicesitemWrapper = new QueryWrapper<>(); + invoicesitemWrapper.lambda().eq(InvoicesitemEntity::getPurchaseorderId,id); + List invoicesitemList = invoicesitemService.list(invoicesitemWrapper); + List Invoices_item0itemList = new ArrayList<>(); + for (InvoicesitemEntity invoicesitemEntity : invoicesitemList){ + List invoices_item0itemList = purchaseorderitemService.GetInvoices_item0itemList(invoicesitemEntity.getId()); + Invoices_item0itemList.addAll(invoices_item0itemList); + } + for(Invoices_item0itemEntity invoices_item0itemEntity : Invoices_item0itemList){ } - vo.setInvoicesitemList(JsonUtil.getJsonToList(InvoicesitemList,InvoicesitemModel.class )); - List PaymentdocitemList = purchaseorderitemService.GetPaymentdocitemList(id); - for(PaymentdocitemEntity paymentdocitemEntity : PaymentdocitemList){ + vo.setInvoices_item0itemList(JsonUtil.getJsonToList(Invoices_item0itemList,Invoices_item0itemModel.class )); + + QueryWrapper PaymentdocpoWrapper = new QueryWrapper<>(); + PaymentdocpoWrapper.lambda().eq(PaymentdocpoEntity::getPurchaseOrderNo,entity.getDocumentNo()); + List paymentdocList = paymentdocpoService.list(PaymentdocpoWrapper); + List PaymentitemList = new ArrayList<>(); + for (PaymentdocpoEntity paymentdocpoEntity : paymentdocList) { + List paymentitemlist = purchaseorderitemService.GetPaymentitemList(paymentdocpoEntity.getDocumentNo()); + PaymentitemList.addAll(paymentitemlist); + } + for(PaymentitemEntity paymentitemEntity : PaymentitemList){ } - vo.setPaymentdocitemList(JsonUtil.getJsonToList(PaymentdocitemList,PaymentdocitemModel.class )); + vo.setPaymentitemList(JsonUtil.getJsonToList(PaymentitemList,PaymentitemModel.class )); List PurchasebackitemList = purchaseorderitemService.GetPurchasebackitemList(id); for(PurchasebackitemEntity purchasebackitemEntity : PurchasebackitemList){ } vo.setPurchasebackitemList(JsonUtil.getJsonToList(PurchasebackitemList,PurchasebackitemModel.class )); + List 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 jg_purchaseorder_item0List = purchaseorderitemService.GetPurchaseorder_item0List(id); List jg_purchaseorder_item0ModelList = JsonUtil.getJsonToList(jg_purchaseorder_item0List,Purchaseorder_item0Model.class); for(Purchaseorder_item0Model jg_purchaseorder_item0Model : jg_purchaseorder_item0ModelList){ - Map licenseNumMap = new HashMap<>(); - jg_purchaseorder_item0Model.setLicenseNum(generaterSwapUtil.getPopupSelectValue("383214061812227333","license_num","license_num",jg_purchaseorder_item0Model.getLicenseNum(),licenseNumMap)); +// Map 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 jg_invoicesList = purchaseorderitemService.GetInvoicesitemList(id); - List jg_invoicesModelList = JsonUtil.getJsonToList(jg_invoicesList,InvoicesitemModel.class); - for(InvoicesitemModel jg_invoicesModel : jg_invoicesModelList){ - } - vo.setInvoicesitemList(jg_invoicesModelList); - List jg_paymentdocList = purchaseorderitemService.GetPaymentdocitemList(id); - List jg_paymentdocModelList = JsonUtil.getJsonToList(jg_paymentdocList,PaymentdocitemModel.class); - for(PaymentdocitemModel jg_paymentdocModel : jg_paymentdocModelList){ - } - vo.setPaymentdocitemList(jg_paymentdocModelList); - List jg_purchasebackList = purchaseorderitemService.GetPurchasebackitemList(id); +// List jg_invoices_item0List = purchaseorderitemService.GetInvoices_item0itemList(id); +// List 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 invoicesitemWrapper = new QueryWrapper<>(); + invoicesitemWrapper.lambda().eq(InvoicesitemEntity::getPurchaseorderId,id); + List invoicesitemList = invoicesitemService.list(invoicesitemWrapper); + List Invoices_item0itemList = new ArrayList<>(); + for (InvoicesitemEntity invoicesitemEntity : invoicesitemList){ + List 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 jg_paymentList = purchaseorderitemService.GetPaymentitemList(id); +// List jg_paymentModelList = JsonUtil.getJsonToList(jg_paymentList,PaymentitemModel.class); +// for(PaymentitemModel jg_paymentModel : jg_paymentModelList){ +// } +// vo.setPaymentitemList(jg_paymentModelList); + + QueryWrapper PaymentdocpoWrapper = new QueryWrapper<>(); + PaymentdocpoWrapper.lambda().eq(PaymentdocpoEntity::getPurchaseOrderNo,entity.getDocumentNo()); + List paymentdocList = paymentdocpoService.list(PaymentdocpoWrapper); + List PaymentitemList = new ArrayList<>(); + for (PaymentdocpoEntity paymentdocpoEntity : paymentdocList) { + List paymentitemlist = purchaseorderitemService.GetPaymentitemList(paymentdocpoEntity.getDocumentNo()); + PaymentitemList.addAll(paymentitemlist); + } + for(PaymentitemEntity paymentitemEntity : PaymentitemList){ + } + vo.setPaymentitemList(JsonUtil.getJsonToList(PaymentitemList,PaymentitemModel.class )); + + List jg_purchasebackList = purchaseorderitemService.GetPurchasebackitemList(id); List jg_purchasebackModelList = JsonUtil.getJsonToList(jg_purchasebackList,PurchasebackitemModel.class); for(PurchasebackitemModel jg_purchasebackModel : jg_purchasebackModelList){ } vo.setPurchasebackitemList(jg_purchasebackModelList); +// List jg_collectionList = purchaseorderitemService.GetCollectionitemList(id); +// List jg_collectionModelList = JsonUtil.getJsonToList(jg_collectionList,CollectionitemModel.class); +// for(CollectionitemModel jg_collectionModel : jg_collectionModelList){ +// } +// vo.setCollectionitemList(jg_collectionModelList); + + List CollectionitemList = purchaseorderitemService.GetCollectionitemList(entity.getDocumentNo()); + for(CollectionpoEntity collectionpoEntity : CollectionitemList){ + } + vo.setCollectionitemList(JsonUtil.getJsonToList(CollectionitemList,CollectionitemModel.class )); //附表数据转换 //添加到详情表单对象中 - vo.setDepartmentId(generaterSwapUtil.comSelectValues(vo.getDepartmentId())); + Map 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); } @@ -423,87 +488,104 @@ public class PurchaseorderController { * @param id * @return */ - @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); - purchaseorderitemService.update(id, subentity); - - QueryWrapper Purchaseorder_item0queryWrapper = new QueryWrapper<>(); - Purchaseorder_item0queryWrapper.lambda().eq(Purchaseorder_item0Entity::getPurchaseorderId, entity.getId()); - purchaseorder_item0Service.remove(Purchaseorder_item0queryWrapper); - - List 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 InvoicesitemqueryWrapper = new QueryWrapper<>(); - InvoicesitemqueryWrapper.lambda().eq(InvoicesitemEntity::getPurchaseorderId, entity.getId()); - invoicesitemService.remove(InvoicesitemqueryWrapper); - - List InvoicesitemList = JsonUtil.getJsonToList(purchaseorderUpForm.getInvoicesitemList(),InvoicesitemEntity.class); - for(InvoicesitemEntity entitys : InvoicesitemList){ - - entitys.setId(RandomUtil.uuId()); - entitys.setPurchaseorderId(entity.getId()); - invoicesitemService.save(entitys); - } - - - QueryWrapper PaymentdocitemqueryWrapper = new QueryWrapper<>(); - PaymentdocitemqueryWrapper.lambda().eq(PaymentdocitemEntity::getPurchaseOrderNo, entity.getId()); - paymentdocitemService.remove(PaymentdocitemqueryWrapper); - - List PaymentdocitemList = JsonUtil.getJsonToList(purchaseorderUpForm.getPaymentdocitemList(),PaymentdocitemEntity.class); - for(PaymentdocitemEntity entitys : PaymentdocitemList){ - - - - - entitys.setId(RandomUtil.uuId()); - entitys.setPurchaseOrderNo(entity.getId()); - paymentdocitemService.save(entitys); - } - - - QueryWrapper PurchasebackitemqueryWrapper = new QueryWrapper<>(); - PurchasebackitemqueryWrapper.lambda().eq(PurchasebackitemEntity::getPurchaseOrderId, entity.getId()); - purchasebackitemService.remove(PurchasebackitemqueryWrapper); - - List PurchasebackitemList = JsonUtil.getJsonToList(purchaseorderUpForm.getPurchasebackitemList(),PurchasebackitemEntity.class); - for(PurchasebackitemEntity entitys : PurchasebackitemList){ - - - - entitys.setId(RandomUtil.uuId()); - entitys.setPurchaseOrderId(entity.getId()); - purchasebackitemService.save(entitys); - } - - return ActionResult.success("更新成功"); - }else{ - return ActionResult.fail("更新失败，数据不存在"); - } - } + @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.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_item0queryWrapper = new QueryWrapper<>(); + Purchaseorder_item0queryWrapper.lambda().eq(Purchaseorder_item0Entity::getPurchaseorderId, entity.getId()); + purchaseorder_item0Service.remove(Purchaseorder_item0queryWrapper); + + List 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_item0itemqueryWrapper = new QueryWrapper<>(); + Invoices_item0itemqueryWrapper.lambda().eq(Invoices_item0itemEntity::getPurchaseorderId, entity.getId()); + invoices_item0itemService.remove(Invoices_item0itemqueryWrapper); + + List Invoices_item0itemList = JsonUtil.getJsonToList(purchaseorderUpForm.getInvoices_item0itemList(), Invoices_item0itemEntity.class); + for (Invoices_item0itemEntity entitys : Invoices_item0itemList) { + entitys.setId(RandomUtil.uuId()); + entitys.setPurchaseorderId(entity.getId()); + invoices_item0itemService.save(entitys); + } + QueryWrapper PaymentdocpoWrapper = new QueryWrapper<>(); + PaymentdocpoWrapper.lambda().eq(PaymentdocpoEntity::getPurchaseOrderNo,entity.getDocumentNo()); + List paymentdocList = paymentdocpoService.list(PaymentdocpoWrapper); + + for (PaymentdocpoEntity paymentdocpoEntity : paymentdocList) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(PaymentitemEntity::getPaymentno,paymentdocpoEntity.getDocumentNo()); + paymentitemService.remove(queryWrapper); + } + + List PaymentitemList = JsonUtil.getJsonToList(purchaseorderUpForm.getPaymentitemList(), PaymentitemEntity.class); + for (PaymentitemEntity entitys : PaymentitemList) { + entitys.setId(RandomUtil.uuId()); + entitys.setPaymentno(entitys.getPaymentno()); + paymentitemService.save(entitys); + } +// QueryWrapper PaymentitemqueryWrapper = new QueryWrapper<>(); +// PaymentitemqueryWrapper.lambda().eq(PaymentitemEntity::getDocumentno, entity.getDocumentNo()); +// paymentitemService.remove(PaymentitemqueryWrapper); +// +// List PaymentitemList = JsonUtil.getJsonToList(purchaseorderUpForm.getPaymentitemList(), PaymentitemEntity.class); +// for (PaymentitemEntity entitys : PaymentitemList) { +// entitys.setId(RandomUtil.uuId()); +// entitys.setDocumentno(entity.getDocumentNo()); +// paymentitemService.save(entitys); +// } + QueryWrapper PurchasebackitemqueryWrapper = new QueryWrapper<>(); + PurchasebackitemqueryWrapper.lambda().eq(PurchasebackitemEntity::getPurchaseOrderId, entity.getId()); + purchasebackitemService.remove(PurchasebackitemqueryWrapper); + + List PurchasebackitemList = JsonUtil.getJsonToList(purchaseorderUpForm.getPurchasebackitemList(), PurchasebackitemEntity.class); + for (PurchasebackitemEntity entitys : PurchasebackitemList) { + entitys.setId(RandomUtil.uuId()); + entitys.setPurchaseOrderId(entity.getId()); + purchasebackitemService.save(entitys); + } + QueryWrapper CollectionitemqueryWrapper = new QueryWrapper<>(); + CollectionitemqueryWrapper.lambda().eq(CollectionpoEntity::getSalesOrderNo, entity.getDocumentNo()); + collectionpoService.remove(CollectionitemqueryWrapper); + + List 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 { + 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 queryWrapperPurchaseorder_item0=new QueryWrapper<>(); queryWrapperPurchaseorder_item0.lambda().eq(Purchaseorder_item0Entity::getPurchaseorderId,entity.getId()); purchaseorder_item0Service.remove(queryWrapperPurchaseorder_item0); - QueryWrapper queryWrapperInvoicesitem=new QueryWrapper<>(); - queryWrapperInvoicesitem.lambda().eq(InvoicesitemEntity::getPurchaseorderId,entity.getId()); - invoicesitemService.remove(queryWrapperInvoicesitem); - QueryWrapper queryWrapperPaymentdocitem=new QueryWrapper<>(); - queryWrapperPaymentdocitem.lambda().eq(PaymentdocitemEntity::getPurchaseOrderNo,entity.getId()); - paymentdocitemService.remove(queryWrapperPaymentdocitem); + QueryWrapper queryWrapperInvoices_item0item=new QueryWrapper<>(); + queryWrapperInvoices_item0item.lambda().eq(Invoices_item0itemEntity::getPurchaseorderId,entity.getId()); + invoices_item0itemService.remove(queryWrapperInvoices_item0item); + QueryWrapper queryWrapperPaymentitem=new QueryWrapper<>(); + queryWrapperPaymentitem.lambda().eq(PaymentitemEntity::getDocumentno,entity.getDocumentNo()); + paymentitemService.remove(queryWrapperPaymentitem); QueryWrapper queryWrapperPurchasebackitem=new QueryWrapper<>(); queryWrapperPurchasebackitem.lambda().eq(PurchasebackitemEntity::getPurchaseOrderId,entity.getId()); purchasebackitemService.remove(queryWrapperPurchasebackitem); + QueryWrapper queryWrapperCollectionitem=new QueryWrapper<>(); + queryWrapperCollectionitem.lambda().eq(CollectionpoEntity::getSalesOrderNo,entity.getDocumentNo()); + collectionpoService.remove(queryWrapperCollectionitem); } return ActionResult.success("删除成功"); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/ArinvoicesitemEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/CollectionpoEntity.java similarity index 74% rename from SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/ArinvoicesitemEntity.java rename to SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/CollectionpoEntity.java index 709c6cce..f4c42910 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/ArinvoicesitemEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/CollectionpoEntity.java @@ -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; + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/Invoices_item0itemEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/Invoices_item0itemEntity.java new file mode 100644 index 00000000..495a8856 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/Invoices_item0itemEntity.java @@ -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; + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/InvoicesitemEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/InvoicesitemEntity.java index 87c24f0f..7483e633 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/InvoicesitemEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/InvoicesitemEntity.java @@ -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,11 +15,11 @@ import com.fasterxml.jackson.annotation.JsonProperty; * @版本： V3.2.0 * @版权： LINKAGE-BOOT * @作者： LINKAGE-BOOT研发团队 - * @日期： 2023-01-30 + * @日期： 2023-01-29 */ @Data @TableName("jg_invoices") -public class InvoicesitemEntity { +public class InvoicesitemEntity { @TableId("ID") private String id; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PaymentdocitemEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PaymentdocpoEntity.java similarity index 91% rename from SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PaymentdocitemEntity.java rename to SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PaymentdocpoEntity.java index 743d9b53..f655cf96 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PaymentdocitemEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PaymentdocpoEntity.java @@ -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; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PaymentitemEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PaymentitemEntity.java new file mode 100644 index 00000000..7425cdac --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PaymentitemEntity.java @@ -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; + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PurchasebackitemEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PurchasebackitemEntity.java index 16c07d11..c3996888 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PurchasebackitemEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PurchasebackitemEntity.java @@ -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") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/Purchaseorder_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/Purchaseorder_item0Entity.java index 59ab2921..4c8fa1cf 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/Purchaseorder_item0Entity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/Purchaseorder_item0Entity.java @@ -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") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PurchaseorderitemEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PurchaseorderitemEntity.java index 2df08fc5..fa4e74c5 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PurchaseorderitemEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/entity/PurchaseorderitemEntity.java @@ -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") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PaymentdocitemMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/CollectionpoMapper.java similarity index 52% rename from SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PaymentdocitemMapper.java rename to SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/CollectionpoMapper.java index f663f036..3232697a 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PaymentdocitemMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/CollectionpoMapper.java @@ -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 { +public interface CollectionpoMapper extends BaseMapper { } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/Invoices_item0itemMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/Invoices_item0itemMapper.java new file mode 100644 index 00000000..06b3f263 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/Invoices_item0itemMapper.java @@ -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 { + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/InvoicesitemMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/InvoicesitemMapper.java index d9f6bc55..14ec01fa 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/InvoicesitemMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/InvoicesitemMapper.java @@ -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 { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PaymentdocpoMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PaymentdocpoMapper.java new file mode 100644 index 00000000..4604b06f --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PaymentdocpoMapper.java @@ -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 { + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PaymentitemMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PaymentitemMapper.java new file mode 100644 index 00000000..111a54f7 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PaymentitemMapper.java @@ -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 { + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PurchasebackitemMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PurchasebackitemMapper.java index b6e7af67..2c540af7 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PurchasebackitemMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PurchasebackitemMapper.java @@ -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 { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/Purchaseorder_item0Mapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/Purchaseorder_item0Mapper.java index cbf73854..65e78934 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/Purchaseorder_item0Mapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/Purchaseorder_item0Mapper.java @@ -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 { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PurchaseorderitemMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PurchaseorderitemMapper.java index 646b69f0..d95ef2d0 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PurchaseorderitemMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/mapper/PurchaseorderitemMapper.java @@ -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 { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PaymentdocitemModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/CollectionitemModel.java similarity index 53% rename from SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PaymentdocitemModel.java rename to SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/CollectionitemModel.java index f74aa3a6..08cb0ba9 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PaymentdocitemModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/CollectionitemModel.java @@ -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; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/Invoices_item0itemModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/Invoices_item0itemModel.java new file mode 100644 index 00000000..2e28ba31 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/Invoices_item0itemModel.java @@ -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; + + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/InvoicesitemModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/InvoicesitemModel.java deleted file mode 100644 index 99bf967e..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/InvoicesitemModel.java +++ /dev/null @@ -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; - - -} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PaymentitemModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PaymentitemModel.java new file mode 100644 index 00000000..0ff852f2 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PaymentitemModel.java @@ -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; + + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchasebackitemModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchasebackitemModel.java index 4cde1229..ff99f66c 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchasebackitemModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchasebackitemModel.java @@ -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; + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderCrForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderCrForm.java index b1af3de9..8f26e99c 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderCrForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderCrForm.java @@ -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_item0List; /** 子表数据 **/ - @JsonProperty("invoicesitemList") - private List invoicesitemList; + @JsonProperty("invoices_item0itemList") + private List invoices_item0itemList; /** 子表数据 **/ - @JsonProperty("paymentdocitemList") - private List paymentdocitemList; + @JsonProperty("paymentitemList") + private List paymentitemList; /** 子表数据 **/ @JsonProperty("purchasebackitemList") private List purchasebackitemList; + /** 子表数据 **/ + @JsonProperty("collectionitemList") + private List collectionitemList; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderInfoVO.java index fa4e2b46..906ccccf 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderInfoVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderInfoVO.java @@ -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_item0List; /** 子表数据 **/ - @JsonProperty("invoicesitemList") - private List invoicesitemList; + @JsonProperty("invoices_item0itemList") + private List invoices_item0itemList; /** 子表数据 **/ - @JsonProperty("paymentdocitemList") - private List paymentdocitemList; + @JsonProperty("paymentitemList") + private List paymentitemList; /** 子表数据 **/ @JsonProperty("purchasebackitemList") private List purchasebackitemList; + /** 子表数据 **/ + @JsonProperty("collectionitemList") + private List collectionitemList; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderListQuery.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderListQuery.java index 2c636523..b75b74dd 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderListQuery.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderListQuery.java @@ -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 { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderListVO.java index 19fd828e..f05e16a1 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderListVO.java @@ -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; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPagination.java index c8c80104..241bbc6f 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPagination.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPagination.java @@ -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 { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPaginationExportModel.java index 05ddd867..d7c0bc7d 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPaginationExportModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderPaginationExportModel.java @@ -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 { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderUpForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderUpForm.java index 66e46d66..b731e39c 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderUpForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/PurchaseorderUpForm.java @@ -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_item0List; /** 子表数据 **/ - @JsonProperty("invoicesitemList") - private List invoicesitemList; + @JsonProperty("invoices_item0itemList") + private List invoices_item0itemList; /** 子表数据 **/ - @JsonProperty("paymentdocitemList") - private List paymentdocitemList; + @JsonProperty("paymentitemList") + private List paymentitemList; /** 子表数据 **/ @JsonProperty("purchasebackitemList") private List purchasebackitemList; + /** 子表数据 **/ + @JsonProperty("collectionitemList") + private List collectionitemList; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/Purchaseorder_item0Model.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/Purchaseorder_item0Model.java index cf6edf43..5f8a7062 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/Purchaseorder_item0Model.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/model/purchaseorder/Purchaseorder_item0Model.java @@ -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; + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/PaymentdocitemService.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/CollectionpoService.java similarity index 52% rename from SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/PaymentdocitemService.java rename to SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/CollectionpoService.java index dd6297a0..fdee02ec 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/PaymentdocitemService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/CollectionpoService.java @@ -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 { +public interface CollectionpoService extends IService { } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/Invoices_item0itemService.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/Invoices_item0itemService.java new file mode 100644 index 00000000..55f6fa76 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/Invoices_item0itemService.java @@ -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 { + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/InvoicesitemService.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/InvoicesitemService.java index b6f6a0fd..c5c60030 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/InvoicesitemService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/InvoicesitemService.java @@ -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 { + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/PaymentdocpoService.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/PaymentdocpoService.java new file mode 100644 index 00000000..115e2fa9 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/PaymentdocpoService.java @@ -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 { + + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/PaymentitemService.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/PaymentitemService.java new file mode 100644 index 00000000..4d396d49 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/PaymentitemService.java @@ -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 { + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/PurchasebackitemService.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/PurchasebackitemService.java index 2fcdd5f4..898a4bd0 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/PurchasebackitemService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/PurchasebackitemService.java @@ -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 { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/Purchaseorder_item0Service.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/Purchaseorder_item0Service.java index 312c09b5..1425bb6b 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/Purchaseorder_item0Service.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/Purchaseorder_item0Service.java @@ -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 { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/PurchaseorderitemService.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/PurchaseorderitemService.java index 31653ba7..9874e383 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/PurchaseorderitemService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/PurchaseorderitemService.java @@ -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 { @@ -33,9 +35,10 @@ public interface PurchaseorderitemService extends IService GetPurchaseorder_item0List(String id); - List GetInvoicesitemList(String id); - List GetPaymentdocitemList(String id); + List GetInvoices_item0itemList(String id); + List GetPaymentitemList(String id); List GetPurchasebackitemList(String id); + List GetCollectionitemList(String id); //列表子表数据方法 } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/CollectionpoServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/CollectionpoServiceImpl.java new file mode 100644 index 00000000..7b646bce --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/CollectionpoServiceImpl.java @@ -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 implements CollectionpoService { + + +} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/Invoices_item0itemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/Invoices_item0itemServiceImpl.java new file mode 100644 index 00000000..df160876 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/Invoices_item0itemServiceImpl.java @@ -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 implements Invoices_item0itemService{ + + +} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/InvoicesitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/InvoicesitemServiceImpl.java index 1957c24f..2f3c7666 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/InvoicesitemServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/InvoicesitemServiceImpl.java @@ -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 implements InvoicesitemService{ +public class InvoicesitemServiceImpl extends ServiceImpl implements InvoicesitemService { + } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PaymentdocpoServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PaymentdocpoServiceImpl.java new file mode 100644 index 00000000..d74de766 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PaymentdocpoServiceImpl.java @@ -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 implements PaymentdocpoService { + + + + +} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PaymentdocitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PaymentitemServiceImpl.java similarity index 79% rename from SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PaymentdocitemServiceImpl.java rename to SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PaymentitemServiceImpl.java index dcd1919e..6fed31cc 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PaymentdocitemServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PaymentitemServiceImpl.java @@ -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 implements PaymentdocitemService{ +public class PaymentitemServiceImpl extends ServiceImpl implements PaymentitemService{ } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchasebackitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchasebackitemServiceImpl.java index f1e0c0b3..ba2d483f 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchasebackitemServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchasebackitemServiceImpl.java @@ -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 implements PurchasebackitemService{ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/Purchaseorder_item0ServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/Purchaseorder_item0ServiceImpl.java index afffa8d9..789db7b4 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/Purchaseorder_item0ServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/Purchaseorder_item0ServiceImpl.java @@ -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 implements Purchaseorder_item0Service{ diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java index 6d409832..247ac6d3 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/purchaseorder/service/impl/PurchaseorderitemServiceImpl.java @@ -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 implements PurchaseorderitemService { @@ -46,14 +46,17 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl purchaseorderQueryWrapper=new QueryWrapper<>(); int purchaseorder_item0Num =0; QueryWrapper purchaseorder_item0QueryWrapper=new QueryWrapper<>(); - int invoicesitemNum =0; - QueryWrapper invoicesitemQueryWrapper=new QueryWrapper<>(); - int paymentdocitemNum =0; - QueryWrapper paymentdocitemQueryWrapper=new QueryWrapper<>(); int purchasebackitemNum =0; QueryWrapper purchasebackitemQueryWrapper=new QueryWrapper<>(); + int invoices_item0itemNum =0; + QueryWrapper invoices_item0itemQueryWrapper=new QueryWrapper<>(); + int paymentitemNum =0; + QueryWrapper paymentitemQueryWrapper=new QueryWrapper<>(); + int collectionitemNum =0; + QueryWrapper 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)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)invoicesitemObj; - invoicesitemNum++; + purchasebackitemQueryWrapper = (QueryWrapper)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)paymentdocitemObj; - paymentdocitemNum++; + invoices_item0itemQueryWrapper = (QueryWrapper)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)purchasebackitemObj; - purchasebackitemNum++; + paymentitemQueryWrapper = (QueryWrapper)paymentitemObj; + paymentitemNum++; + } + Object collectionitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper,purchaseorderPagination.getMenuId(),"collectionitem")); + if (ObjectUtil.isEmpty(collectionitemObj)){ + return new ArrayList<>(); + } else { + collectionitemQueryWrapper = (QueryWrapper)collectionitemObj; + collectionitemNum++; } } } @@ -134,30 +146,39 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl(); } else { - invoicesitemQueryWrapper = (QueryWrapper)invoicesitemObj; - invoicesitemNum++; + purchasebackitemQueryWrapper = (QueryWrapper)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)paymentdocitemObj; - paymentdocitemNum++; + invoices_item0itemQueryWrapper = (QueryWrapper)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)purchasebackitemObj; - purchasebackitemNum++; + paymentitemQueryWrapper = (QueryWrapper)paymentitemObj; + paymentitemNum++; + } + + + Object collectionitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper,purchaseorderPagination.getMenuId(),"collectionitem")); + if (ObjectUtil.isEmpty(collectionitemObj)){ + return new ArrayList<>(); + } else { + collectionitemQueryWrapper = (QueryWrapper)collectionitemObj; + collectionitemNum++; } @@ -204,12 +225,14 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl purchaseorderQueryWrapper=new QueryWrapper<>(); int purchaseorder_item0Num =0; QueryWrapper purchaseorder_item0QueryWrapper=new QueryWrapper<>(); - int invoicesitemNum =0; - QueryWrapper invoicesitemQueryWrapper=new QueryWrapper<>(); - int paymentdocitemNum =0; - QueryWrapper paymentdocitemQueryWrapper=new QueryWrapper<>(); int purchasebackitemNum =0; QueryWrapper purchasebackitemQueryWrapper=new QueryWrapper<>(); + int invoices_item0itemNum =0; + QueryWrapper invoices_item0itemQueryWrapper=new QueryWrapper<>(); + int paymentitemNum =0; + QueryWrapper paymentitemQueryWrapper=new QueryWrapper<>(); + int collectionitemNum =0; + QueryWrapper 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)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)invoicesitemObj; - invoicesitemNum++; + purchasebackitemQueryWrapper = (QueryWrapper)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)paymentdocitemObj; - paymentdocitemNum++; + invoices_item0itemQueryWrapper = (QueryWrapper)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)purchasebackitemObj; - purchasebackitemNum++; + paymentitemQueryWrapper = (QueryWrapper)paymentitemObj; + paymentitemNum++; + } + Object collectionitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionitemQueryWrapper,purchaseorderPagination.getMenuId(),"collectionitem")); + if (ObjectUtil.isEmpty(collectionitemObj)){ + return new ArrayList<>(); + } else { + collectionitemQueryWrapper = (QueryWrapper)collectionitemObj; + collectionitemNum++; } } } @@ -272,30 +302,39 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl(); + } else { + purchasebackitemQueryWrapper = (QueryWrapper)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)invoicesitemObj; - invoicesitemNum++; + invoices_item0itemQueryWrapper = (QueryWrapper)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)paymentdocitemObj; - paymentdocitemNum++; + paymentitemQueryWrapper = (QueryWrapper)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)purchasebackitemObj; - purchasebackitemNum++; + collectionitemQueryWrapper = (QueryWrapper)collectionitemObj; + collectionitemNum++; } @@ -369,16 +408,16 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl GetInvoicesitemList(String id){ - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(InvoicesitemEntity::getPurchaseorderId, id); - return invoicesitemService.list(queryWrapper); + public List GetInvoices_item0itemList(String id){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(Invoices_item0itemEntity::getInvoicesId, id); + return invoices_item0itemService.list(queryWrapper); } @Override - public List GetPaymentdocitemList(String id){ - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(PaymentdocitemEntity::getPurchaseOrderNo, id); - return paymentdocitemService.list(queryWrapper); + public List GetPaymentitemList(String id){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(PaymentitemEntity::getPaymentno, id); + return paymentitemService.list(queryWrapper); } @Override public List GetPurchasebackitemList(String id){ @@ -386,6 +425,13 @@ public class PurchaseorderitemServiceImpl extends ServiceImpl GetCollectionitemList(String id){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(CollectionpoEntity::getSalesOrderNo, id); + queryWrapper.lambda().eq(CollectionpoEntity::getPaymentType,3); + return collectionpoService.list(queryWrapper); + } //列表子表数据方法 diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderController.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderController.java index b3ded6ac..c77ef6e6 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderController.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/controller/SaleorderController.java @@ -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 list= saleorderitemService.getList(saleorderPagination); //处理id字段转名称，若无需转或者为空可删除 for(SaleorderitemEntity entity:list){ - entity.setDepartmentId(generaterSwapUtil.comSelectValues(entity.getDepartmentId())); + Map contractNameMap = new HashMap<>(); + entity.setContractName(generaterSwapUtil.getPopupSelectValue("391146878474963333","contract_name","contract_name",entity.getContractName(),contractNameMap)); + entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName())); } List 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 ReceiptoutitemList = JsonUtil.getJsonToList(saleorderCrForm.getReceiptoutitemList(),ReceiptoutitemEntity.class); - for(ReceiptoutitemEntity entitys : ReceiptoutitemList){ + List 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 CollectionitemList = JsonUtil.getJsonToList(saleorderCrForm.getCollectionitemList(),CollectionitemEntity.class); - for(CollectionitemEntity entitys : CollectionitemList){ + List 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 ArinvoicesitemList = JsonUtil.getJsonToList(saleorderCrForm.getArinvoicesitemList(),ArinvoicesitemEntity.class); - for(ArinvoicesitemEntity entitys : ArinvoicesitemList){ + List 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 SalesbackitemList = JsonUtil.getJsonToList(saleorderCrForm.getSalesbackitemList(),SalesbackitemEntity.class); - for(SalesbackitemEntity entitys : SalesbackitemList){ + List 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 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 list= saleorderitemService.getTypeList(saleorderPagination,saleorderPaginationExportModel.getDataType()); //处理id字段转名称，若无需转或者为空可删除 for(SaleorderitemEntity entity:list){ - entity.setDepartmentId(generaterSwapUtil.comSelectValues(entity.getDepartmentId())); + Map contractNameMap = new HashMap<>(); + entity.setContractName(generaterSwapUtil.getPopupSelectValue("391146878474963333","contract_name","contract_name",entity.getContractName(),contractNameMap)); + entity.setCreatorUserName(generaterSwapUtil.userSelectValue(entity.getCreatorUserName())); } List 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 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_item0List = saleorderitemService.GetSalesorder_item0List(id); for(Salesorder_item0Entity salesorder_item0Entity : Salesorder_item0List){ } vo.setSalesorder_item0List(JsonUtil.getJsonToList(Salesorder_item0List,Salesorder_item0Model.class )); - List ReceiptoutitemList = saleorderitemService.GetReceiptoutitemList(id); - for(ReceiptoutitemEntity receiptoutitemEntity : ReceiptoutitemList){ + List ReceiptoutsoitemList = saleorderitemService.GetReceiptoutsoitemList(id); + for(ReceiptoutsoitemEntity receiptoutsoitemEntity : ReceiptoutsoitemList){ } - vo.setReceiptoutitemList(JsonUtil.getJsonToList(ReceiptoutitemList,ReceiptoutitemModel.class )); - List CollectionitemList = saleorderitemService.GetCollectionitemList(id); - for(CollectionitemEntity collectionitemEntity : CollectionitemList){ + vo.setReceiptoutsoitemList(JsonUtil.getJsonToList(ReceiptoutsoitemList,ReceiptoutsoitemModel.class )); + List CollectionsoitemList = saleorderitemService.GetCollectionsoitemList(id); + for(CollectionsoitemEntity collectionsoitemEntity : CollectionsoitemList){ } - vo.setCollectionitemList(JsonUtil.getJsonToList(CollectionitemList,CollectionitemModel.class )); - List ArinvoicesitemList = saleorderitemService.GetArinvoicesitemList(id); - for(ArinvoicesitemEntity arinvoicesitemEntity : ArinvoicesitemList){ + vo.setCollectionsoitemList(JsonUtil.getJsonToList(CollectionsoitemList,CollectionsoitemModel.class )); + List Arinvoices_item0soitemList = saleorderitemService.GetArinvoices_item0soitemList(id); + for(Arinvoices_item0soitemEntity arinvoices_item0soitemEntity : Arinvoices_item0soitemList){ } - vo.setArinvoicesitemList(JsonUtil.getJsonToList(ArinvoicesitemList,ArinvoicesitemModel.class )); - List SalesbackitemList = saleorderitemService.GetSalesbackitemList(id); - for(SalesbackitemEntity salesbackitemEntity : SalesbackitemList){ + vo.setArinvoices_item0soitemList(JsonUtil.getJsonToList(Arinvoices_item0soitemList,Arinvoices_item0soitemModel.class )); + List SalesbacksoitemList = saleorderitemService.GetSalesbacksoitemList(id); + for(SalesbacksoitemEntity salesbacksoitemEntity : SalesbacksoitemList){ } - vo.setSalesbackitemList(JsonUtil.getJsonToList(SalesbackitemList,SalesbackitemModel.class )); + vo.setSalesbacksoitemList(JsonUtil.getJsonToList(SalesbacksoitemList,SalesbacksoitemModel.class )); + List 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 jg_salesorder_item0List = saleorderitemService.GetSalesorder_item0List(id); List jg_salesorder_item0ModelList = JsonUtil.getJsonToList(jg_salesorder_item0List,Salesorder_item0Model.class); for(Salesorder_item0Model jg_salesorder_item0Model : jg_salesorder_item0ModelList){ - Map licenseNumMap = new HashMap<>(); - jg_salesorder_item0Model.setLicenseNum(generaterSwapUtil.getPopupSelectValue("383568082196537541","license_num","license_num",jg_salesorder_item0Model.getLicenseNum(),licenseNumMap)); +// Map 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 jg_receiptoutList = saleorderitemService.GetReceiptoutitemList(id); - List jg_receiptoutModelList = JsonUtil.getJsonToList(jg_receiptoutList,ReceiptoutitemModel.class); - for(ReceiptoutitemModel jg_receiptoutModel : jg_receiptoutModelList){ + List jg_receiptoutList = saleorderitemService.GetReceiptoutsoitemList(id); + List jg_receiptoutModelList = JsonUtil.getJsonToList(jg_receiptoutList,ReceiptoutsoitemModel.class); + for(ReceiptoutsoitemModel jg_receiptoutModel : jg_receiptoutModelList){ + } + vo.setReceiptoutsoitemList(jg_receiptoutModelList); + List jg_collectionList = saleorderitemService.GetCollectionsoitemList(id); + List jg_collectionModelList = JsonUtil.getJsonToList(jg_collectionList,CollectionsoitemModel.class); + for(CollectionsoitemModel jg_collectionModel : jg_collectionModelList){ } - vo.setReceiptoutitemList(jg_receiptoutModelList); - List jg_collectionList = saleorderitemService.GetCollectionitemList(id); - List jg_collectionModelList = JsonUtil.getJsonToList(jg_collectionList,CollectionitemModel.class); - for(CollectionitemModel jg_collectionModel : jg_collectionModelList){ + vo.setCollectionsoitemList(jg_collectionModelList); + List jg_arinvoices_item0List = saleorderitemService.GetArinvoices_item0soitemList(id); + List 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 jg_arinvoicesList = saleorderitemService.GetArinvoicesitemList(id); - List jg_arinvoicesModelList = JsonUtil.getJsonToList(jg_arinvoicesList,ArinvoicesitemModel.class); - for(ArinvoicesitemModel jg_arinvoicesModel : jg_arinvoicesModelList){ + vo.setArinvoices_item0soitemList(jg_arinvoices_item0ModelList); + List jg_salesbackList = saleorderitemService.GetSalesbacksoitemList(id); + List jg_salesbackModelList = JsonUtil.getJsonToList(jg_salesbackList,SalesbacksoitemModel.class); + for(SalesbacksoitemModel jg_salesbackModel : jg_salesbackModelList){ } - vo.setArinvoicesitemList(jg_arinvoicesModelList); - List jg_salesbackList = saleorderitemService.GetSalesbackitemList(id); - List jg_salesbackModelList = JsonUtil.getJsonToList(jg_salesbackList,SalesbackitemModel.class); - for(SalesbackitemModel jg_salesbackModel : jg_salesbackModelList){ + vo.setSalesbacksoitemList(jg_salesbackModelList); + List jg_paymentList = saleorderitemService.GetPaymentsoitemList(id); + List 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 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_item0queryWrapper = new QueryWrapper<>(); @@ -472,63 +518,90 @@ public class SaleorderController { } - QueryWrapper ReceiptoutitemqueryWrapper = new QueryWrapper<>(); - ReceiptoutitemqueryWrapper.lambda().eq(ReceiptoutitemEntity::getSourceNo, entity.getDocumentNo()); - receiptoutitemService.remove(ReceiptoutitemqueryWrapper); + QueryWrapper ReceiptoutsoitemqueryWrapper = new QueryWrapper<>(); + ReceiptoutsoitemqueryWrapper.lambda().eq(ReceiptoutsoitemEntity::getSourceNo, entity.getDocumentNo()); + receiptoutsoitemService.remove(ReceiptoutsoitemqueryWrapper); - List ReceiptoutitemList = JsonUtil.getJsonToList(saleorderUpForm.getReceiptoutitemList(),ReceiptoutitemEntity.class); - for(ReceiptoutitemEntity entitys : ReceiptoutitemList){ + List 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 CollectionitemqueryWrapper = new QueryWrapper<>(); - CollectionitemqueryWrapper.lambda().eq(CollectionitemEntity::getSalesOrderNo, entity.getId()); - collectionitemService.remove(CollectionitemqueryWrapper); + QueryWrapper CollectionsoitemqueryWrapper = new QueryWrapper<>(); + CollectionsoitemqueryWrapper.lambda().eq(CollectionsoitemEntity::getSalesOrderNo, entity.getDocumentNo()); + collectionsoitemService.remove(CollectionsoitemqueryWrapper); - List CollectionitemList = JsonUtil.getJsonToList(saleorderUpForm.getCollectionitemList(),CollectionitemEntity.class); - for(CollectionitemEntity entitys : CollectionitemList){ + List 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 ArinvoicesitemqueryWrapper = new QueryWrapper<>(); - ArinvoicesitemqueryWrapper.lambda().eq(ArinvoicesitemEntity::getSalesOrderNo, entity.getId()); - arinvoicesitemService.remove(ArinvoicesitemqueryWrapper); + QueryWrapper Arinvoices_item0soitemqueryWrapper = new QueryWrapper<>(); + Arinvoices_item0soitemqueryWrapper.lambda().eq(Arinvoices_item0soitemEntity::getSalesOrderNo, entity.getDocumentNo()); + arinvoices_item0soitemService.remove(Arinvoices_item0soitemqueryWrapper); + + List Arinvoices_item0soitemList = JsonUtil.getJsonToList(saleorderUpForm.getArinvoices_item0soitemList(),Arinvoices_item0soitemEntity.class); + for(Arinvoices_item0soitemEntity entitys : Arinvoices_item0soitemList){ + + + + + + + + - List 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 SalesbackitemqueryWrapper = new QueryWrapper<>(); - SalesbackitemqueryWrapper.lambda().eq(SalesbackitemEntity::getSalesOrderId, entity.getId()); - salesbackitemService.remove(SalesbackitemqueryWrapper); + QueryWrapper SalesbacksoitemqueryWrapper = new QueryWrapper<>(); + SalesbacksoitemqueryWrapper.lambda().eq(SalesbacksoitemEntity::getSalesOrderId, entity.getId()); + salesbacksoitemService.remove(SalesbacksoitemqueryWrapper); + + List SalesbacksoitemList = JsonUtil.getJsonToList(saleorderUpForm.getSalesbacksoitemList(),SalesbacksoitemEntity.class); + for(SalesbacksoitemEntity entitys : SalesbacksoitemList){ - List 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 PaymentsoitemqueryWrapper = new QueryWrapper<>(); + PaymentsoitemqueryWrapper.lambda().eq(PaymentsoitemEntity::getPaymentno, entity.getDocumentNo()); + paymentsoitemService.remove(PaymentsoitemqueryWrapper); + + List 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 queryWrapperSalesorder_item0=new QueryWrapper<>(); queryWrapperSalesorder_item0.lambda().eq(Salesorder_item0Entity::getSalesOrderId,entity.getId()); salesorder_item0Service.remove(queryWrapperSalesorder_item0); - QueryWrapper queryWrapperReceiptoutitem=new QueryWrapper<>(); - queryWrapperReceiptoutitem.lambda().eq(ReceiptoutitemEntity::getSourceNo,entity.getDocumentNo()); - receiptoutitemService.remove(queryWrapperReceiptoutitem); - QueryWrapper queryWrapperCollectionitem=new QueryWrapper<>(); - queryWrapperCollectionitem.lambda().eq(CollectionitemEntity::getSalesOrderNo,entity.getId()); - collectionitemService.remove(queryWrapperCollectionitem); - QueryWrapper queryWrapperArinvoicesitem=new QueryWrapper<>(); - queryWrapperArinvoicesitem.lambda().eq(ArinvoicesitemEntity::getSalesOrderNo,entity.getId()); - arinvoicesitemService.remove(queryWrapperArinvoicesitem); - QueryWrapper queryWrapperSalesbackitem=new QueryWrapper<>(); - queryWrapperSalesbackitem.lambda().eq(SalesbackitemEntity::getSalesOrderId,entity.getId()); - salesbackitemService.remove(queryWrapperSalesbackitem); + QueryWrapper queryWrapperReceiptoutsoitem=new QueryWrapper<>(); + queryWrapperReceiptoutsoitem.lambda().eq(ReceiptoutsoitemEntity::getSourceNo,entity.getDocumentNo()); + receiptoutsoitemService.remove(queryWrapperReceiptoutsoitem); + QueryWrapper queryWrapperCollectionsoitem=new QueryWrapper<>(); + queryWrapperCollectionsoitem.lambda().eq(CollectionsoitemEntity::getSalesOrderNo,entity.getDocumentNo()); + collectionsoitemService.remove(queryWrapperCollectionsoitem); + QueryWrapper queryWrapperArinvoices_item0soitem=new QueryWrapper<>(); + queryWrapperArinvoices_item0soitem.lambda().eq(Arinvoices_item0soitemEntity::getSalesOrderNo,entity.getDocumentNo()); + arinvoices_item0soitemService.remove(queryWrapperArinvoices_item0soitem); + QueryWrapper queryWrapperSalesbacksoitem=new QueryWrapper<>(); + queryWrapperSalesbacksoitem.lambda().eq(SalesbacksoitemEntity::getSalesOrderId,entity.getId()); + salesbacksoitemService.remove(queryWrapperSalesbacksoitem); + QueryWrapper queryWrapperPaymentsoitem=new QueryWrapper<>(); + queryWrapperPaymentsoitem.lambda().eq(PaymentsoitemEntity::getPaymentno,entity.getDocumentNo()); + paymentsoitemService.remove(queryWrapperPaymentsoitem); } return ActionResult.success("删除成功"); diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Arinvoices_item0soitemEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Arinvoices_item0soitemEntity.java new file mode 100644 index 00000000..ba670b29 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Arinvoices_item0soitemEntity.java @@ -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; + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/CollectionitemEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/CollectionsoitemEntity.java similarity index 97% rename from SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/CollectionitemEntity.java rename to SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/CollectionsoitemEntity.java index 4e6ef2ba..5292462d 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/CollectionitemEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/CollectionsoitemEntity.java @@ -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; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/PaymentsoitemEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/PaymentsoitemEntity.java new file mode 100644 index 00000000..2ed6f0f5 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/PaymentsoitemEntity.java @@ -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; + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/ReceiptoutitemEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/ReceiptoutsoitemEntity.java similarity index 96% rename from SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/ReceiptoutitemEntity.java rename to SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/ReceiptoutsoitemEntity.java index 834f578d..5525bf16 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/ReceiptoutitemEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/ReceiptoutsoitemEntity.java @@ -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; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SaleorderitemEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SaleorderitemEntity.java index ef798bd3..7739105b 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SaleorderitemEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SaleorderitemEntity.java @@ -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") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SalesbackitemEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SalesbacksoitemEntity.java similarity index 96% rename from SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SalesbackitemEntity.java rename to SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SalesbacksoitemEntity.java index 84287779..1994b92c 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SalesbackitemEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/SalesbacksoitemEntity.java @@ -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; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Salesorder_item0Entity.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Salesorder_item0Entity.java index 3405d8ba..c175c48b 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Salesorder_item0Entity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/entity/Salesorder_item0Entity.java @@ -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") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/Arinvoices_item0soitemMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/Arinvoices_item0soitemMapper.java new file mode 100644 index 00000000..8f5eb42a --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/Arinvoices_item0soitemMapper.java @@ -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 { + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/CollectionitemMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/CollectionsoitemMapper.java similarity index 55% rename from SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/CollectionitemMapper.java rename to SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/CollectionsoitemMapper.java index 63ed96f8..8b428d91 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/CollectionitemMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/CollectionsoitemMapper.java @@ -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 { +public interface CollectionsoitemMapper extends BaseMapper { } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/ArinvoicesitemMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/PaymentsoitemMapper.java similarity index 52% rename from SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/ArinvoicesitemMapper.java rename to SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/PaymentsoitemMapper.java index 728324d6..3ba1847d 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/ArinvoicesitemMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/PaymentsoitemMapper.java @@ -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 { +public interface PaymentsoitemMapper extends BaseMapper { } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/ReceiptoutitemMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/ReceiptoutsoitemMapper.java similarity index 55% rename from SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/ReceiptoutitemMapper.java rename to SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/ReceiptoutsoitemMapper.java index 995906cf..acd6f6da 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/ReceiptoutitemMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/ReceiptoutsoitemMapper.java @@ -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 { +public interface ReceiptoutsoitemMapper extends BaseMapper { } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SaleorderitemMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SaleorderitemMapper.java index d6146a88..f54ad134 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SaleorderitemMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SaleorderitemMapper.java @@ -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 { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SalesbackitemMapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SalesbacksoitemMapper.java similarity index 56% rename from SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SalesbackitemMapper.java rename to SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SalesbacksoitemMapper.java index e746830c..5b1cfc2d 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SalesbackitemMapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/SalesbacksoitemMapper.java @@ -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 { +public interface SalesbacksoitemMapper extends BaseMapper { } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/Salesorder_item0Mapper.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/Salesorder_item0Mapper.java index a7dfbaf6..a7f80053 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/Salesorder_item0Mapper.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/mapper/Salesorder_item0Mapper.java @@ -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 { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/Arinvoices_item0soitemModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/Arinvoices_item0soitemModel.java new file mode 100644 index 00000000..c03d2cf5 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/Arinvoices_item0soitemModel.java @@ -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; + + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/ArinvoicesitemModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/ArinvoicesitemModel.java deleted file mode 100644 index 45a6cc89..00000000 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/ArinvoicesitemModel.java +++ /dev/null @@ -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; - - -} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/CollectionitemModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/CollectionsoitemModel.java similarity index 90% rename from SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/CollectionitemModel.java rename to SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/CollectionsoitemModel.java index 5e180baf..40ad7aa8 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/CollectionitemModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/CollectionsoitemModel.java @@ -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") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/PaymentsoitemModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/PaymentsoitemModel.java new file mode 100644 index 00000000..3246af21 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/PaymentsoitemModel.java @@ -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; + + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/ReceiptoutitemModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/ReceiptoutsoitemModel.java similarity index 91% rename from SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/ReceiptoutitemModel.java rename to SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/ReceiptoutsoitemModel.java index ba8de011..ca6c0462 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/ReceiptoutitemModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/ReceiptoutsoitemModel.java @@ -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") diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderCrForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderCrForm.java index 24201b5e..ee9a716d 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderCrForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderCrForm.java @@ -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_item0List; /** 子表数据 **/ - @JsonProperty("receiptoutitemList") - private List receiptoutitemList; + @JsonProperty("receiptoutsoitemList") + private List receiptoutsoitemList; + /** 子表数据 **/ + @JsonProperty("collectionsoitemList") + private List collectionsoitemList; /** 子表数据 **/ - @JsonProperty("collectionitemList") - private List collectionitemList; + @JsonProperty("arinvoices_item0soitemList") + private List arinvoices_item0soitemList; /** 子表数据 **/ - @JsonProperty("arinvoicesitemList") - private List arinvoicesitemList; + @JsonProperty("salesbacksoitemList") + private List salesbacksoitemList; /** 子表数据 **/ - @JsonProperty("salesbackitemList") - private List salesbackitemList; + @JsonProperty("paymentsoitemList") + private List paymentsoitemList; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderInfoVO.java index 543d1ef2..03daa2a6 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderInfoVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderInfoVO.java @@ -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_item0List; /** 子表数据 **/ - @JsonProperty("receiptoutitemList") - private List receiptoutitemList; + @JsonProperty("receiptoutsoitemList") + private List receiptoutsoitemList; + /** 子表数据 **/ + @JsonProperty("collectionsoitemList") + private List collectionsoitemList; /** 子表数据 **/ - @JsonProperty("collectionitemList") - private List collectionitemList; + @JsonProperty("arinvoices_item0soitemList") + private List arinvoices_item0soitemList; /** 子表数据 **/ - @JsonProperty("arinvoicesitemList") - private List arinvoicesitemList; + @JsonProperty("salesbacksoitemList") + private List salesbacksoitemList; /** 子表数据 **/ - @JsonProperty("salesbackitemList") - private List salesbackitemList; + @JsonProperty("paymentsoitemList") + private List paymentsoitemList; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderListQuery.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderListQuery.java index 047cea9d..9681467c 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderListQuery.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderListQuery.java @@ -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 { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderListVO.java index 3e612e96..9a18cadd 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderListVO.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderListVO.java @@ -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; + + } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderPagination.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderPagination.java index 08060a48..20a5482b 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderPagination.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderPagination.java @@ -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 { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderPaginationExportModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderPaginationExportModel.java index 579e2a71..6c8ae4e3 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderPaginationExportModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderPaginationExportModel.java @@ -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 { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderUpForm.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderUpForm.java index 869154db..11e1c67e 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderUpForm.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SaleorderUpForm.java @@ -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_item0List; /** 子表数据 **/ - @JsonProperty("receiptoutitemList") - private List receiptoutitemList; + @JsonProperty("receiptoutsoitemList") + private List receiptoutsoitemList; + /** 子表数据 **/ + @JsonProperty("collectionsoitemList") + private List collectionsoitemList; /** 子表数据 **/ - @JsonProperty("collectionitemList") - private List collectionitemList; + @JsonProperty("arinvoices_item0soitemList") + private List arinvoices_item0soitemList; /** 子表数据 **/ - @JsonProperty("arinvoicesitemList") - private List arinvoicesitemList; + @JsonProperty("salesbacksoitemList") + private List salesbacksoitemList; /** 子表数据 **/ - @JsonProperty("salesbackitemList") - private List salesbackitemList; + @JsonProperty("paymentsoitemList") + private List paymentsoitemList; } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SalesbackitemModel.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SalesbacksoitemModel.java similarity index 80% rename from SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SalesbackitemModel.java rename to SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SalesbacksoitemModel.java index 3f8284b2..b701e8a0 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SalesbackitemModel.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/SalesbacksoitemModel.java @@ -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; } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/Salesorder_item0Model.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/Salesorder_item0Model.java index 9f05cf9a..2488ed5c 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/Salesorder_item0Model.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/model/saleorder/Salesorder_item0Model.java @@ -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; + } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/Arinvoices_item0soitemService.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/Arinvoices_item0soitemService.java new file mode 100644 index 00000000..d9ee01cc --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/Arinvoices_item0soitemService.java @@ -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 { + +} diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/CollectionitemService.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/CollectionsoitemService.java similarity index 56% rename from SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/CollectionitemService.java rename to SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/CollectionsoitemService.java index dfa2b7cd..a41cf7b1 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/CollectionitemService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/CollectionsoitemService.java @@ -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 { +public interface CollectionsoitemService extends IService { } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/SalesbackitemService.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/PaymentsoitemService.java similarity index 57% rename from SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/SalesbackitemService.java rename to SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/PaymentsoitemService.java index 1b512566..7cff3cdd 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/SalesbackitemService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/PaymentsoitemService.java @@ -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 { +public interface PaymentsoitemService extends IService { } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/ReceiptoutitemService.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/ReceiptoutsoitemService.java similarity index 56% rename from SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/ReceiptoutitemService.java rename to SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/ReceiptoutsoitemService.java index a185b97f..450c5f2d 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/ReceiptoutitemService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/ReceiptoutsoitemService.java @@ -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 { +public interface ReceiptoutsoitemService extends IService { } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/SaleorderitemService.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/SaleorderitemService.java index a5e68b65..4bc76677 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/SaleorderitemService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/SaleorderitemService.java @@ -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 { @@ -34,10 +36,11 @@ public interface SaleorderitemService extends IService { // 子表方法 List GetSalesorder_item0List(String id); - List GetReceiptoutitemList(String id); - List GetCollectionitemList(String id); - List GetArinvoicesitemList(String id); - List GetSalesbackitemList(String id); + List GetReceiptoutsoitemList(String id); + List GetCollectionsoitemList(String id); + List GetArinvoices_item0soitemList(String id); + List GetSalesbacksoitemList(String id); + List GetPaymentsoitemList(String id); //列表子表数据方法 } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/ArinvoicesitemService.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/SalesbacksoitemService.java similarity index 52% rename from SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/ArinvoicesitemService.java rename to SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/SalesbacksoitemService.java index 09949483..df0f60ab 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/ArinvoicesitemService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/SalesbacksoitemService.java @@ -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 { +public interface SalesbacksoitemService extends IService { } diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/Salesorder_item0Service.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/Salesorder_item0Service.java index 5da5cb88..9b021329 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/Salesorder_item0Service.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/Salesorder_item0Service.java @@ -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 { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/Arinvoices_item0soitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/Arinvoices_item0soitemServiceImpl.java new file mode 100644 index 00000000..ee7751a4 --- /dev/null +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/Arinvoices_item0soitemServiceImpl.java @@ -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 implements Arinvoices_item0soitemService{ + + +} \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/CollectionitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/CollectionsoitemServiceImpl.java similarity index 80% rename from SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/CollectionitemServiceImpl.java rename to SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/CollectionsoitemServiceImpl.java index 0aece9c6..91c593cc 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/CollectionitemServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/CollectionsoitemServiceImpl.java @@ -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 implements CollectionitemService{ +public class CollectionsoitemServiceImpl extends ServiceImpl implements CollectionsoitemService{ } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/ArinvoicesitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/PaymentsoitemServiceImpl.java similarity index 79% rename from SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/ArinvoicesitemServiceImpl.java rename to SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/PaymentsoitemServiceImpl.java index cedc2aba..29fec0bf 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/ArinvoicesitemServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/PaymentsoitemServiceImpl.java @@ -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 implements ArinvoicesitemService{ +public class PaymentsoitemServiceImpl extends ServiceImpl implements PaymentsoitemService{ } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/ReceiptoutitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/ReceiptoutsoitemServiceImpl.java similarity index 80% rename from SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/ReceiptoutitemServiceImpl.java rename to SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/ReceiptoutsoitemServiceImpl.java index 3db98ab5..156ff5c8 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/ReceiptoutitemServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/ReceiptoutsoitemServiceImpl.java @@ -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 implements ReceiptoutitemService{ +public class ReceiptoutsoitemServiceImpl extends ServiceImpl implements ReceiptoutsoitemService{ } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java index d5ad7572..cb5e0321 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SaleorderitemServiceImpl.java @@ -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 implements SaleorderitemService { @@ -46,16 +46,19 @@ public class SaleorderitemServiceImpl extends ServiceImpl saleorderQueryWrapper=new QueryWrapper<>(); int salesorder_item0Num =0; QueryWrapper salesorder_item0QueryWrapper=new QueryWrapper<>(); - int receiptoutitemNum =0; - QueryWrapper receiptoutitemQueryWrapper=new QueryWrapper<>(); - int collectionitemNum =0; - QueryWrapper collectionitemQueryWrapper=new QueryWrapper<>(); - int arinvoicesitemNum =0; - QueryWrapper arinvoicesitemQueryWrapper=new QueryWrapper<>(); - int salesbackitemNum =0; - QueryWrapper salesbackitemQueryWrapper=new QueryWrapper<>(); + int receiptoutsoitemNum =0; + QueryWrapper receiptoutsoitemQueryWrapper=new QueryWrapper<>(); + int collectionsoitemNum =0; + QueryWrapper collectionsoitemQueryWrapper=new QueryWrapper<>(); + int salesbacksoitemNum =0; + QueryWrapper salesbacksoitemQueryWrapper=new QueryWrapper<>(); + int paymentsoitemNum =0; + QueryWrapper paymentsoitemQueryWrapper=new QueryWrapper<>(); + int arinvoices_item0soitemNum =0; + QueryWrapper 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)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)receiptoutsoitemObj; + receiptoutsoitemNum++; + } + Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderPagination.getMenuId(),"collectionsoitem")); + if (ObjectUtil.isEmpty(collectionsoitemObj)){ return new ArrayList<>(); } else { - receiptoutitemQueryWrapper = (QueryWrapper)receiptoutitemObj; - receiptoutitemNum++; + collectionsoitemQueryWrapper = (QueryWrapper)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)collectionitemObj; - collectionitemNum++; + salesbacksoitemQueryWrapper = (QueryWrapper)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)arinvoicesitemObj; - arinvoicesitemNum++; + paymentsoitemQueryWrapper = (QueryWrapper)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)salesbackitemObj; - salesbackitemNum++; + arinvoices_item0soitemQueryWrapper = (QueryWrapper)arinvoices_item0soitemObj; + arinvoices_item0soitemNum++; } } } @@ -146,39 +158,48 @@ public class SaleorderitemServiceImpl extends ServiceImpl(); + } else { + receiptoutsoitemQueryWrapper = (QueryWrapper)receiptoutsoitemObj; + receiptoutsoitemNum++; + } + + + Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderPagination.getMenuId(),"collectionsoitem")); + if (ObjectUtil.isEmpty(collectionsoitemObj)){ return new ArrayList<>(); } else { - receiptoutitemQueryWrapper = (QueryWrapper)receiptoutitemObj; - receiptoutitemNum++; + collectionsoitemQueryWrapper = (QueryWrapper)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)collectionitemObj; - collectionitemNum++; + salesbacksoitemQueryWrapper = (QueryWrapper)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)arinvoicesitemObj; - arinvoicesitemNum++; + paymentsoitemQueryWrapper = (QueryWrapper)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)salesbackitemObj; - salesbackitemNum++; + arinvoices_item0soitemQueryWrapper = (QueryWrapper)arinvoices_item0soitemObj; + arinvoices_item0soitemNum++; } @@ -230,14 +251,16 @@ public class SaleorderitemServiceImpl extends ServiceImpl saleorderQueryWrapper=new QueryWrapper<>(); int salesorder_item0Num =0; QueryWrapper salesorder_item0QueryWrapper=new QueryWrapper<>(); - int receiptoutitemNum =0; - QueryWrapper receiptoutitemQueryWrapper=new QueryWrapper<>(); - int collectionitemNum =0; - QueryWrapper collectionitemQueryWrapper=new QueryWrapper<>(); - int arinvoicesitemNum =0; - QueryWrapper arinvoicesitemQueryWrapper=new QueryWrapper<>(); - int salesbackitemNum =0; - QueryWrapper salesbackitemQueryWrapper=new QueryWrapper<>(); + int receiptoutsoitemNum =0; + QueryWrapper receiptoutsoitemQueryWrapper=new QueryWrapper<>(); + int collectionsoitemNum =0; + QueryWrapper collectionsoitemQueryWrapper=new QueryWrapper<>(); + int salesbacksoitemNum =0; + QueryWrapper salesbacksoitemQueryWrapper=new QueryWrapper<>(); + int paymentsoitemNum =0; + QueryWrapper paymentsoitemQueryWrapper=new QueryWrapper<>(); + int arinvoices_item0soitemNum =0; + QueryWrapper 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)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)receiptoutitemObj; - receiptoutitemNum++; + receiptoutsoitemQueryWrapper = (QueryWrapper)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)collectionitemObj; - collectionitemNum++; + collectionsoitemQueryWrapper = (QueryWrapper)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)arinvoicesitemObj; - arinvoicesitemNum++; + salesbacksoitemQueryWrapper = (QueryWrapper)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)salesbackitemObj; - salesbackitemNum++; + paymentsoitemQueryWrapper = (QueryWrapper)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_item0soitemObj; + arinvoices_item0soitemNum++; } } } @@ -307,39 +337,48 @@ public class SaleorderitemServiceImpl extends ServiceImpl(); + } else { + receiptoutsoitemQueryWrapper = (QueryWrapper)receiptoutsoitemObj; + receiptoutsoitemNum++; + } + + + Object collectionsoitemObj=authorizeService.getCondition(new AuthorizeConditionModel(collectionsoitemQueryWrapper,saleorderPagination.getMenuId(),"collectionsoitem")); + if (ObjectUtil.isEmpty(collectionsoitemObj)){ return new ArrayList<>(); } else { - receiptoutitemQueryWrapper = (QueryWrapper)receiptoutitemObj; - receiptoutitemNum++; + collectionsoitemQueryWrapper = (QueryWrapper)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)collectionitemObj; - collectionitemNum++; + salesbacksoitemQueryWrapper = (QueryWrapper)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)arinvoicesitemObj; - arinvoicesitemNum++; + paymentsoitemQueryWrapper = (QueryWrapper)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)salesbackitemObj; - salesbackitemNum++; + arinvoices_item0soitemQueryWrapper = (QueryWrapper)arinvoices_item0soitemObj; + arinvoices_item0soitemNum++; } @@ -418,28 +457,34 @@ public class SaleorderitemServiceImpl extends ServiceImpl GetReceiptoutitemList(String id){ - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(ReceiptoutitemEntity::getSourceNo, id); - return receiptoutitemService.list(queryWrapper); + public List GetReceiptoutsoitemList(String id){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(ReceiptoutsoitemEntity::getSourceNo, id); + return receiptoutsoitemService.list(queryWrapper); + } + @Override + public List GetCollectionsoitemList(String id){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(CollectionsoitemEntity::getSalesOrderNo, id); + return collectionsoitemService.list(queryWrapper); } @Override - public List GetCollectionitemList(String id){ - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(CollectionitemEntity::getSalesOrderNo, id); - return collectionitemService.list(queryWrapper); + public List GetArinvoices_item0soitemList(String id){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(Arinvoices_item0soitemEntity::getSalesOrderNo, id); + return arinvoices_item0soitemService.list(queryWrapper); } @Override - public List GetArinvoicesitemList(String id){ - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(ArinvoicesitemEntity::getSalesOrderNo, id); - return arinvoicesitemService.list(queryWrapper); + public List GetSalesbacksoitemList(String id){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(SalesbacksoitemEntity::getSalesOrderId, id); + return salesbacksoitemService.list(queryWrapper); } @Override - public List GetSalesbackitemList(String id){ - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(SalesbackitemEntity::getSalesOrderId, id); - return salesbackitemService.list(queryWrapper); + public List GetPaymentsoitemList(String id){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.lambda().eq(PaymentsoitemEntity::getPaymentno, id); + return paymentsoitemService.list(queryWrapper); } //列表子表数据方法 diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SalesbackitemServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SalesbacksoitemServiceImpl.java similarity index 80% rename from SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SalesbackitemServiceImpl.java rename to SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SalesbacksoitemServiceImpl.java index 79184e80..a5b8013e 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SalesbackitemServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/SalesbacksoitemServiceImpl.java @@ -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 implements SalesbackitemService{ +public class SalesbacksoitemServiceImpl extends ServiceImpl implements SalesbacksoitemService{ } \ No newline at end of file diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/Salesorder_item0ServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/Salesorder_item0ServiceImpl.java index 6eff377b..a8228611 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/Salesorder_item0ServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/saleorder/service/impl/Salesorder_item0ServiceImpl.java @@ -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 implements Salesorder_item0Service{ diff --git a/SC-web/src/components/Generator/generator/config.js b/SC-web/src/components/Generator/generator/config.js index 0c06a112..39cdf43d 100644 --- a/SC-web/src/components/Generator/generator/config.js +++ b/SC-web/src/components/Generator/generator/config.js @@ -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", diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/Detail.vue b/SC-web/src/views/scm/basicInformation/purchaseorder/Detail.vue index 12a82d6f..33d72726 100644 --- a/SC-web/src/views/scm/basicInformation/purchaseorder/Detail.vue +++ b/SC-web/src/views/scm/basicInformation/purchaseorder/Detail.vue @@ -1,126 +1,115 @@ - - + + 取 消 + +