From 36045df9ffb429acfd1167c6bccb04716ed33d73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E5=B7=9D=E8=99=8E?= Date: Thu, 27 Jun 2024 15:59:26 +0800 Subject: [PATCH 1/6] 6.27 --- jnpf-app/pages/workFlow/flowBefore/index.vue | 3 +- .../mapper/scm/CwaccountvoucherMapper.xml | 16 +- .../resources/mapper/scm/VoucherMapper.xml | 6 + .../main/java/jnpf/mapper/VoucherMapper.java | 2 + .../java/jnpf/service/VoucherService.java | 2 + .../service/impl/CwaccountServiceImpl.java | 76 --- .../jnpf/service/impl/VoucherServiceImpl.java | 34 +- .../jnpf/controller/VehicleController.java | 194 ++++++- .../jnpf/model/voucher/VoucherExcelVO.java | 5 +- .../jnpf/model/voucher/VoucherExcelVO333.java | 109 ++++ .../src/views/extend/cwaccount/form.vue | 500 +----------------- .../src/views/extend/cwsettlement/form.vue | 32 +- .../purchaseCenter/deliveryVoucher/index.vue | 2 +- .../saleCenter/deliveryVoucher/columnList.js | 4 +- .../scm/saleCenter/deliveryVoucher/index.vue | 6 +- .../src/views/workFlow/components/FlowBox.vue | 6 +- 16 files changed, 402 insertions(+), 595 deletions(-) create mode 100644 jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/voucher/VoucherExcelVO333.java diff --git a/jnpf-app/pages/workFlow/flowBefore/index.vue b/jnpf-app/pages/workFlow/flowBefore/index.vue index 509c416e..2ef4bc80 100644 --- a/jnpf-app/pages/workFlow/flowBefore/index.vue +++ b/jnpf-app/pages/workFlow/flowBefore/index.vue @@ -106,8 +106,7 @@ - {{properties.auditBtnText||'通过'}} + @click.stop="eventLauncher('audit')">审批 diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwaccountvoucherMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwaccountvoucherMapper.xml index f1a21434..633e50f1 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwaccountvoucherMapper.xml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwaccountvoucherMapper.xml @@ -139,7 +139,7 @@ LEFT JOIN jg_contract i on h.contract_id = i.id LEFT JOIN jg_contract_commodity j on (j.contract_id = i.id and f.product_id = j.product_id) LEFT JOIN jg_product k on f.product_id = k.id - LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and c.order_no = m.ord_ln) + LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and f.order_line_id = m.ord_ln) where a.warehousing_storage_id in @@ -190,7 +190,7 @@ LEFT JOIN jg_contract i on h.contract_id = i.id LEFT JOIN jg_contract_commodity j on (j.contract_id = i.id and f.product_id = j.product_id) LEFT JOIN jg_product k on f.product_id = k.id - LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and c.order_no = m.ord_ln) + LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and f.order_line_id = m.ord_ln) where a.warehousing_storage_id in @@ -241,7 +241,7 @@ LEFT JOIN jg_contract i on h.contract_id = i.id LEFT JOIN jg_contract_commodity j on (j.contract_id = i.id and f.product_id = j.product_id) LEFT JOIN jg_product k on f.product_id = k.id - LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and c.order_no = m.ord_ln) + LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and f.order_line_id = m.ord_ln) where a.warehousing_storage_id in @@ -291,7 +291,7 @@ LEFT JOIN jg_contract_commodity j on (j.contract_id = i.id and f.product_id = j.product_id) LEFT JOIN jg_product k on f.product_id = k.id LEFT JOIN jg_warehousing_storage_product l on l.warehousing_storage_id = b.id - LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and c.order_no = m.ord_ln) + LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and f.order_line_id = m.ord_ln) where a.warehousing_storage_id in @@ -342,7 +342,7 @@ LEFT JOIN jg_contract i on h.contract_id = i.id LEFT JOIN jg_contract_commodity j on (j.contract_id = i.id and f.product_id = j.product_id) LEFT JOIN jg_product k on f.product_id = k.id - LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and c.order_no = m.ord_ln) + LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and f.order_line_id = m.ord_ln) where a.warehousing_outbound_id in @@ -392,7 +392,7 @@ LEFT JOIN jg_contract i on h.contract_id = i.id LEFT JOIN jg_contract_commodity j on (j.contract_id = i.id and f.product_id = j.product_id) LEFT JOIN jg_product k on f.product_id = k.id - LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and c.order_no = m.ord_ln) + LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and f.order_line_id = m.ord_ln) where a.warehousing_outbound_id in @@ -443,7 +443,7 @@ LEFT JOIN jg_contract_commodity j on (j.contract_id = i.id and f.product_id = j.product_id) LEFT JOIN jg_product k on f.product_id = k.id LEFT JOIN jg_warehousing_outbound_product l on l.warehousing_outbound_id = b.id - LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and c.order_no = m.ord_ln) + LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and f.order_line_id = m.ord_ln) where a.warehousing_outbound_id in @@ -494,7 +494,7 @@ LEFT JOIN jg_contract i on h.contract_id = i.id LEFT JOIN jg_contract_commodity j on (j.contract_id = i.id and f.product_id = j.product_id) LEFT JOIN jg_product k on f.product_id = k.id - LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and c.order_no = m.ord_ln) + LEFT JOIN jg_business_order_product_relational m on (h.id = m.business_order_id and f.order_line_id = m.ord_ln) where a.warehousing_outbound_id in diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml index cc955e6a..9dd98f0d 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/VoucherMapper.xml @@ -710,4 +710,10 @@ from jg_voucher a where a.f_delete_mark is null and a.is_transfer = '2' and a.business_order_id = #{id} + + + update jg_voucher set order_no = #{voucherEntity.orderNo} + where voucher_code = #{voucherEntity.voucherCode} + + diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/VoucherMapper.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/VoucherMapper.java index 95fb2e8d..aa7a17dd 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/VoucherMapper.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/VoucherMapper.java @@ -51,4 +51,6 @@ public interface VoucherMapper extends BaseMapper { BigDecimal queryVoucherByBusinessOrder(@Param("id") String id); Map queryAmountByBusinessOrder(@Param("id") String id); + + void updateByVoucherCode(@Param("voucherEntity") VoucherEntity voucherEntity); } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/VoucherService.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/VoucherService.java index a9a006d9..9684eded 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/VoucherService.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/VoucherService.java @@ -78,4 +78,6 @@ public interface VoucherService extends IService { BigDecimal queryVoucherProductNetWeightInfo(String id); BigDecimal queryVoucherByBusinessOrderInfo(String id); Map queryAmountByBusinessOrder(String id); + + void updateByVoucherCode(VoucherEntity voucherEntity); } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwaccountServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwaccountServiceImpl.java index a88e0dcb..9b8efe9d 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwaccountServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwaccountServiceImpl.java @@ -673,82 +673,6 @@ public class CwaccountServiceImpl extends ServiceImpl 0){ - for(CwaccountvoucherModel t : form.getCwaccountvoucherList()){ - if(StringUtil.isNotEmpty(t.getBucklesWeight())){ - t.setBucklesWeight(t.getBucklesWeight().trim()); - } - else{ - return "凭证信息-扣杂重量不能为空"; - } - /*if(StringUtil.isNotEmpty(t.getBucklesWeight())){ - if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(t.getBucklesWeight())).matches()){ - return "请输入正确的金额"; - } - }*/ - } - for(CwaccountvoucherModel t : form.getCwaccountvoucherList()){ - if(StringUtil.isNotEmpty(t.getSettlementSum())){ - t.setSettlementSum(t.getSettlementSum().trim()); - } - else{ - return "凭证信息-结算数量不能为空"; - } - /*if(StringUtil.isNotEmpty(t.getSettlementSum())){ - if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(t.getSettlementSum())).matches()){ - return "请输入正确的金额"; - } - }*/ - } - for(CwaccountvoucherModel t : form.getCwaccountvoucherList()){ - if(StringUtil.isNotEmpty(t.getSettlementPrice())){ - t.setSettlementPrice(t.getSettlementPrice().trim()); - } - else{ - return "凭证信息-结算单价（含税）不能为空"; - } - /*if(StringUtil.isNotEmpty(t.getSettlementPrice())){ - if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(t.getSettlementPrice())).matches()){ - return "请输入正确的金额"; - } - }*/ - } - for(CwaccountvoucherModel t : form.getCwaccountvoucherList()){ - if(StringUtil.isNotEmpty(t.getSettlementSubtotal())){ - t.setSettlementSubtotal(t.getSettlementSubtotal().trim()); - } - else{ - return "凭证信息-结算小计（含税）不能为空"; - } - /*if(StringUtil.isNotEmpty(t.getSettlementSubtotal())){ - if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(t.getSettlementSubtotal())).matches()){ - return "请输入正确的金额"; - } - }*/ - } - for(CwaccountvoucherModel t : form.getCwaccountvoucherList()){ - if(StringUtil.isNotEmpty(t.getSettlementPriceNo())){ - t.setSettlementPriceNo(t.getSettlementPriceNo().trim()); - } - /*if(StringUtil.isNotEmpty(t.getSettlementPriceNo())){ - if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(t.getSettlementPriceNo())).matches()){ - return "请输入正确的金额"; - } - }*/ - } - for(CwaccountvoucherModel t : form.getCwaccountvoucherList()){ - if(StringUtil.isNotEmpty(t.getOtherExpenses())){ - t.setOtherExpenses(t.getOtherExpenses().trim()); - } - /*if(StringUtil.isNotEmpty(t.getOtherExpenses())){ - if(!Pattern.compile("^([1-9][\\d]*|0)(\\.[\\d]+)?$").matcher(String.valueOf(t.getOtherExpenses())).matches()){ - return "请输入正确的金额"; - } - }*/ - } - }else{ - return "凭证信息不能为空"; - } if (form.getCwaccountsummaryList()==null || form.getCwaccountsummaryList().size() == 0){ return "汇总信息不能为空"; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java index 33fbd14b..f1d7fe03 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/VoucherServiceImpl.java @@ -1068,13 +1068,36 @@ public class VoucherServiceImpl extends ServiceImpl contractLQueryWrapper=new QueryWrapper<>(); - contractLQueryWrapper.lambda().eq(ContractLEntity::getContractNumber, voucherEntity.getPurchaseContractNo()); + if(voucherEntity.getBusinessType().equals("1")){ + contractLQueryWrapper.lambda().eq(ContractLEntity::getContractNumber, voucherEntity.getPurchaseContractNo()); + }else{ + contractLQueryWrapper.lambda().eq(ContractLEntity::getContractNumber, voucherEntity.getSaleContractNo()); + } List contractLEntityList = contractLService.list(contractLQueryWrapper); if(contractLEntityList != null && contractLEntityList.size() > 0){ + if(voucherEntity.getBusinessType().equals("1")){ + if(voucherEntity.getDocumentType().equals("1")){ + //采购收货 + voucherEntity.setCustomerId(contractLEntityList.get(0).getDeptId()); + voucherEntity.setSupplierId(contractLEntityList.get(0).getSubject()); + }else{ + //采购发货 + voucherEntity.setCustomerId(contractLEntityList.get(0).getSubject()); + voucherEntity.setSupplierId(contractLEntityList.get(0).getDeptId()); + } + }else{ + if(voucherEntity.getDocumentType().equals("1")){ + //销售收货 + voucherEntity.setCustomerId(contractLEntityList.get(0).getDeptId()); + voucherEntity.setSupplierId(contractLEntityList.get(0).getSubject()); + }else{ + //销售发货 + voucherEntity.setCustomerId(contractLEntityList.get(0).getSubject()); + voucherEntity.setSupplierId(contractLEntityList.get(0).getDeptId()); + } + } voucherEntity.setModeTransport(contractLEntityList.get(0).getModeTransport());//运输方式 - voucherEntity.setCustomerId(contractLEntityList.get(0).getDeptId()); voucherEntity.setCustomerName(""); - voucherEntity.setSupplierId(contractLEntityList.get(0).getSubject()); voucherEntity.setSupplierName(""); }else{ num ++; @@ -1353,4 +1376,9 @@ public class VoucherServiceImpl extends ServiceImpl queryAmountByBusinessOrder(String id) { return voucherMapper.queryAmountByBusinessOrder(id); } + + @Override + public void updateByVoucherCode(VoucherEntity voucherEntity) { + voucherMapper.updateByVoucherCode(voucherEntity); + } } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/VehicleController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/VehicleController.java index 58542eb2..56defa3c 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/VehicleController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/VehicleController.java @@ -7,6 +7,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import jnpf.base.ActionResult; import jnpf.base.UserInfo; import jnpf.exception.DataException; +import jnpf.model.voucher.*; import jnpf.permission.entity.UserEntity; import jnpf.service.*; import jnpf.entity.*; @@ -73,7 +74,8 @@ public class VehicleController { @Autowired private VehicleDriverService vehicleDriverService; - + @Autowired + private VoucherService voucherService; @Autowired private ConfigValueUtil configValueUtil; @@ -370,4 +372,194 @@ public class VehicleController { return ActionResult.success(vehicleMap); } + + + + + + + + + + + + + + + @Operation(summary = "上传文件") + @PostMapping("/Uploader") + public ActionResult Uploader() { + List list = UpUtil.getFileAll(); + MultipartFile file = list.get(0); + if (file.getOriginalFilename().endsWith(".xlsx") || file.getOriginalFilename().endsWith(".xls")) { + String filePath = XSSEscape.escape(configValueUtil.getTemporaryFilePath()); + String fileName = XSSEscape.escape(RandomUtil.uuId() + "." + UpUtil.getFileType(file)); + //上传文件 + FileInfo fileInfo = FileUploadUtils.uploadFile(file, filePath, fileName); + DownloadVO vo = DownloadVO.builder().build(); + vo.setName(fileInfo.getFilename()); + return ActionResult.success(vo); + } else { + return ActionResult.fail("选择文件不符合导入"); + } + } + + /** + * 模板下载 + * + * @return + */ + @Operation(summary = "模板下载") + @GetMapping("/TemplateDownload") + public ActionResult TemplateDownload(){ + DownloadVO vo = DownloadVO.builder().build(); + UserInfo userInfo = userProvider.get(); + Map dataMap = new HashMap<>(); + //主表对象 + List entitys = new ArrayList<>(); + //以下添加字段 + entitys.add(new ExcelExportEntity("凭证编号" ,"voucherCode")); + entitys.add(new ExcelExportEntity("订单序号" ,"orderNo")); + entitys.add(new ExcelExportEntity("单据类型" ,"documentType")); + entitys.add(new ExcelExportEntity("凭证类型" ,"voucherType")); + entitys.add(new ExcelExportEntity("凭证状态" ,"voucherStatus")); + entitys.add(new ExcelExportEntity("磅单编号" ,"poundCode")); + entitys.add(new ExcelExportEntity("关联单据号" ,"associatedDocumentNo")); + entitys.add(new ExcelExportEntity("车牌号" ,"vehicleName")); + entitys.add(new ExcelExportEntity("运输方式" ,"modeTransport")); + entitys.add(new ExcelExportEntity("承运方式" ,"transportationMethod")); + entitys.add(new ExcelExportEntity("承运商" ,"carrier")); + entitys.add(new ExcelExportEntity("运费" ,"freight")); + entitys.add(new ExcelExportEntity("起运地" ,"placeDispatch")); + entitys.add(new ExcelExportEntity("到达地" ,"destination")); + entitys.add(new ExcelExportEntity("三级供应商" ,"thirdSupplyName")); + entitys.add(new ExcelExportEntity("制单时间" ,"preparationTime")); + List> list = new ArrayList<>(); + list.add(dataMap); + + ExportParams exportParams = new ExportParams(null, "凭证单模板"); + exportParams.setType(ExcelType.XSSF); + try{ + @Cleanup Workbook workbook = new HSSFWorkbook(); + if (entitys.size()>0){ + if (list.size()==0){ + list.add(new HashMap<>()); + } + //复杂表头-表头和数据处理 + ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(VoucherConstant.getColumnData(), ColumnDataModel.class); + List complexHeaderList = columnDataModel.getComplexHeaderList(); + if (!Objects.equals(columnDataModel.getType(), 3) && !Objects.equals(columnDataModel.getType(), 5)) { + entitys = VisualUtils.complexHeaderHandel(entitys, complexHeaderList); + list = VisualUtils.complexHeaderDataHandel(list, complexHeaderList); + } + workbook = ExcelExportUtil.exportExcel(exportParams, entitys, list); + } + String fileName = "凭证单模板" + DateUtil.dateNow("yyyyMMddHHmmss") + ".xlsx"; + MultipartFile multipartFile = ExcelUtil.workbookToCommonsMultipartFile(workbook, fileName); + String temporaryFilePath = configValueUtil.getTemporaryFilePath(); + FileInfo fileInfo = FileUploadUtils.uploadFile(multipartFile, temporaryFilePath, fileName); + vo.setName(fileInfo.getFilename()); + vo.setUrl(UploaderUtil.uploaderFile(fileInfo.getFilename() + "#" + "Temporary") + "&name=" + fileName); + } catch (Exception e) { + log.error("模板信息导出Excel错误:{}", e.getMessage()); + e.printStackTrace(); + } + return ActionResult.success(vo); + } + + /** + * 导入预览 + * + * @return + */ + @Operation(summary = "导入预览" ) + @GetMapping("/ImportPreview") + public ActionResult> ImportPreview(String fileName) throws Exception { + Map headAndDataMap = new HashMap<>(2); + String filePath = FileUploadUtils.getLocalBasePath() + configValueUtil.getTemporaryFilePath(); + FileUploadUtils.downLocal(configValueUtil.getTemporaryFilePath(), filePath, fileName); + File temporary = new File(XSSEscape.escapePath(filePath + fileName)); + int headerRowIndex = 1; + ImportParams params = new ImportParams(); + params.setTitleRows(0); + params.setHeadRows(headerRowIndex); + params.setNeedVerify(true); + try { + List excelDataList = ExcelImportUtil.importExcel(temporary, VoucherExcelVO333.class, params); + // 导入字段 + List columns = new ArrayList<>(); + columns.add(new ExcelImFieldModel("voucherCode","凭证编号")); + columns.add(new ExcelImFieldModel("orderNo","订单序号")); + columns.add(new ExcelImFieldModel("documentType","单据类型")); + columns.add(new ExcelImFieldModel("voucherType","凭证类型")); + columns.add(new ExcelImFieldModel("preparationTime","制单时间")); + columns.add(new ExcelImFieldModel("poundCode","磅单编号")); + columns.add(new ExcelImFieldModel("vehicleName","车牌号")); + columns.add(new ExcelImFieldModel("supplierName","发货单位")); + columns.add(new ExcelImFieldModel("customerName","收货单位")); + columns.add(new ExcelImFieldModel("modeTransport","运输方式")); + columns.add(new ExcelImFieldModel("transportationMethod","承运方式")); + columns.add(new ExcelImFieldModel("carrier","承运商")); + columns.add(new ExcelImFieldModel("placeDispatch","起运地")); + columns.add(new ExcelImFieldModel("destination","到达地")); + columns.add(new ExcelImFieldModel("freight","运费")); + columns.add(new ExcelImFieldModel("voucherStatus","凭证状态")); + headAndDataMap.put("dataRow" , JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(excelDataList))); + headAndDataMap.put("headerRow" , JsonUtil.getJsonToList(JsonUtil.getListToJsonArray(columns))); + } catch (Exception e){ + e.printStackTrace(); + return ActionResult.fail("表头名称不可更改,表头行不能删除"); + } + return ActionResult.success(headAndDataMap); + } + + /** + * 导入数据 + * + * @return + */ + @Operation(summary = "导入数据" ) + @PostMapping("/ImportData") + public ActionResult ImportData(@RequestBody VisualImportModel visualImportModel) throws Exception { + List> listData=new ArrayList<>(); + for(Map map : visualImportModel.getList()){ + voucherService.updateByVoucherCode(JsonUtil.getJsonToBean(map, VoucherEntity.class)); + } + ExcelImportModel excelImportModel = new ExcelImportModel(); + excelImportModel.setSnum(visualImportModel.getList().size()); + excelImportModel.setFnum(0); + excelImportModel.setResultType(0); + return ActionResult.success(excelImportModel); + } + + /** + * 导出异常报告 + * + * @return + */ + @Operation(summary = "导出异常报告") + @PostMapping("/ImportExceptionData") + public ActionResult ImportExceptionData(@RequestBody VisualImportModel visualImportModel) { + DownloadVO vo=DownloadVO.builder().build(); + List voucherVOList = JsonUtil.getJsonToList(visualImportModel.getList(), VoucherExcelErrorVO.class); + UserInfo userInfo = userProvider.get(); + + try{ + @Cleanup Workbook workbook = new HSSFWorkbook(); + ExportParams exportParams = new ExportParams(null, "错误报告"); + exportParams.setType(ExcelType.XSSF); + workbook = ExcelExportUtil.exportExcel(exportParams, + VoucherExcelErrorVO.class, voucherVOList); + + String fileName = "错误报告" + DateUtil.dateNow("yyyyMMdd") + "_" + RandomUtil.uuId() + ".xlsx"; + MultipartFile multipartFile = ExcelUtil.workbookToCommonsMultipartFile(workbook, fileName); + String temporaryFilePath = configValueUtil.getTemporaryFilePath(); + FileInfo fileInfo = FileUploadUtils.uploadFile(multipartFile, temporaryFilePath, fileName); + vo.setName(fileInfo.getFilename()); + vo.setUrl(UploaderUtil.uploaderFile(fileInfo.getFilename() + "#" + "Temporary") + "&name=" + fileName); + } catch (Exception e) { + e.printStackTrace(); + } + return ActionResult.success(vo); + } } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/voucher/VoucherExcelVO.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/voucher/VoucherExcelVO.java index 30aad9e8..22b8840e 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/voucher/VoucherExcelVO.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/voucher/VoucherExcelVO.java @@ -26,6 +26,10 @@ public class VoucherExcelVO{ @JSONField(name = "voucherCode") @Excel(name = "凭证编号" ) private String voucherCode; + /** 订单序号 **/ + @JSONField(name = "orderNo") + @Excel(name = "订单序号") + private String orderNo; /** 凭证类型 **/ @JSONField(name = "voucherType") @@ -102,7 +106,6 @@ public class VoucherExcelVO{ @JSONField(name = "voucherStatus") @Excel(name = "凭证状态" ) private String voucherStatus; - @JsonProperty("tableField111") @ExcelCollection(name="",orderNum = "8") private List tableField111; diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/voucher/VoucherExcelVO333.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/voucher/VoucherExcelVO333.java new file mode 100644 index 00000000..59558862 --- /dev/null +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/voucher/VoucherExcelVO333.java @@ -0,0 +1,109 @@ +package jnpf.model.voucher; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import cn.afterturn.easypoi.excel.annotation.ExcelCollection; +import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; + +import java.util.List; + +/** + * + * Voucher + * @版本： V3.5 + * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * @作者： JNPF开发平台组 + * @日期： 2024-05-10 + */ +@Data +public class VoucherExcelVO333 { + + /** 凭证编号 **/ + @JSONField(name = "voucherCode") + @Excel(name = "凭证编号" ) + private String voucherCode; + + /** 订单序号 **/ + @JSONField(name = "orderNo") + @Excel(name = "订单序号") + private String orderNo; + + /** 单据类型 **/ + @JSONField(name = "documentType") + @Excel(name = "单据类型") + private String documentType; + + /** 凭证类型 **/ + @JSONField(name = "voucherType") + @Excel(name = "凭证类型") + private String voucherType; + + /** 凭证状态 **/ + @JSONField(name = "voucherStatus") + @Excel(name = "凭证状态" ) + private String voucherStatus; + + /** 制单时间 **/ + @JSONField(name = "preparationTime") + @Excel(name = "制单时间" ) + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") + private String preparationTime; + + /** 磅单编号 **/ + @JSONField(name = "poundCode") + @Excel(name = "磅单编号" ) + private String poundCode; + + /** 车牌号 **/ + @JSONField(name = "vehicleName") + @Excel(name = "车牌号" ) + private String vehicleName; + + /** 发货单位 **/ + @JSONField(name = "supplierName") + @Excel(name = "发货单位" ) + private String supplierName; + + /** 收货单位 **/ + @JSONField(name = "customerName") + @Excel(name = "收货单位" ) + private String customerName; + + /** 运输方式 **/ + @JSONField(name = "modeTransport") + @Excel(name = "运输方式" ) + private String modeTransport; + + /** 承运方式 **/ + @JSONField(name = "transportationMethod") + @Excel(name = "承运方式" ) + private String transportationMethod; + + /** 承运商 **/ + @JSONField(name = "carrier") + @Excel(name = "承运商" ) + private String carrier; + + /** 起运地 **/ + @JSONField(name = "placeDispatch") + @Excel(name = "起运地" ) + private String placeDispatch; + + /** 到达地 **/ + @JSONField(name = "destination") + @Excel(name = "到达地" ) + private String destination; + + /** 运费 **/ + @JSONField(name = "freight") + @Excel(name = "运费" ) + private String freight; + + /** 关联单据号 **/ + @JSONField(name = "associatedDocumentNo") + @Excel(name = "关联单据号" ) + private String associatedDocumentNo; + +} diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/form.vue b/jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/form.vue index b707ade3..ae5f8b0e 100644 --- a/jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/form.vue @@ -752,7 +752,7 @@
+ v-if="!judgeWrite('cwaccountcontractList')"> 添加
@@ -899,467 +899,6 @@ 添加 - -
- ▋ - 凭证信息 -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- 加载凭证 -
- -
▋ @@ -1369,7 +908,7 @@ @@ -1866,7 +1405,7 @@ export default { Vmodel: "", currVmodel: "", dataForm: { - summaryType: '1', + summaryType: '2', subjectId: '', contractType: '', type: '1', @@ -2344,6 +1883,7 @@ export default { const e = list[i]; this.dataForm.cwaccountstorageList.push(e) } + this.addcwaccountvoucherList(); }, typeChangeData() { this.dataForm.cwaccountsubjectList = []; @@ -2359,22 +1899,22 @@ export default { this.dataForm.businessType = '3' } }, - contractChangeData(model, row) { - this.dataForm.cwaccountcontractList[0].contractName = row.contract_name - this.dataForm.cwaccountcontractList[0].contractPeriodTime = row.contract_period_time ? row.contract_period_time.substring(0, 10) : ''; - this.dataForm.cwaccountcontractList[0].contractPeriodTimeEnd = row.contract_period_time_end ? row.contract_period_time_end.substring(0, 10) : ''; + contractChangeData(model, row, rowIndex) { + this.dataForm.cwaccountcontractList[rowIndex].contractName = row.contract_name + this.dataForm.cwaccountcontractList[rowIndex].contractPeriodTime = row.contract_period_time ? row.contract_period_time.substring(0, 10) : ''; + this.dataForm.cwaccountcontractList[rowIndex].contractPeriodTimeEnd = row.contract_period_time_end ? row.contract_period_time_end.substring(0, 10) : ''; //this.dataForm.cwaccountcontractList[0].currency = row.currency; - this.dataForm.cwaccountcontractList[0].procurementModel = row.procurement_model; - this.dataForm.cwaccountcontractList[0].pricingModel = row.pricing_model; - this.dataForm.cwaccountcontractList[0].relatedContractId = row.related_contract_id; - this.dataForm.cwaccountcontractList[0].subject = row.subject; - this.dataForm.cwaccountcontractList[0].subject2 = row.subject2; - this.dataForm.cwaccountcontractList[0].deliveryTime = row.delivery_time ? row.delivery_time.substring(0, 10) : ''; - this.dataForm.cwaccountcontractList[0].deliveryTimeEnd = row.delivery_time_end ? row.delivery_time_end.substring(0, 10) : ''; - this.dataForm.cwaccountcontractList[0].deliveryModel = row.delivery_model; - this.dataForm.cwaccountcontractList[0].deliveryMethod = row.delivery_method; - this.dataForm.cwaccountcontractList[0].modeTransport = row.mode_transport; - this.dataForm.cwaccountcontractList[0].costBearingMian = row.cost_bearing_mian; + this.dataForm.cwaccountcontractList[rowIndex].procurementModel = row.procurement_model; + this.dataForm.cwaccountcontractList[rowIndex].pricingModel = row.pricing_model; + this.dataForm.cwaccountcontractList[rowIndex].relatedContractId = row.related_contract_id; + this.dataForm.cwaccountcontractList[rowIndex].subject = row.subject; + this.dataForm.cwaccountcontractList[rowIndex].subject2 = row.subject2; + this.dataForm.cwaccountcontractList[rowIndex].deliveryTime = row.delivery_time ? row.delivery_time.substring(0, 10) : ''; + this.dataForm.cwaccountcontractList[rowIndex].deliveryTimeEnd = row.delivery_time_end ? row.delivery_time_end.substring(0, 10) : ''; + this.dataForm.cwaccountcontractList[rowIndex].deliveryModel = row.delivery_model; + this.dataForm.cwaccountcontractList[rowIndex].deliveryMethod = row.delivery_method; + this.dataForm.cwaccountcontractList[rowIndex].modeTransport = row.mode_transport; + this.dataForm.cwaccountcontractList[rowIndex].costBearingMian = row.cost_bearing_mian; }, subjectChangeData(model, row) { this.dataForm.subjectId = row.id; @@ -2516,7 +2056,7 @@ export default { if (!this.cwaccountsubjectExist()) return if (!this.cwaccountcontractExist()) return if (!this.cwaccountstorageExist()) return - if (!this.cwaccountvoucherExist()) return + // if (!this.cwaccountvoucherExist()) return if (!this.cwaccountsummaryExist()) return return isOk }, diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/form.vue b/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/form.vue index 37402e4c..e96ca718 100644 --- a/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/form.vue @@ -758,7 +758,7 @@
+ v-if="!judgeWrite('cwsettlementcontractList')"> 添加
@@ -2506,22 +2506,22 @@ export default { this.$refs.goodsBox2.init(excludeIdList, this.dataForm.cwsettlementsubjectList[0].subjectId) }) }, - contractChangeData(model, row) { - this.dataForm.cwsettlementcontractList[0].contractName = row.contract_name - this.dataForm.cwsettlementcontractList[0].contractPeriodTime = row.contract_period_time ? row.contract_period_time.substring(0, 10) : ''; - this.dataForm.cwsettlementcontractList[0].contractPeriodTimeEnd = row.contract_period_time_end ? row.contract_period_time_end.substring(0, 10) : ''; + contractChangeData(model, row, rowIndex) { + this.dataForm.cwsettlementcontractList[rowIndex].contractName = row.contract_name + this.dataForm.cwsettlementcontractList[rowIndex].contractPeriodTime = row.contract_period_time ? row.contract_period_time.substring(0, 10) : ''; + this.dataForm.cwsettlementcontractList[rowIndex].contractPeriodTimeEnd = row.contract_period_time_end ? row.contract_period_time_end.substring(0, 10) : ''; //this.dataForm.cwsettlementcontractList[0].currency = row.currency; - this.dataForm.cwsettlementcontractList[0].procurementModel = row.procurement_model; - this.dataForm.cwsettlementcontractList[0].pricingModel = row.pricing_model; - this.dataForm.cwsettlementcontractList[0].relatedContractId = row.related_contract_id; - this.dataForm.cwsettlementcontractList[0].subject = row.subject; - this.dataForm.cwsettlementcontractList[0].subject2 = row.subject2; - this.dataForm.cwsettlementcontractList[0].deliveryTime = row.delivery_time ? row.delivery_time.substring(0, 10) : ''; - this.dataForm.cwsettlementcontractList[0].deliveryTimeEnd = row.delivery_time_end ? row.delivery_time_end.substring(0, 10) : ''; - this.dataForm.cwsettlementcontractList[0].deliveryModel = row.delivery_model; - this.dataForm.cwsettlementcontractList[0].deliveryMethod = row.delivery_method; - this.dataForm.cwsettlementcontractList[0].modeTransport = row.mode_transport; - this.dataForm.cwsettlementcontractList[0].costBearingMian = row.cost_bearing_mian; + this.dataForm.cwsettlementcontractList[rowIndex].procurementModel = row.procurement_model; + this.dataForm.cwsettlementcontractList[rowIndex].pricingModel = row.pricing_model; + this.dataForm.cwsettlementcontractList[rowIndex].relatedContractId = row.related_contract_id; + this.dataForm.cwsettlementcontractList[rowIndex].subject = row.subject; + this.dataForm.cwsettlementcontractList[rowIndex].subject2 = row.subject2; + this.dataForm.cwsettlementcontractList[rowIndex].deliveryTime = row.delivery_time ? row.delivery_time.substring(0, 10) : ''; + this.dataForm.cwsettlementcontractList[rowIndex].deliveryTimeEnd = row.delivery_time_end ? row.delivery_time_end.substring(0, 10) : ''; + this.dataForm.cwsettlementcontractList[rowIndex].deliveryModel = row.delivery_model; + this.dataForm.cwsettlementcontractList[rowIndex].deliveryMethod = row.delivery_method; + this.dataForm.cwsettlementcontractList[rowIndex].modeTransport = row.mode_transport; + this.dataForm.cwsettlementcontractList[rowIndex].costBearingMian = row.cost_bearing_mian; }, subjectChangeData(model, row) { let aaa = {}; diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryVoucher/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryVoucher/index.vue index e1e6347d..af5abb93 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryVoucher/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/deliveryVoucher/index.vue @@ -669,7 +669,7 @@ export default { handelUpload() { this.uploadBoxVisible = true this.$nextTick(() => { - this.$refs.UploadBox.init("", "scm/Voucher", undefined, undefined, "采购", "退供凭证") + this.$refs.UploadBox.init("", "scm/Voucher", undefined, undefined, "采购", "收货凭证") }) }, handleSelectionChange(val) { diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/columnList.js b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/columnList.js index 045b1d3f..13ce2901 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/columnList.js +++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/columnList.js @@ -1,2 +1,2 @@ -const columnList = [{"jnpfKey":"billRule","fullName":"凭证编号","label":"凭证编号","sortable":false,"align":"left","__config__":{"formId":101,"visibility":["pc","app"],"jnpfKey":"billRule","defaultValue":null,"noShow":false,"tipLabel":"","dragDisabled":false,"rule":"ssdj","className":[],"label":"凭证编号","trigger":"change","showLabel":true,"required":false,"tableName":"jg_voucher","renderKey":1707042861597,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-documents","ruleName":"销售订单","tag":"JnpfInput","span":8},"readonly":true,"prop":"voucherCode","width":0,"__vModel__":"voucherCode","fixed":"none","style":{"width":"100%"},"id":"voucherCode","placeholder":"系统自动生成"},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"单据类型","label":"单据类型","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"__config__":{"formId":148,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"2","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"单据类型","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":false,"tableName":"jg_voucher","renderKey":1707044178909,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":24},"prop":"documentType","width":0,"options":[{"fullName":"收货凭证","id":"1"},{"fullName":"发货凭证","id":"2"}],"__vModel__":"documentType","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"documentType","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"凭证类型","label":"凭证类型","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"__config__":{"formId":102,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"凭证类型","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"jg_voucher","renderKey":1707042898113,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":8},"prop":"voucherType","width":0,"options":[{"fullName":"磅单","id":"1"},{"fullName":"收据","id":"2"},{"fullName":"其他","id":"3"}],"__vModel__":"voucherType","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"voucherType","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"凭证状态","label":"凭证状态","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"__config__":{"formId":147,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"1","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"凭证状态","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":false,"tableName":"jg_voucher","renderKey":1707044013618,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":24},"prop":"voucherStatus","width":0,"options":[{"fullName":"待提交","id":"1"},{"fullName":"待审核","id":"2"},{"fullName":"已驳回","id":"3"},{"fullName":"待确认","id":"4"},{"fullName":"待收货","id":"5"},{"fullName":"已完成","id":"6"},{"fullName":"已取消","id":"7"}],"__vModel__":"voucherStatus","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"voucherStatus","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"磅单编号","label":"磅单编号","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":107,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"磅单编号","trigger":"blur","showLabel":true,"required":true,"tableName":"jg_voucher","renderKey":1707043053878,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"prop":"poundCode","showWordLimit":false,"width":0,"__vModel__":"poundCode","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"poundCode","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"关联单据号","label":"关联单据号","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":149,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"关联单据号","trigger":"blur","showLabel":true,"required":false,"tableName":"jg_voucher","renderKey":1707044269999,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"prop":"associatedDocumentNo","showWordLimit":false,"width":0,"__vModel__":"associatedDocumentNo","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"associatedDocumentNo","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"车牌号","label":"车牌号","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":108,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"车牌号","trigger":"blur","showLabel":true,"required":true,"tableName":"jg_voucher","renderKey":1707043061839,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"prop":"vehicleName","showWordLimit":false,"width":0,"__vModel__":"vehicleName","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"vehicleName","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"运输方式","label":"运输方式","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"__config__":{"formId":124,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"运输方式","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"jg_voucher","renderKey":1707043292813,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":8},"prop":"modeTransport","width":0,"options":[{"fullName":"公路","id":"1"},{"fullName":"铁路","id":"2"},{"fullName":"轮船","id":"3"},{"fullName":"空运","id":"4"},{"fullName":"无","id":"5"}],"__vModel__":"modeTransport","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"modeTransport","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"承运方式","label":"承运方式","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"__config__":{"formId":125,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"承运方式","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"jg_voucher","renderKey":1707043357400,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":8},"prop":"transportationMethod","width":0,"options":[{"fullName":"仓库承运(DC)","id":"1"},{"fullName":"承运商","id":"2"},{"fullName":"供应商","id":"3"},{"fullName":"自提","id":"4"}],"__vModel__":"transportationMethod","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"transportationMethod","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"承运商","label":"承运商","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":126,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"承运商","trigger":"blur","showLabel":true,"required":true,"tableName":"jg_voucher","renderKey":1707043416601,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"prop":"carrier","showWordLimit":false,"width":0,"__vModel__":"carrier","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"carrier","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"运费","label":"运费","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":129,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"运费","trigger":"blur","showLabel":true,"required":true,"tableName":"jg_voucher","renderKey":1707043496461,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"prop":"freight","showWordLimit":false,"width":0,"__vModel__":"freight","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"freight","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"ableAddressIds":[],"filterable":false,"clearable":true,"level":2,"jnpfKey":"areaSelect","multiple":false,"fullName":"起运地","label":"起运地","sortable":false,"align":"left","__config__":{"formId":127,"visibility":["pc","app"],"jnpfKey":"areaSelect","defaultValue":[],"noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"起运地","trigger":"change","showLabel":true,"required":true,"tableName":"jg_voucher","renderKey":1707043464585,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-Provinces","tag":"JnpfAreaSelect","regList":[],"span":8},"prop":"placeDispatch","width":0,"__vModel__":"placeDispatch","fixed":"none","style":{"width":"100%"},"disabled":false,"selectType":"all","id":"placeDispatch","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"ableAddressIds":[],"filterable":false,"clearable":true,"level":2,"jnpfKey":"areaSelect","multiple":false,"fullName":"到达地","label":"到达地","sortable":false,"align":"left","__config__":{"formId":128,"visibility":["pc","app"],"jnpfKey":"areaSelect","defaultValue":[],"noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"到达地","trigger":"change","showLabel":true,"required":true,"tableName":"jg_voucher","renderKey":1707043487551,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-Provinces","tag":"JnpfAreaSelect","regList":[],"span":8},"prop":"destination","width":0,"__vModel__":"destination","fixed":"none","style":{"width":"100%"},"disabled":false,"selectType":"all","id":"destination","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"popupType":"dialog","hasPage":false,"pageSize":20,"columnOptions":[{"label":"供应商编码","value":"code"},{"label":"供应商名称","value":"name"}],"align":"left","templateJson":[],"__config__":{"formId":146,"visibility":["pc","app"],"jnpfKey":"popupSelect","defaultValue":"","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"三级供应商","trigger":"change","showLabel":true,"required":false,"tableName":"jg_voucher","renderKey":1707043714156,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-popup","tag":"JnpfPopupSelect","regList":[],"span":8},"prop":"associateThirdSuppliers","__vModel__":"associateThirdSuppliers","disabled":false,"id":"associateThirdSuppliers","placeholder":"请选择","interfaceName":"销售-发货凭证","popupWidth":"800px","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"clearable":true,"jnpfKey":"popupSelect","fullName":"三级供应商","label":"三级供应商","sortable":false,"relationField":"name","popupTitle":"选择数据","width":0,"fixed":"none","style":{"width":"100%"},"interfaceHasPage":false,"interfaceId":"523899951990705477","propsValue":"id"},{"clearable":true,"jnpfKey":"datePicker","format":"yyyy-MM-dd","fullName":"制单时间","label":"制单时间","sortable":false,"align":"left","type":"date","__config__":{"endRelationField":"","defaultValue":null,"dragDisabled":false,"className":[],"showLabel":true,"required":true,"tableName":"jg_voucher","renderKey":1707042958272,"tagIcon":"icon-ym icon-ym-generator-date","startRelationField":"","defaultCurrent":false,"tag":"JnpfDatePicker","formId":103,"visibility":["pc","app"],"jnpfKey":"datePicker","noShow":false,"endTimeTarget":1,"tipLabel":"","startTimeType":1,"endTimeRule":false,"label":"制单时间","startTimeRule":false,"startTimeValue":"","trigger":"change","endTimeValue":"","endTimeType":1,"layout":"colFormItem","startTimeTarget":1,"regList":[],"span":8},"readonly":false,"prop":"preparationTime","width":0,"__vModel__":"preparationTime","fixed":"none","style":{"width":"100%"},"disabled":false,"startTime":null,"id":"preparationTime","placeholder":"请选择","endTime":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}}] -export default columnList \ No newline at end of file +const columnList = [{"jnpfKey":"billRule","fullName":"凭证编号","label":"凭证编号","sortable":false,"align":"left","__config__":{"formId":101,"visibility":["pc","app"],"jnpfKey":"billRule","defaultValue":null,"noShow":false,"tipLabel":"","dragDisabled":false,"rule":"ssdj","className":[],"label":"凭证编号","trigger":"change","showLabel":true,"required":false,"tableName":"jg_voucher","renderKey":1707042861597,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-documents","ruleName":"销售订单","tag":"JnpfInput","span":8},"readonly":true,"prop":"voucherCode","width":0,"__vModel__":"voucherCode","fixed":"none","style":{"width":"100%"},"id":"voucherCode","placeholder":"系统自动生成"},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"单据类型","label":"单据类型","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"__config__":{"formId":148,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"2","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"单据类型","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":false,"tableName":"jg_voucher","renderKey":1707044178909,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":24},"prop":"documentType","width":0,"options":[{"fullName":"收货凭证","id":"1"},{"fullName":"发货凭证","id":"2"}],"__vModel__":"documentType","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"documentType","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"凭证类型","label":"凭证类型","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"__config__":{"formId":102,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"凭证类型","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"jg_voucher","renderKey":1707042898113,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":8},"prop":"voucherType","width":0,"options":[{"fullName":"磅单","id":"1"},{"fullName":"收据","id":"2"},{"fullName":"其他","id":"3"}],"__vModel__":"voucherType","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"voucherType","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"凭证状态","label":"凭证状态","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"__config__":{"formId":147,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"1","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"凭证状态","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":false,"tableName":"jg_voucher","renderKey":1707044013618,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":24},"prop":"voucherStatus","width":0,"options":[{"fullName":"待提交","id":"1"},{"fullName":"待审核","id":"2"},{"fullName":"已驳回","id":"3"},{"fullName":"待确认","id":"4"},{"fullName":"待收货","id":"5"},{"fullName":"已完成","id":"6"},{"fullName":"已取消","id":"7"}],"__vModel__":"voucherStatus","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"voucherStatus","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"磅单编号","label":"磅单编号","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":107,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"磅单编号","trigger":"blur","showLabel":true,"required":true,"tableName":"jg_voucher","renderKey":1707043053878,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"prop":"poundCode","showWordLimit":false,"width":0,"__vModel__":"poundCode","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"poundCode","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"关联单据号","label":"关联单据号","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":149,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"关联单据号","trigger":"blur","showLabel":true,"required":false,"tableName":"jg_voucher","renderKey":1707044269999,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"prop":"associatedDocumentNo","showWordLimit":false,"width":0,"__vModel__":"associatedDocumentNo","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"associatedDocumentNo","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"车牌号","label":"车牌号","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":108,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"车牌号","trigger":"blur","showLabel":true,"required":true,"tableName":"jg_voucher","renderKey":1707043061839,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"prop":"vehicleName","showWordLimit":false,"width":0,"__vModel__":"vehicleName","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"vehicleName","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"运输方式","label":"运输方式","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"__config__":{"formId":124,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"运输方式","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"jg_voucher","renderKey":1707043292813,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":8},"prop":"modeTransport","width":0,"options":[{"fullName":"公路","id":"1"},{"fullName":"铁路","id":"2"},{"fullName":"轮船","id":"3"},{"fullName":"空运","id":"4"},{"fullName":"无","id":"5"}],"__vModel__":"modeTransport","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"modeTransport","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"filterable":false,"clearable":true,"jnpfKey":"select","multiple":false,"fullName":"承运方式","label":"承运方式","sortable":false,"align":"left","props":{"label":"fullName","value":"id"},"__config__":{"formId":125,"visibility":["pc","app"],"jnpfKey":"select","defaultValue":"","noShow":false,"dataType":"static","dictionaryType":"","tipLabel":"","dragDisabled":false,"className":[],"label":"承运方式","trigger":"change","propsUrl":"","templateJson":[],"showLabel":true,"required":true,"tableName":"jg_voucher","renderKey":1707043357400,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-select","propsName":"","tag":"JnpfSelect","regList":[],"span":8},"prop":"transportationMethod","width":0,"options":[{"fullName":"仓库承运(DC)","id":"1"},{"fullName":"承运商","id":"2"},{"fullName":"供应商","id":"3"},{"fullName":"自提","id":"4"}],"__vModel__":"transportationMethod","fixed":"none","style":{"width":"100%"},"disabled":false,"interfaceHasPage":false,"id":"transportationMethod","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"承运商","label":"承运商","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":126,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"承运商","trigger":"blur","showLabel":true,"required":true,"tableName":"jg_voucher","renderKey":1707043416601,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"prop":"carrier","showWordLimit":false,"width":0,"__vModel__":"carrier","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"carrier","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"运费","label":"运费","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":129,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"运费","trigger":"blur","showLabel":true,"required":true,"tableName":"jg_voucher","renderKey":1707043496461,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":8},"readonly":false,"prop":"freight","showWordLimit":false,"width":0,"__vModel__":"freight","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"freight","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"ableAddressIds":[],"filterable":false,"clearable":true,"level":2,"jnpfKey":"areaSelect","multiple":false,"fullName":"起运地","label":"起运地","sortable":false,"align":"left","__config__":{"formId":127,"visibility":["pc","app"],"jnpfKey":"areaSelect","defaultValue":[],"noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"起运地","trigger":"change","showLabel":true,"required":true,"tableName":"jg_voucher","renderKey":1707043464585,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-Provinces","tag":"JnpfAreaSelect","regList":[],"span":8},"prop":"placeDispatch","width":0,"__vModel__":"placeDispatch","fixed":"none","style":{"width":"100%"},"disabled":false,"selectType":"all","id":"placeDispatch","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"ableAddressIds":[],"filterable":false,"clearable":true,"level":2,"jnpfKey":"areaSelect","multiple":false,"fullName":"到达地","label":"到达地","sortable":false,"align":"left","__config__":{"formId":128,"visibility":["pc","app"],"jnpfKey":"areaSelect","defaultValue":[],"noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"到达地","trigger":"change","showLabel":true,"required":true,"tableName":"jg_voucher","renderKey":1707043487551,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-Provinces","tag":"JnpfAreaSelect","regList":[],"span":8},"prop":"destination","width":0,"__vModel__":"destination","fixed":"none","style":{"width":"100%"},"disabled":false,"selectType":"all","id":"destination","placeholder":"请选择","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"popupType":"dialog","hasPage":false,"pageSize":20,"columnOptions":[{"label":"供应商编码","value":"code"},{"label":"供应商名称","value":"name"}],"align":"left","templateJson":[],"__config__":{"formId":146,"visibility":["pc","app"],"jnpfKey":"popupSelect","defaultValue":"","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"三级供应商","trigger":"change","showLabel":true,"required":false,"tableName":"jg_voucher","renderKey":1707043714156,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-popup","tag":"JnpfPopupSelect","regList":[],"span":8},"prop":"associateThirdSuppliers","__vModel__":"associateThirdSuppliers","disabled":false,"id":"associateThirdSuppliers","placeholder":"请选择","interfaceName":"销售-发货凭证","popupWidth":"800px","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"},"clearable":true,"jnpfKey":"popupSelect","fullName":"三级供应商","label":"三级供应商","sortable":false,"relationField":"name","popupTitle":"选择数据","width":0,"fixed":"none","style":{"width":"100%"},"interfaceHasPage":false,"interfaceId":"523899951990705477","propsValue":"id"},{"clearable":true,"jnpfKey":"datePicker","format":"yyyy-MM-dd","fullName":"制单时间","label":"制单时间","sortable":false,"align":"left","type":"date","__config__":{"endRelationField":"","defaultValue":null,"dragDisabled":false,"className":[],"showLabel":true,"required":true,"tableName":"jg_voucher","renderKey":1707042958272,"tagIcon":"icon-ym icon-ym-generator-date","startRelationField":"","defaultCurrent":false,"tag":"JnpfDatePicker","formId":103,"visibility":["pc","app"],"jnpfKey":"datePicker","noShow":false,"endTimeTarget":1,"tipLabel":"","startTimeType":1,"endTimeRule":false,"label":"制单时间","startTimeRule":false,"startTimeValue":"","trigger":"change","endTimeValue":"","endTimeType":1,"layout":"colFormItem","startTimeTarget":1,"regList":[],"span":8},"readonly":false,"prop":"preparationTime","width":0,"__vModel__":"preparationTime","fixed":"none","style":{"width":"100%"},"disabled":false,"startTime":null,"id":"preparationTime","placeholder":"请选择","endTime":null,"on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}},{"clearable":true,"maxlength":null,"jnpfKey":"input","suffixIcon":"","fullName":"订单序号","label":"订单序号","sortable":false,"align":"left","addonAfter":"","__config__":{"formId":153,"visibility":["pc","app"],"jnpfKey":"input","noShow":false,"tipLabel":"","dragDisabled":false,"className":[],"label":"订单序号","trigger":"blur","showLabel":true,"required":false,"tableName":"jg_voucher","renderKey":1719471876257,"layout":"colFormItem","tagIcon":"icon-ym icon-ym-generator-input","unique":false,"tag":"JnpfInput","regList":[],"span":24},"readonly":false,"prop":"orderNo","showWordLimit":false,"width":0,"__vModel__":"orderNo","showPassword":false,"fixed":"none","style":{"width":"100%"},"disabled":false,"id":"orderNo","placeholder":"请输入","prefixIcon":"","addonBefore":"","on":{"change":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}","blur":"({ data, formData, setFormData, setShowOrHide, setRequired, setDisabled, onlineUtils }) => {\n // 在此编写代码\n \n}"}}] +export default columnList diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/index.vue index 14a49cad..8a78ff0a 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryVoucher/index.vue @@ -83,7 +83,9 @@ 导出 - + 导入 + 生成销售单 @@ -881,7 +883,7 @@ export default { handelUpload() { this.uploadBoxVisible = true this.$nextTick(() => { - this.$refs.UploadBox.init("", "scm/Voucher") + this.$refs.UploadBox.init("", "scm/Vehicle") }) }, handleSelectionChange(val) { diff --git a/jnpf-java-boot/jnpf-web/src/views/workFlow/components/FlowBox.vue b/jnpf-java-boot/jnpf-web/src/views/workFlow/components/FlowBox.vue index 3324e84f..c199ce2f 100644 --- a/jnpf-java-boot/jnpf-web/src/views/workFlow/components/FlowBox.vue +++ b/jnpf-java-boot/jnpf-web/src/views/workFlow/components/FlowBox.vue @@ -48,7 +48,7 @@ :loading="candidateLoading" :disabled="allBtnDisabled"> {{ properties.submitBtnText || '提 交' }} {{ properties.auditBtnText || '通 过' }} + v-if="setting.opType == 1 && properties.hasAuditBtn">审 批 @@ -176,7 +176,7 @@ {{ $t('common.cancelButton') }} - {{ $t('common.confirmButton') }} + 通 过 @@ -210,7 +210,7 @@ {{ $t('common.cancelButton') }} - {{ $t('common.confirmButton') }} + 通 过 From 88efca3111e970033ca597adc169fa0331126a2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E5=B7=9D=E8=99=8E?= Date: Thu, 27 Jun 2024 20:07:58 +0800 Subject: [PATCH 2/6] 6.27 --- .../src/main/resources/application-pro.yml | 4 +- .../src/main/resources/application.yml | 2 +- .../mapper/scm/CwaccountvoucherMapper.xml | 556 +++++++----------- .../impl/PaymentApplicationServiceImpl.java | 7 +- .../src/views/extend/cwaccount/form.vue | 48 +- .../views/extend/paymentapplication/index.vue | 4 +- 6 files changed, 259 insertions(+), 362 deletions(-) diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/application-pro.yml b/jnpf-java-boot/jnpf-admin/src/main/resources/application-pro.yml index 63aea373..5c96cd8e 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/application-pro.yml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/application-pro.yml @@ -17,7 +17,7 @@ spring: exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure #排除自动配置，手动配置druid datasource: db-type: MySQL #数据库类型(可选值 MySQL、SQLServer、Oracle、DM8、KingbaseES、PostgreSQL，请严格按可选值填写) - host: 127.0.0.1 + host: 221.214.32.166 port: 3309 username: root password: qawsed,.123 @@ -70,7 +70,7 @@ spring: # redis单机模式 redis: database: 1 #缓存库编号 - host: 127.0.0.1 + host: 222.71.165.188 port: 6379 password: qweasd,.123 # 密码为空时，请将本行注释 timeout: 3000 #超时时间(单位：秒) diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/application.yml b/jnpf-java-boot/jnpf-admin/src/main/resources/application.yml index e8f09465..8ce057ee 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/application.yml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/application.yml @@ -3,7 +3,7 @@ spring: name: jnpf-boot profiles: # 指定环境配置 dev(开发环境-默认)、test(测试环境)、preview(预生产)、pro(生产环境) - active: test + active: pro servlet: multipart: #文件传输配置 max-file-size: 1000MB #单个数据大小限制 diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwaccountvoucherMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwaccountvoucherMapper.xml index 633e50f1..835cea3e 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwaccountvoucherMapper.xml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwaccountvoucherMapper.xml @@ -99,406 +99,266 @@ diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/PaymentApplicationServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/PaymentApplicationServiceImpl.java index aca4d442..eb3f8fb1 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/PaymentApplicationServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/PaymentApplicationServiceImpl.java @@ -431,15 +431,14 @@ public class PaymentApplicationServiceImpl extends ServiceImpl0){ - //entity.set + entity.setFlowId(paymentApplicationForm.getFlowId()); } this.saveOrUpdate(entity); diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/form.vue b/jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/form.vue index ae5f8b0e..d140eee4 100644 --- a/jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/form.vue @@ -1883,7 +1883,7 @@ export default { const e = list[i]; this.dataForm.cwaccountstorageList.push(e) } - this.addcwaccountvoucherList(); + //this.addcwaccountvoucherList(); }, typeChangeData() { this.dataForm.cwaccountsubjectList = []; @@ -2673,14 +2673,52 @@ export default { return result }, addcwaccountsummaryList() { - if (!this.dataForm.cwaccountvoucherList || this.dataForm.cwaccountvoucherList.length == 0) { + if (!this.dataForm.cwaccountstorageList || this.dataForm.cwaccountstorageList.length == 0) { this.$message({ type: 'error', - message: '请先加载凭证信息', + message: '请先添加对账明细', duration: 1500, }) return } + let storageIdList = []; + let outboundIdList = []; + this.dataForm.cwaccountvoucherList = []; + let storageList = []; + for (let i = 0; i < this.dataForm.cwaccountstorageList.length; i++) { + let storageEntity = {}; + storageEntity.storageId = this.dataForm.cwaccountstorageList[i].storageId; + if (this.dataForm.cwaccountstorageList[i].warehousingStorageType == '采购入库') { + storageEntity.warehousingStorageType = '采购入库'; + } else if (this.dataForm.cwaccountstorageList[i].warehousingStorageType == '退货入库') { + storageEntity.warehousingStorageType = '退货入库'; + } else if (this.dataForm.cwaccountstorageList[i].warehousingStorageType == '销售收货单入库') { + storageEntity.warehousingStorageType = '销售收货单入库'; + } else if (this.dataForm.cwaccountstorageList[i].warehousingStorageType == '采购收货单入库') { + storageEntity.warehousingStorageType = '采购收货单入库'; + } else if (this.dataForm.cwaccountstorageList[i].warehousingStorageType == '销售出库') { + storageEntity.warehousingStorageType = '销售出库'; + } else if (this.dataForm.cwaccountstorageList[i].warehousingStorageType == '退供出库') { + storageEntity.warehousingStorageType = '退供出库'; + } else if (this.dataForm.cwaccountstorageList[i].warehousingStorageType == '销售发货单出库') { + storageEntity.warehousingStorageType = '销售发货单出库'; + } else if (this.dataForm.cwaccountstorageList[i].warehousingStorageType == '采购发货单出库') { + storageEntity.warehousingStorageType = '采购发货单出库'; + } + storageList.push(storageEntity); + } + let query = { + warehousingPoundList: storageList + } + request({ + url: `/api/scm/WarehousingStorage/getWarehousingstorageoutboundPoundlist`, + method: 'post', + data: query + }).then(res => { + if (res.data) { + this.dataForm.cwaccountsummaryList = res.data + } + }) // var data = JSON.parse(JSON.stringify(this.dataForm.cwaccountstorageList)) // var order = this.dataForm.cwaccountstorageList[0].orderCode @@ -2699,7 +2737,7 @@ export default { // } // }) // }) - if(this.dataForm.summaryType == 1){ + /* if(this.dataForm.summaryType == 1){ this.dataForm.cwaccountsummaryList = this.sameReduce(this.dataForm.cwaccountvoucherList); this.dataForm.cwaccountsummaryList.forEach(item => { item.settlementSum = item.settlementSum.toFixed(4); @@ -2728,7 +2766,7 @@ export default { duration: 1500, }) return - } + } */ // console.log(this.dataForm.cwaccountsummaryList + "111"); diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/paymentapplication/index.vue b/jnpf-java-boot/jnpf-web/src/views/extend/paymentapplication/index.vue index 50b4ea0e..7a8e0b09 100644 --- a/jnpf-java-boot/jnpf-web/src/views/extend/paymentapplication/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/extend/paymentapplication/index.vue @@ -223,7 +223,7 @@ export default { isLeaf: 'isLeaf' }, list: [], - listLoading: true, + listLoading: false, total: 0, queryData: {}, listQuery: { @@ -475,7 +475,7 @@ export default { }, async initSearchDataAndListData() { await this.initSearchData() - this.initData() + //this.initData() }, //初始化查询的默认数据 async initSearchData() { From 5682a8fdc0b833e983105a948896d8cf93b5d872 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E5=B7=9D=E8=99=8E?= Date: Thu, 27 Jun 2024 20:23:20 +0800 Subject: [PATCH 3/6] 6.27 --- .../jnpf-admin/src/main/resources/application-pro.yml | 4 ++-- jnpf-java-boot/jnpf-admin/src/main/resources/application.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/application-pro.yml b/jnpf-java-boot/jnpf-admin/src/main/resources/application-pro.yml index 5c96cd8e..63aea373 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/application-pro.yml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/application-pro.yml @@ -17,7 +17,7 @@ spring: exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure #排除自动配置，手动配置druid datasource: db-type: MySQL #数据库类型(可选值 MySQL、SQLServer、Oracle、DM8、KingbaseES、PostgreSQL，请严格按可选值填写) - host: 221.214.32.166 + host: 127.0.0.1 port: 3309 username: root password: qawsed,.123 @@ -70,7 +70,7 @@ spring: # redis单机模式 redis: database: 1 #缓存库编号 - host: 222.71.165.188 + host: 127.0.0.1 port: 6379 password: qweasd,.123 # 密码为空时，请将本行注释 timeout: 3000 #超时时间(单位：秒) diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/application.yml b/jnpf-java-boot/jnpf-admin/src/main/resources/application.yml index 8ce057ee..e8f09465 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/application.yml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/application.yml @@ -3,7 +3,7 @@ spring: name: jnpf-boot profiles: # 指定环境配置 dev(开发环境-默认)、test(测试环境)、preview(预生产)、pro(生产环境) - active: pro + active: test servlet: multipart: #文件传输配置 max-file-size: 1000MB #单个数据大小限制 From 267d93cdcafe34b1b71544897d2430c34a571eb3 Mon Sep 17 00:00:00 2001 From: vayne Date: Fri, 28 Jun 2024 09:45:55 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=BD=AC=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/scm/BusinessOrderMapper.xml | 4 +- .../mapper/PurchaseSaleRelationMapper.java | 16 ++ .../service/PurchaseSaleRelationService.java | 35 +++ .../impl/BusinessOrderServiceImpl.java | 17 +- .../impl/PurchaseSaleRelationServiceImpl.java | 255 ++++++++++++++++++ .../PurchaseSaleRelationController.java | 190 +++++++++++++ .../java/jnpf/entity/BusinessOrderEntity.java | 4 +- .../entity/PurchaseSaleRelationEntity.java | 47 ++++ .../businessorder/BusinessOrderForm.java | 2 +- .../PurchaseSaleRelationConstant.java | 41 +++ .../PurchaseSaleRelationForm.java | 26 ++ .../PurchaseSaleRelationPagination.java | 30 +++ .../purchaseCenter/purchaseOrder/index.vue | 37 +-- .../views/scm/saleCenter/saleOrder/form.vue | 79 ++++-- 14 files changed, 736 insertions(+), 47 deletions(-) create mode 100644 jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/PurchaseSaleRelationMapper.java create mode 100644 jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/PurchaseSaleRelationService.java create mode 100644 jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/PurchaseSaleRelationServiceImpl.java create mode 100644 jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/PurchaseSaleRelationController.java create mode 100644 jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/PurchaseSaleRelationEntity.java create mode 100644 jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/purchasesalerelation/PurchaseSaleRelationConstant.java create mode 100644 jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/purchasesalerelation/PurchaseSaleRelationForm.java create mode 100644 jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/purchasesalerelation/PurchaseSaleRelationPagination.java diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml index d6e2ee1e..ec63e46d 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml @@ -465,7 +465,8 @@ END AS saleStatus, d.contract_name AS contractName, f.storageNum, - j.name as wareHouseName + j.name as wareHouseName, + k.sale_contract_no as saleContractNo FROM jg_business_order a LEFT JOIN jg_subject_basic b ON a.first_subject_basic_id = b.id @@ -496,6 +497,7 @@ LEFT JOIN base_user i1 ON i1.F_Id = a.f_last_modify_user_id and i1.f_delete_mark is null LEFT JOIN jg_business_line j ON a.delivery_warehouse = j.id AND j.f_delete_mark is null + LEFT JOIN jg_voucher k ON a.id = k.business_order_id and k.f_delete_mark is null ${ew.customSqlSegment} GROUP BY a.id diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/PurchaseSaleRelationMapper.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/PurchaseSaleRelationMapper.java new file mode 100644 index 00000000..d11d9e7d --- /dev/null +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/mapper/PurchaseSaleRelationMapper.java @@ -0,0 +1,16 @@ +package jnpf.mapper; + + +import jnpf.entity.PurchaseSaleRelationEntity; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * purchaseSaleRelation + * 版本： V3.5 + * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * 作者： JNPF开发平台组 + * 日期： 2024-06-27 + */ +public interface PurchaseSaleRelationMapper extends BaseMapper { + +} diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/PurchaseSaleRelationService.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/PurchaseSaleRelationService.java new file mode 100644 index 00000000..12b73425 --- /dev/null +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/PurchaseSaleRelationService.java @@ -0,0 +1,35 @@ +package jnpf.service; + +import jnpf.model.purchasesalerelation.*; +import jnpf.entity.*; +import java.util.*; +import com.baomidou.mybatisplus.extension.service.IService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; + +/** + * purchaseSaleRelation + * 版本： V3.5 + * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * 作者： JNPF开发平台组 + * 日期： 2024-06-27 + */ +public interface PurchaseSaleRelationService extends IService { + List getList(PurchaseSaleRelationPagination purchaseSaleRelationPagination); + + List getTypeList(PurchaseSaleRelationPagination purchaseSaleRelationPagination,String dataType); + + PurchaseSaleRelationEntity getInfo(String id); + + void delete(PurchaseSaleRelationEntity entity); + + void create(PurchaseSaleRelationEntity entity); + + boolean update(String id, PurchaseSaleRelationEntity entity); + + //子表方法 + //副表数据方法 + String checkForm(PurchaseSaleRelationForm form,int i); + + void saveOrUpdate(PurchaseSaleRelationForm purchaseSaleRelationForm,String id, boolean isSave) throws Exception; + +} diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java index 7f7ffb6a..8b1e07d6 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java @@ -120,6 +120,8 @@ public class BusinessOrderServiceImpl extends ServiceImpl getList(BusinessOrderPagination businessOrderPagination){ @@ -1150,10 +1152,17 @@ public class BusinessOrderServiceImpl extends ServiceImpl 0){ + for (String s : entity.getIsTransferSource()) { + BusinessOrderEntity businessOrderEntity = businessOrderMapper.selectById(s); + businessOrderEntity.setIsTransfer("2"); + businessOrderMapper.updateById(businessOrderEntity); + PurchaseSaleRelationEntity purchaseSaleRelationEntity = new PurchaseSaleRelationEntity(); + purchaseSaleRelationEntity.setId(RandomUtil.uuId()); + purchaseSaleRelationEntity.setPurchaseOrderId(s); + purchaseSaleRelationEntity.setSaleOrderId(entity.getId()); + purchaseSaleRelationService.save(purchaseSaleRelationEntity); + } } //添加流程状态 FlowTaskEntity flowTaskEntity = generaterSwapUtil.getInfoSubmit(String.valueOf(entity.getId()), FlowTaskEntity::getStatus); diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/PurchaseSaleRelationServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/PurchaseSaleRelationServiceImpl.java new file mode 100644 index 00000000..f12ec4a4 --- /dev/null +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/PurchaseSaleRelationServiceImpl.java @@ -0,0 +1,255 @@ +package jnpf.service.impl; + +import jnpf.entity.*; +import jnpf.mapper.PurchaseSaleRelationMapper; +import jnpf.service.*; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import jnpf.model.purchasesalerelation.*; +import java.math.BigDecimal; +import cn.hutool.core.util.ObjectUtil; +import jnpf.permission.model.authorize.AuthorizeConditionModel; +import jnpf.util.GeneraterSwapUtil; +import jnpf.database.model.superQuery.SuperQueryJsonModel; +import jnpf.database.model.superQuery.ConditionJsonModel; +import jnpf.database.model.superQuery.SuperQueryConditionModel; +import java.lang.reflect.Field; +import com.baomidou.mybatisplus.annotation.TableField; +import java.util.regex.Pattern; +import jnpf.model.QueryModel; +import java.util.stream.Collectors; +import jnpf.base.model.ColumnDataModel; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import jnpf.database.model.superQuery.SuperJsonModel; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import java.text.SimpleDateFormat; +import jnpf.util.*; +import java.util.*; +import jnpf.base.UserInfo; +import jnpf.permission.entity.UserEntity; +/** + * + * purchaseSaleRelation + * 版本： V3.5 + * 版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * 作者： JNPF开发平台组 + * 日期： 2024-06-27 + */ +@Service +public class PurchaseSaleRelationServiceImpl extends ServiceImpl implements PurchaseSaleRelationService{ + @Autowired + private GeneraterSwapUtil generaterSwapUtil; + + @Autowired + private UserProvider userProvider; + + @Override + public List getList(PurchaseSaleRelationPagination purchaseSaleRelationPagination){ + return getTypeList(purchaseSaleRelationPagination,purchaseSaleRelationPagination.getDataType()); + } + /** 列表查询 */ + @Override + public List getTypeList(PurchaseSaleRelationPagination purchaseSaleRelationPagination,String dataType){ + String userId=userProvider.get().getUserId(); + List AllIdList =new ArrayList(); + List> intersectionList =new ArrayList<>(); + boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); + String columnData = !isPc ? PurchaseSaleRelationConstant.getAppColumnData() : PurchaseSaleRelationConstant.getColumnData(); + ColumnDataModel columnDataModel = JsonUtil.getJsonToBean(columnData, ColumnDataModel.class); + String ruleJson = !isPc ? JsonUtil.getObjectToString(columnDataModel.getRuleListApp()) : JsonUtil.getObjectToString(columnDataModel.getRuleList()); + + int total=0; + int purchaseSaleRelationNum =0; + QueryWrapper purchaseSaleRelationQueryWrapper=new QueryWrapper<>(); + List allSuperIDlist = new ArrayList<>(); + String superOp =""; + if (ObjectUtil.isNotEmpty(purchaseSaleRelationPagination.getSuperQueryJson())){ + List allSuperList = new ArrayList<>(); + List> intersectionSuperList = new ArrayList<>(); + String queryJson = purchaseSaleRelationPagination.getSuperQueryJson(); + SuperJsonModel superJsonModel = JsonUtil.getJsonToBean(queryJson, SuperJsonModel.class); + int superNum = 0; + QueryWrapper purchaseSaleRelationSuperWrapper = new QueryWrapper<>(); + purchaseSaleRelationSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(purchaseSaleRelationSuperWrapper,PurchaseSaleRelationEntity.class,queryJson,"0")); + int purchaseSaleRelationNum1 = purchaseSaleRelationSuperWrapper.getExpression().getNormal().size(); + if (purchaseSaleRelationNum1>0){ + List purchaseSaleRelationList =this.list(purchaseSaleRelationSuperWrapper).stream().map(PurchaseSaleRelationEntity::getId).collect(Collectors.toList()); + allSuperList.addAll(purchaseSaleRelationList); + intersectionSuperList.add(purchaseSaleRelationList); + superNum++; + } + superOp = superNum > 0 ? superJsonModel.getMatchLogic() : ""; + //and or + if(superOp.equalsIgnoreCase("and")){ + allSuperIDlist = generaterSwapUtil.getIntersection(intersectionSuperList); + }else{ + allSuperIDlist = allSuperList; + } + } + List allRuleIDlist = new ArrayList<>(); + String ruleOp =""; + if (ObjectUtil.isNotEmpty(ruleJson)){ + List allRuleList = new ArrayList<>(); + List> intersectionRuleList = new ArrayList<>(); + SuperJsonModel ruleJsonModel = JsonUtil.getJsonToBean(ruleJson, SuperJsonModel.class); + int ruleNum = 0; + QueryWrapper purchaseSaleRelationSuperWrapper = new QueryWrapper<>(); + purchaseSaleRelationSuperWrapper = generaterSwapUtil.getCondition(new QueryModel(purchaseSaleRelationSuperWrapper,PurchaseSaleRelationEntity.class,ruleJson,"0")); + int purchaseSaleRelationNum1 = purchaseSaleRelationSuperWrapper.getExpression().getNormal().size(); + if (purchaseSaleRelationNum1>0){ + List purchaseSaleRelationList =this.list(purchaseSaleRelationSuperWrapper).stream().map(PurchaseSaleRelationEntity::getId).collect(Collectors.toList()); + allRuleList.addAll(purchaseSaleRelationList); + intersectionRuleList.add(purchaseSaleRelationList); + ruleNum++; + } + ruleOp = ruleNum > 0 ? ruleJsonModel.getMatchLogic() : ""; + //and or + if(ruleOp.equalsIgnoreCase("and")){ + allRuleIDlist = generaterSwapUtil.getIntersection(intersectionRuleList); + }else{ + allRuleIDlist = allRuleList; + } + } + boolean pcPermission = false; + boolean appPermission = false; + if(isPc && pcPermission){ + if (!userProvider.get().getIsAdministrator()){ + Object purchaseSaleRelationObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(purchaseSaleRelationQueryWrapper,PurchaseSaleRelationEntity.class,purchaseSaleRelationPagination.getMenuId(),"0")); + if (ObjectUtil.isEmpty(purchaseSaleRelationObj)){ + return new ArrayList<>(); + } else { + purchaseSaleRelationQueryWrapper = (QueryWrapper)purchaseSaleRelationObj; + if( purchaseSaleRelationQueryWrapper.getExpression().getNormal().size()>0){ + purchaseSaleRelationNum++; + } + } + } + } + if(!isPc && appPermission){ + if (!userProvider.get().getIsAdministrator()){ + Object purchaseSaleRelationObj=generaterSwapUtil.getAuthorizeCondition(new QueryModel(purchaseSaleRelationQueryWrapper,PurchaseSaleRelationEntity.class,purchaseSaleRelationPagination.getMenuId(),"0")); + if (ObjectUtil.isEmpty(purchaseSaleRelationObj)){ + return new ArrayList<>(); + } else { + purchaseSaleRelationQueryWrapper = (QueryWrapper)purchaseSaleRelationObj; + if( purchaseSaleRelationQueryWrapper.getExpression().getNormal().size()>0){ + purchaseSaleRelationNum++; + } + } + + + } + } + List intersection = generaterSwapUtil.getIntersection(intersectionList); + if (total>0){ + if (intersection.size()==0){ + intersection.add("jnpfNullList"); + } + purchaseSaleRelationQueryWrapper.lambda().in(PurchaseSaleRelationEntity::getId, intersection); + } + //是否有高级查询 + if (StringUtil.isNotEmpty(superOp)){ + if (allSuperIDlist.size()==0){ + allSuperIDlist.add("jnpfNullList"); + } + List finalAllSuperIDlist = allSuperIDlist; + purchaseSaleRelationQueryWrapper.lambda().and(t->t.in(PurchaseSaleRelationEntity::getId, finalAllSuperIDlist)); + } + //是否有数据过滤查询 + if (StringUtil.isNotEmpty(ruleOp)){ + if (allRuleIDlist.size()==0){ + allRuleIDlist.add("jnpfNullList"); + } + List finalAllRuleIDlist = allRuleIDlist; + purchaseSaleRelationQueryWrapper.lambda().and(t->t.in(PurchaseSaleRelationEntity::getId, finalAllRuleIDlist)); + } + + //排序 + if(StringUtil.isEmpty(purchaseSaleRelationPagination.getSidx())){ + purchaseSaleRelationQueryWrapper.lambda().orderByDesc(PurchaseSaleRelationEntity::getId); + }else{ + try { + String sidx = purchaseSaleRelationPagination.getSidx(); + String[] strs= sidx.split("_name"); + PurchaseSaleRelationEntity purchaseSaleRelationEntity = new PurchaseSaleRelationEntity(); + Field declaredField = purchaseSaleRelationEntity.getClass().getDeclaredField(strs[0]); + declaredField.setAccessible(true); + String value = declaredField.getAnnotation(TableField.class).value(); + purchaseSaleRelationQueryWrapper="asc".equals(purchaseSaleRelationPagination.getSort().toLowerCase())?purchaseSaleRelationQueryWrapper.orderByAsc(value):purchaseSaleRelationQueryWrapper.orderByDesc(value); + } catch (NoSuchFieldException e) { + e.printStackTrace(); + } + } + + if("0".equals(dataType)){ + if((total>0 && AllIdList.size()>0) || total==0){ + Page page=new Page<>(purchaseSaleRelationPagination.getCurrentPage(), purchaseSaleRelationPagination.getPageSize()); + IPage userIPage=this.page(page, purchaseSaleRelationQueryWrapper); + return purchaseSaleRelationPagination.setData(userIPage.getRecords(),userIPage.getTotal()); + }else{ + List list = new ArrayList(); + return purchaseSaleRelationPagination.setData(list, list.size()); + } + }else{ + return this.list(purchaseSaleRelationQueryWrapper); + } + } + @Override + public PurchaseSaleRelationEntity getInfo(String id){ + QueryWrapper queryWrapper=new QueryWrapper<>(); + queryWrapper.lambda().eq(PurchaseSaleRelationEntity::getId,id); + return this.getOne(queryWrapper); + } + @Override + public void create(PurchaseSaleRelationEntity entity){ + this.save(entity); + } + @Override + public boolean update(String id, PurchaseSaleRelationEntity entity){ + return this.updateById(entity); + } + @Override + public void delete(PurchaseSaleRelationEntity entity){ + if(entity!=null){ + this.removeById(entity.getId()); + } + } + /** 验证表单唯一字段，正则，非空 i-0新增-1修改*/ + @Override + public String checkForm(PurchaseSaleRelationForm form,int i) { + boolean isUp =StringUtil.isNotEmpty(form.getId()) && !form.getId().equals("0"); + String id=""; + String countRecover = ""; + if (isUp){ + id = form.getId(); + } + //主表字段验证 + return countRecover; + } + /** + * 新增修改数据(事务回滚) + * @param id + * @param purchaseSaleRelationForm + * @return + */ + @Override + @Transactional + public void saveOrUpdate(PurchaseSaleRelationForm purchaseSaleRelationForm,String id, boolean isSave) throws Exception{ + UserInfo userInfo=userProvider.get(); + UserEntity userEntity = generaterSwapUtil.getUser(userInfo.getUserId()); + purchaseSaleRelationForm = JsonUtil.getJsonToBean( + generaterSwapUtil.swapDatetime(PurchaseSaleRelationConstant.getFormData(),purchaseSaleRelationForm),PurchaseSaleRelationForm.class); + PurchaseSaleRelationEntity entity = JsonUtil.getJsonToBean(purchaseSaleRelationForm, PurchaseSaleRelationEntity.class); + + if(isSave){ + String mainId = RandomUtil.uuId() ; + entity.setId(mainId); + }else{ + } + this.saveOrUpdate(entity); + + } +} diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/PurchaseSaleRelationController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/PurchaseSaleRelationController.java new file mode 100644 index 00000000..d11b7261 --- /dev/null +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/PurchaseSaleRelationController.java @@ -0,0 +1,190 @@ +package jnpf.controller; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jnpf.base.ActionResult; +import jnpf.base.UserInfo; +import jnpf.exception.DataException; +import jnpf.permission.entity.UserEntity; +import jnpf.service.*; +import jnpf.entity.*; +import jnpf.util.*; +import jnpf.model.purchasesalerelation.*; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import javax.validation.Valid; +import java.util.*; +import jnpf.annotation.JnpfField; +import jnpf.base.vo.PageListVO; +import jnpf.base.vo.PaginationVO; +import jnpf.base.vo.DownloadVO; +import jnpf.config.ConfigValueUtil; +import jnpf.base.entity.ProvinceEntity; +import java.io.IOException; +import java.util.stream.Collectors; +import jnpf.engine.entity.FlowTaskEntity; +import jnpf.exception.WorkFlowException; +import org.springframework.transaction.annotation.Transactional; + +/** + * purchaseSaleRelation + * @版本： V3.5 + * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * @作者： JNPF开发平台组 + * @日期： 2024-06-27 + */ +@Slf4j +@RestController +@Tag(name = "purchaseSaleRelation" , description = "scm") +@RequestMapping("/api/scm/PurchaseSaleRelation") +public class PurchaseSaleRelationController { + + @Autowired + private GeneraterSwapUtil generaterSwapUtil; + + @Autowired + private UserProvider userProvider; + + @Autowired + private PurchaseSaleRelationService purchaseSaleRelationService; + + + + /** + * 列表 + * + * @param purchaseSaleRelationPagination + * @return + */ + @Operation(summary = "获取列表") + @PostMapping("/getList") + public ActionResult list(@RequestBody PurchaseSaleRelationPagination purchaseSaleRelationPagination)throws IOException{ + List list= purchaseSaleRelationService.getList(purchaseSaleRelationPagination); + List> realList=new ArrayList<>(); + for (PurchaseSaleRelationEntity entity : list) { + Map purchaseSaleRelationMap=JsonUtil.entityToMap(entity); + purchaseSaleRelationMap.put("id", purchaseSaleRelationMap.get("id")); + //副表数据 + //子表数据 + realList.add(purchaseSaleRelationMap); + } + //数据转换 + realList = generaterSwapUtil.swapDataList(realList, PurchaseSaleRelationConstant.getFormData(), PurchaseSaleRelationConstant.getColumnData(), purchaseSaleRelationPagination.getModuleId(),false); + + //返回对象 + PageListVO vo = new PageListVO(); + vo.setList(realList); + PaginationVO page = JsonUtil.getJsonToBean(purchaseSaleRelationPagination, PaginationVO.class); + vo.setPagination(page); + return ActionResult.success(vo); + } + /** + * 创建 + * + * @param purchaseSaleRelationForm + * @return + */ + @PostMapping() + @Operation(summary = "创建") + public ActionResult create(@RequestBody @Valid PurchaseSaleRelationForm purchaseSaleRelationForm) { + String b = purchaseSaleRelationService.checkForm(purchaseSaleRelationForm,0); + if (StringUtil.isNotEmpty(b)){ + return ActionResult.fail(b ); + } + try{ + purchaseSaleRelationService.saveOrUpdate(purchaseSaleRelationForm, null ,true); + }catch(Exception e){ + return ActionResult.fail("新增数据失败"); + } + return ActionResult.success("创建成功"); + } + /** + * 编辑 + * @param id + * @param purchaseSaleRelationForm + * @return + */ + @PutMapping("/{id}") + @Operation(summary = "更新") + public ActionResult update(@PathVariable("id") String id,@RequestBody @Valid PurchaseSaleRelationForm purchaseSaleRelationForm, + @RequestParam(value = "isImport", required = false) boolean isImport){ + purchaseSaleRelationForm.setId(id); + if (!isImport) { + String b = purchaseSaleRelationService.checkForm(purchaseSaleRelationForm,1); + if (StringUtil.isNotEmpty(b)){ + return ActionResult.fail(b ); + } + } + PurchaseSaleRelationEntity entity= purchaseSaleRelationService.getInfo(id); + if(entity!=null){ + try{ + purchaseSaleRelationService.saveOrUpdate(purchaseSaleRelationForm,id,false); + }catch(Exception e){ + return ActionResult.fail("修改数据失败"); + } + return ActionResult.success("更新成功"); + }else{ + return ActionResult.fail("更新失败，数据不存在"); + } + } + /** + * 删除 + * @param id + * @return + */ + @Operation(summary = "删除") + @DeleteMapping("/{id}") + @Transactional + public ActionResult delete(@PathVariable("id") String id){ + PurchaseSaleRelationEntity entity= purchaseSaleRelationService.getInfo(id); + if(entity!=null){ + //主表数据删除 + purchaseSaleRelationService.delete(entity); + } + return ActionResult.success("删除成功"); + } + /** + * 表单信息(详情页) + * 详情页面使用-转换数据 + * @param id + * @return + */ + @Operation(summary = "表单信息(详情页)") + @GetMapping("/detail/{id}") + public ActionResult detailInfo(@PathVariable("id") String id){ + PurchaseSaleRelationEntity entity= purchaseSaleRelationService.getInfo(id); + if(entity==null){ + return ActionResult.fail("表单数据不存在！"); + } + Map purchaseSaleRelationMap=JsonUtil.entityToMap(entity); + purchaseSaleRelationMap.put("id", purchaseSaleRelationMap.get("id")); + //副表数据 + //子表数据 + purchaseSaleRelationMap = generaterSwapUtil.swapDataDetail(purchaseSaleRelationMap,PurchaseSaleRelationConstant.getFormData(),"576073976149723909",false); + return ActionResult.success(purchaseSaleRelationMap); + } + /** + * 获取详情(编辑页) + * 编辑页面使用-不转换数据 + * @param id + * @return + */ + @Operation(summary = "信息") + @GetMapping("/{id}") + public ActionResult info(@PathVariable("id") String id){ + PurchaseSaleRelationEntity entity= purchaseSaleRelationService.getInfo(id); + if(entity==null){ + return ActionResult.fail("表单数据不存在！"); + } + Map purchaseSaleRelationMap=JsonUtil.entityToMap(entity); + purchaseSaleRelationMap.put("id", purchaseSaleRelationMap.get("id")); + //副表数据 + //子表数据 + purchaseSaleRelationMap = generaterSwapUtil.swapDataForm(purchaseSaleRelationMap,PurchaseSaleRelationConstant.getFormData(),PurchaseSaleRelationConstant.TABLEFIELDKEY,PurchaseSaleRelationConstant.TABLERENAMES); + return ActionResult.success(purchaseSaleRelationMap); + } + +} diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessOrderEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessOrderEntity.java index 728cd0dd..daa3b9ad 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessOrderEntity.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/BusinessOrderEntity.java @@ -201,7 +201,7 @@ public class BusinessOrderEntity { @TableField(exist = false) private String wareHouseName; @TableField(exist = false) - private String isTransferSource; + private List isTransferSource; @TableField(exist = false) private String settlementMethod1; @TableField(exist = false) @@ -215,4 +215,6 @@ public class BusinessOrderEntity { @TableField(exist = false) private BigDecimal taxCount; + @TableField(exist = false) + private String saleContractNo; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/PurchaseSaleRelationEntity.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/PurchaseSaleRelationEntity.java new file mode 100644 index 00000000..58083b67 --- /dev/null +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/PurchaseSaleRelationEntity.java @@ -0,0 +1,47 @@ +package jnpf.entity; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import java.util.Date; +/** + * 采购订单转销售订单关系表 + * + * @版本： V3.5 + * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * @作者： JNPF开发平台组 + * @日期： 2024-06-27 + */ +@Data +@TableName("jg_purchase_sale_relation") +public class PurchaseSaleRelationEntity { + @TableId(value ="ID" ) + private String id; + @TableField(value = "PURCHASE_ORDER_ID" , updateStrategy = FieldStrategy.IGNORED) + private String purchaseOrderId; + @TableField(value = "SALE_ORDER_ID" , updateStrategy = FieldStrategy.IGNORED) + private String saleOrderId; + @TableField("F_CREATOR_TIME") + private Date creatorTime; + @TableField("F_CREATOR_USER_ID") + private String creatorUserId; + @TableField("F_LAST_MODIFY_TIME") + private Date lastModifyTime; + @TableField("F_LAST_MODIFY_USER_ID") + private String lastModifyUserId; + @TableField("F_DELETE_TIME") + private Date deleteTime; + @TableField("F_DELETE_USER_ID") + private String deleteUserId; + @TableField("F_DELETE_MARK") + private Integer deleteMark; + @TableField("F_TENANT_ID") + private String tenantId; + @TableField("COMPANY_ID") + private String companyId; + @TableField("DEPARTMENT_ID") + private String departmentId; + @TableField("ORGANIZE_JSON_ID") + private String organizeJsonId; + @TableField("F_FLOW_ID") + private String flowId; +} diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/businessorder/BusinessOrderForm.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/businessorder/BusinessOrderForm.java index 2e8132b3..b0b5c912 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/businessorder/BusinessOrderForm.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/businessorder/BusinessOrderForm.java @@ -115,7 +115,7 @@ public class BusinessOrderForm { private Object businessType; /** 是否转换采购/销售 */ @JsonProperty("isTransferSource") - private Object isTransferSource; + private List isTransferSource; /** YG销售方式 */ @JsonProperty("externalSaleWay") private Object externalSaleWay; diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/purchasesalerelation/PurchaseSaleRelationConstant.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/purchasesalerelation/PurchaseSaleRelationConstant.java new file mode 100644 index 00000000..f48333df --- /dev/null +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/purchasesalerelation/PurchaseSaleRelationConstant.java @@ -0,0 +1,41 @@ +package jnpf.model.purchasesalerelation; + +import jnpf.util.JsonUtil; +import java.util.Map; + +/** + * purchaseSaleRelation配置json + * + * @版本： V3.5 + * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * @作者： JNPF开发平台组 + * @日期： 2024-06-27 + */ +public class PurchaseSaleRelationConstant{ + /** 数据库链接 */ + public static final String DBLINKID = "0"; + /** 表别名 map */ + public static final Map TABLERENAMES = JsonUtil.getJsonToBean("{\"jg_purchase_sale_relation\":\"purchaseSaleRelation\"}",Map.class); + /** 子表model map */ + public static final Map TABLEFIELDKEY = JsonUtil.getJsonToBean("{}",Map.class); + /** 整个表单配置json */ + public static final String getFormData(){ + StringBuilder sb = new StringBuilder(); +sb.append("{\"popupType\":\"general\",\"idGlobal\":102,\"formBtns\":false,\"labelWidth\":100,\"classNames\":[],\"className\":[],\"fullScreenWidth\":\"100%\",\"hasConfirmAndAddBtn\":true,\"labelPosition\":\"right\",\"printId\":\"\",\"disabled\":false,\"formModel\":\"dataForm\",\"cancelButtonText\":\"取 消\",\"confirmButtonText\":\"确 定\",\"hasCancelBtn\":true,\"primaryKeyPolicy\":1,\"confirmAndAddText\":\"确定并继续操作\",\"hasPrintBtn\":false,\"concurrencyLock\":false,\"classJson\":\"\",\"drawerWidth\":\"600px\",\"printButtonText\":\"打 印\",\"formRef\":\"formRef\",\"gutter\":15,\"logicalDelete\":false,\"size\":\"small\",\"formRules\":\"rules\",\"generalWidth\":\"600px\",\"hasConfirmBtn\":true,\"formStyle\":\"\",\"fields\":[{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"采购订单ID\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_purchase_sale_relation\",\"renderKey\":1719483113714,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"purchaseOrderId\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"addonAfter\":\"\",\"__config__\":{\"formId\":102,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"销售订单ID\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_purchase_sale_relation\",\"renderKey\":1719483129686,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"saleOrderId\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"}],\"span\":24}"); return sb.toString(); + } + /** 列表字段配置json */ + public static final String getColumnData(){ + StringBuilder sb = new StringBuilder(); +sb.append("{\"showSummary\":false,\"hasPage\":true,\"searchList\":[],\"treeInterfaceId\":\"\",\"treePropsValue\":\"id\",\"ruleList\":{\"conditionList\":[],\"matchLogic\":\"and\"},\"childTableStyle\":1,\"columnOptions\":[{\"clearable\":true,\"suffixIcon\":\"\",\"fullName\":\"采购订单ID\",\"addonAfter\":\"\",\"__config__\":{\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"采购订单ID\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_purchase_sale_relation\",\"renderKey\":1719483113714,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"purchaseOrderId\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"id\":\"purchaseOrderId\",\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"fullName\":\"销售订单ID\",\"addonAfter\":\"\",\"__config__\":{\"formId\":102,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"销售订单ID\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_purchase_sale_relation\",\"renderKey\":1719483129686,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"saleOrderId\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"id\":\"saleOrderId\",\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"}],\"pageSize\":20,\"treePropsChildren\":\"children\",\"type\":1,\"columnBtnsList\":[{\"icon\":\"icon-ym icon-ym-btn-edit\",\"label\":\"编辑\",\"value\":\"edit\"},{\"icon\":\"icon-ym icon-ym-btn-clearn\",\"label\":\"删除\",\"value\":\"remove\"},{\"icon\":\"icon-ym icon-ym-generator-menu\",\"label\":\"详情\",\"value\":\"detail\"}],\"thousandsField\":[],\"treeTitle\":\"左侧标题\",\"defaultColumnList\":[{\"suffixIcon\":\"\",\"align\":\"left\",\"__config__\":{\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"采购订单ID\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_purchase_sale_relation\",\"renderKey\":1719483113714,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"prop\":\"purchaseOrderId\",\"showWordLimit\":false,\"__vModel__\":\"purchaseOrderId\",\"checked\":true,\"disabled\":false,\"id\":\"purchaseOrderId\",\"placeholder\":\"请输入\",\"addonBefore\":\"\",\"clearable\":true,\"jnpfKey\":\"input\",\"fullName\":\"采购订单ID\",\"label\":\"采购订单ID\",\"sortable\":false,\"addonAfter\":\"\",\"showPassword\":false,\"fixed\":\"none\",\"style\":{\"width\":\"100%\"},\"prefixIcon\":\"\"},{\"suffixIcon\":\"\",\"align\":\"left\",\"__config__\":{\"formId\":102,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"销售订单ID\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_purchase_sale_relation\",\"renderKey\":1719483129686,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"prop\":\"saleOrderId\",\"showWordLimit\":false,\"__vModel__\":\"saleOrderId\",\"checked\":true,\"disabled\":false,\"id\":\"saleOrderId\",\"placeholder\":\"请输入\",\"addonBefore\":\"\",\"clearable\":true,\"jnpfKey\":\"input\",\"fullName\":\"销售订单ID\",\"label\":\"销售订单ID\",\"sortable\":false,\"addonAfter\":\"\",\"showPassword\":false,\"fixed\":\"none\",\"style\":{\"width\":\"100%\"},\"prefixIcon\":\"\"}],\"treeTemplateJson\":[],\"treePropsName\":\"\",\"useColumnPermission\":false,\"treePropsUrl\":\"\",\"treeRelation\":\"\",\"treeSynType\":0,\"btnsList\":[{\"icon\":\"icon-ym icon-ym-btn-add\",\"label\":\"新增\",\"value\":\"add\"}],\"useDataPermission\":false,\"columnList\":[{\"clearable\":true,\"jnpfKey\":\"input\",\"suffixIcon\":\"\",\"fullName\":\"采购订单ID\",\"label\":\"采购订单ID\",\"sortable\":false,\"align\":\"left\",\"addonAfter\":\"\",\"__config__\":{\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"采购订单ID\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_purchase_sale_relation\",\"renderKey\":1719483113714,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"prop\":\"purchaseOrderId\",\"showWordLimit\":false,\"width\":0,\"__vModel__\":\"purchaseOrderId\",\"showPassword\":false,\"fixed\":\"none\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"id\":\"purchaseOrderId\",\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"jnpfKey\":\"input\",\"suffixIcon\":\"\",\"fullName\":\"销售订单ID\",\"label\":\"销售订单ID\",\"sortable\":false,\"align\":\"left\",\"addonAfter\":\"\",\"__config__\":{\"formId\":102,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"销售订单ID\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_purchase_sale_relation\",\"renderKey\":1719483129686,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"prop\":\"saleOrderId\",\"showWordLimit\":false,\"width\":0,\"__vModel__\":\"saleOrderId\",\"showPassword\":false,\"fixed\":\"none\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"id\":\"saleOrderId\",\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"}],\"sort\":\"desc\",\"thousands\":false,\"hasSuperQuery\":true,\"summaryField\":[],\"parentField\":\"\",\"treePropsLabel\":\"fullName\",\"treeDataSource\":\"dictionary\",\"groupField\":\"\",\"printIds\":[],\"uploaderTemplateJson\":{},\"treeDictionary\":\"\",\"hasTreeQuery\":false,\"useFormPermission\":false,\"customBtnsList\":[],\"complexHeaderList\":[],\"useBtnPermission\":false,\"treeInterfaceName\":\"\",\"defaultSidx\":\"\"}"); return sb.toString(); + } + /** app列表字段配置json */ + public static final String getAppColumnData(){ + StringBuilder sb = new StringBuilder(); +sb.append("{\"hasPage\":true,\"useColumnPermission\":false,\"searchList\":[],\"btnsList\":[{\"icon\":\"icon-ym icon-ym-btn-add\",\"label\":\"新增\",\"value\":\"add\"}],\"useDataPermission\":false,\"ruleListApp\":{\"conditionList\":[],\"matchLogic\":\"and\"},\"columnList\":[{\"clearable\":true,\"jnpfKey\":\"input\",\"suffixIcon\":\"\",\"fullName\":\"采购订单ID\",\"label\":\"采购订单ID\",\"sortable\":false,\"align\":\"left\",\"addonAfter\":\"\",\"__config__\":{\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"采购订单ID\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_purchase_sale_relation\",\"renderKey\":1719483113714,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"prop\":\"purchaseOrderId\",\"showWordLimit\":false,\"width\":0,\"__vModel__\":\"purchaseOrderId\",\"showPassword\":false,\"fixed\":\"none\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"id\":\"purchaseOrderId\",\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"jnpfKey\":\"input\",\"suffixIcon\":\"\",\"fullName\":\"销售订单ID\",\"label\":\"销售订单ID\",\"sortable\":false,\"align\":\"left\",\"addonAfter\":\"\",\"__config__\":{\"formId\":102,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"销售订单ID\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_purchase_sale_relation\",\"renderKey\":1719483129686,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"prop\":\"saleOrderId\",\"showWordLimit\":false,\"width\":0,\"__vModel__\":\"saleOrderId\",\"showPassword\":false,\"fixed\":\"none\",\"style\":{\"width\":\"100%\"},\"disabled\":false,\"id\":\"saleOrderId\",\"placeholder\":\"请输入\",\"prefixIcon\":\"\",\"addonBefore\":\"\"}],\"columnOptions\":[{\"clearable\":true,\"suffixIcon\":\"\",\"fullName\":\"采购订单ID\",\"addonAfter\":\"\",\"__config__\":{\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"采购订单ID\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_purchase_sale_relation\",\"renderKey\":1719483113714,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"purchaseOrderId\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"id\":\"purchaseOrderId\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"suffixIcon\":\"\",\"fullName\":\"销售订单ID\",\"addonAfter\":\"\",\"__config__\":{\"formId\":102,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"销售订单ID\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_purchase_sale_relation\",\"renderKey\":1719483129686,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"showWordLimit\":false,\"__vModel__\":\"saleOrderId\",\"showPassword\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"id\":\"saleOrderId\",\"prefixIcon\":\"\",\"addonBefore\":\"\"}],\"pageSize\":20,\"sort\":\"desc\",\"thousands\":false,\"columnBtnsList\":[{\"icon\":\"icon-ym icon-ym-btn-edit\",\"label\":\"编辑\",\"value\":\"edit\"},{\"icon\":\"icon-ym icon-ym-btn-clearn\",\"label\":\"删除\",\"value\":\"remove\"},{\"icon\":\"icon-ym icon-ym-generator-menu\",\"label\":\"详情\",\"value\":\"detail\"}],\"loading\":false,\"hasSuperQuery\":false,\"thousandsField\":[],\"defaultColumnList\":[{\"clearable\":true,\"jnpfKey\":\"input\",\"suffixIcon\":\"\",\"fullName\":\"采购订单ID\",\"label\":\"采购订单ID\",\"sortable\":false,\"align\":\"left\",\"addonAfter\":\"\",\"__config__\":{\"formId\":101,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"采购订单ID\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_purchase_sale_relation\",\"renderKey\":1719483113714,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"prop\":\"purchaseOrderId\",\"showWordLimit\":false,\"__vModel__\":\"purchaseOrderId\",\"showPassword\":false,\"checked\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"id\":\"purchaseOrderId\",\"prefixIcon\":\"\",\"addonBefore\":\"\"},{\"clearable\":true,\"jnpfKey\":\"input\",\"suffixIcon\":\"\",\"fullName\":\"销售订单ID\",\"label\":\"销售订单ID\",\"sortable\":false,\"align\":\"left\",\"addonAfter\":\"\",\"__config__\":{\"formId\":102,\"visibility\":[\"pc\",\"app\"],\"jnpfKey\":\"input\",\"noShow\":false,\"tipLabel\":\"\",\"dragDisabled\":false,\"className\":[],\"label\":\"销售订单ID\",\"trigger\":\"blur\",\"showLabel\":true,\"required\":false,\"tableName\":\"jg_purchase_sale_relation\",\"renderKey\":1719483129686,\"layout\":\"colFormItem\",\"tagIcon\":\"icon-ym icon-ym-generator-input\",\"unique\":false,\"tag\":\"JnpfInput\",\"regList\":[],\"span\":24},\"readonly\":false,\"prop\":\"saleOrderId\",\"showWordLimit\":false,\"__vModel__\":\"saleOrderId\",\"showPassword\":false,\"checked\":false,\"style\":{\"width\":\"100%\"},\"disabled\":false,\"placeholder\":\"请输入\",\"id\":\"saleOrderId\",\"prefixIcon\":\"\",\"addonBefore\":\"\"}],\"sortList\":[],\"useFormPermission\":false,\"customBtnsList\":[],\"useBtnPermission\":false,\"defaultSidx\":\"\"}"); return sb.toString(); + } + /** 表列表 */ + public static final String getTableList(){ + StringBuilder sb = new StringBuilder(); +sb.append("[{\"relationField\":\"\",\"relationTable\":\"\",\"table\":\"jg_purchase_sale_relation\",\"tableName\":\"采购订单转销售订单关系表\",\"tableField\":\"\",\"typeId\":\"1\",\"fields\":[{\"columnName\":\"id\",\"field\":\"id\",\"fieldName\":\"ID\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":1,\"allowNull\":0,\"autoIncrement\":0},{\"columnName\":\"purchase_order_id\",\"field\":\"purchaseOrderId\",\"fieldName\":\"采购订单ID\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"sale_order_id\",\"field\":\"saleOrderId\",\"fieldName\":\"销售订单ID\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_creator_time\",\"field\":\"creatorTime\",\"fieldName\":\"创建时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_creator_user_id\",\"field\":\"creatorUserId\",\"fieldName\":\"创建用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_last_modify_time\",\"field\":\"lastModifyTime\",\"fieldName\":\"修改时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_last_modify_user_id\",\"field\":\"lastModifyUserId\",\"fieldName\":\"修改用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_time\",\"field\":\"deleteTime\",\"fieldName\":\"删除时间\",\"dataType\":\"datetime\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_user_id\",\"field\":\"deleteUserId\",\"fieldName\":\"删除用户\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_delete_mark\",\"field\":\"deleteMark\",\"fieldName\":\"删除标志\",\"dataType\":\"int\",\"dataLength\":\"默认\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"f_tenant_id\",\"field\":\"tenantId\",\"fieldName\":\"租户id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"company_id\",\"field\":\"companyId\",\"fieldName\":\"公司id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"department_id\",\"field\":\"departmentId\",\"fieldName\":\"部门id\",\"dataType\":\"varchar\",\"dataLength\":\"50\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0},{\"columnName\":\"organize_json_id\",\"field\":\"organizeJsonId\",\"fieldName\":\"组织id\",\"dataType\":\"varchar\",\"dataLength\":\"1000\",\"primaryKey\":0,\"allowNull\":1,\"autoIncrement\":0}]}]"); return sb.toString(); + } +} diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/purchasesalerelation/PurchaseSaleRelationForm.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/purchasesalerelation/PurchaseSaleRelationForm.java new file mode 100644 index 00000000..7c01d518 --- /dev/null +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/purchasesalerelation/PurchaseSaleRelationForm.java @@ -0,0 +1,26 @@ +package jnpf.model.purchasesalerelation; + +import lombok.Data; +import java.util.List; +import java.math.BigDecimal; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * purchaseSaleRelation + * @版本： V3.5 + * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * @作者： JNPF开发平台组 + * @日期： 2024-06-27 + */ +@Data +public class PurchaseSaleRelationForm { + /** 主键 */ + private String id; + + /** 采购订单ID **/ + @JsonProperty("purchaseOrderId") + private String purchaseOrderId; + /** 销售订单ID **/ + @JsonProperty("saleOrderId") + private String saleOrderId; +} diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/purchasesalerelation/PurchaseSaleRelationPagination.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/purchasesalerelation/PurchaseSaleRelationPagination.java new file mode 100644 index 00000000..f7d4a28f --- /dev/null +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/purchasesalerelation/PurchaseSaleRelationPagination.java @@ -0,0 +1,30 @@ +package jnpf.model.purchasesalerelation; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; +import jnpf.base.Pagination; +import java.util.List; + +/** + * + * purchaseSaleRelation + * @版本： V3.5 + * @版权： 引迈信息技术有限公司（https://www.jnpfsoft.com） + * @作者： JNPF开发平台组 + * @日期： 2024-06-27 + */ +@Data +public class PurchaseSaleRelationPagination extends Pagination { + /** 查询key */ + private String[] selectKey; + /** json */ + private String json; + /** 数据类型 0-当前页，1-全部数据 */ + private String dataType; + /** 高级查询 */ + private String superQueryJson; + /** 功能id */ + private String moduleId; + /** 菜单id */ + private String menuId; +} diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue index 40b84bc1..9f5ed307 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue @@ -495,23 +495,26 @@ export default { }) return } - if (this.multipleSelectionItem.length > 1) { - this.$message({ - type: 'error', - message: '只能选择一条数据', - duration: 1500, - }) - return - } - const selectData = this.multipleSelectionItem - if (selectData[0].isTransfer == '2') { - this.$message({ - type: 'error', - message: '该订单已经生成过销售订单', - duration: 1500, - }) - return - } + const data = this.multipleSelectionItem + let selectData = [] + selectData = JSON.parse(JSON.stringify(data)) + const firstData = selectData[0] + selectData.forEach((item, index) => { + if (item.saleContractNo !== firstData.saleContractNo) { + this.$message({ + type: 'error', + message: '订单' + item.code + '与订单' + firstData.code + '的销售合同号不一致', + duration: 1500, + }) + } + if (item.isTransfer == '2') { + this.$message({ + type: 'error', + message: '订单' + item.code + '已经生成过销售订单', + duration: 1500, + }) + } + }) selectData.flag = '采购转销售' if (!this.saleFlowList.length) { this.$message({ type: 'error', message: '流程不存在' }); diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue index 700b44e9..af20e0b2 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/form.vue @@ -128,7 +128,7 @@ - - + @@ -87,7 +87,7 @@ export default { }, excludeIdList: [], accountSubjectName: '', - contractCode: '', + contractCodeListList: '', accountState: '', type: '', businessType: '', @@ -95,7 +95,7 @@ export default { } }, methods: { - init(excludeIdList, accountSubjectName, contractCode, accountState, type, businessType) { + init(excludeIdList, accountSubjectName, contractCodeList, accountState, type, businessType) { this.visible = true this.listLoading = true if (excludeIdList && excludeIdList instanceof Array) { @@ -104,8 +104,8 @@ export default { if (accountSubjectName && typeof (accountSubjectName) == 'string') { this.accountSubjectName = accountSubjectName; } - if (contractCode && typeof (contractCode) == 'string') { - this.contractCode = contractCode; + if (contractCodeList && contractCodeList instanceof Array) { + this.contractCodeList = contractCodeList; } if (accountState && typeof (accountState) == 'string') { this.accountState = accountState; @@ -121,7 +121,7 @@ export default { keyword: this.keyword, excludeIdList: this.excludeIdList, accountSubjectName: this.accountSubjectName, - contractCode: this.contractCode, + contractCodeList: this.contractCodeList, accountState: this.accountState, type: this.type, businessType: this.businessType, From 59a4ea924aa461b473ca7801d9f294730cdb3a15 Mon Sep 17 00:00:00 2001 From: vayne Date: Fri, 28 Jun 2024 13:18:39 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/scm/BusinessOrderMapper.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml index ec63e46d..ea1f68b6 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml @@ -451,9 +451,8 @@ i.f_real_name AS realName, i1.f_real_name AS realNameA, b.NAME AS subjectName, - c.CODE AS saleCode, CASE - c.STATUS + m.STATUS when '1' then '待提交' when '2' then '待审核' when '3' then '待锁定' @@ -466,13 +465,12 @@ d.contract_name AS contractName, f.storageNum, j.name as wareHouseName, - k.sale_contract_no as saleContractNo + k.sale_contract_no as saleContractNo, + m.code as saleCode FROM jg_business_order a LEFT JOIN jg_subject_basic b ON a.first_subject_basic_id = b.id AND b.f_delete_mark - IS NULL LEFT JOIN jg_business_order c ON a.correlated_order_id = c.id - AND c.f_delete_mark IS NULL LEFT JOIN jg_contract d ON a.contract_id = d.id AND d.f_delete_mark IS NULL LEFT JOIN jg_business_order_product_relational e ON e.business_order_id = a.id @@ -498,6 +496,8 @@ LEFT JOIN jg_business_line j ON a.delivery_warehouse = j.id AND j.f_delete_mark is null LEFT JOIN jg_voucher k ON a.id = k.business_order_id and k.f_delete_mark is null + LEFT JOIN jg_purchase_sale_relation l ON a.id = l.purchase_order_id + LEFT JOIN jg_business_order m ON l.sale_order_id = m.id AND m.f_delete_mark is null ${ew.customSqlSegment} GROUP BY a.id