From a1c70d91dc5263fcd3fad108baf1223097aa3887 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Wed, 15 Mar 2023 14:23:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E8=87=AA=E5=8A=A9=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicOrderPrintController.java | 74 ++++++++++--------- .../purchase/SupCertController.java | 2 +- .../purchase/SupCertSetController.java | 2 + .../req/purchase/FilterCertSetsRequest.java | 3 +- .../mybatis/mapper/basic/UdiRlSupDao.xml | 2 +- .../mybatis/mapper/purchase/SupCertSetDao.xml | 3 + 6 files changed, 47 insertions(+), 39 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java index 18d3df725..2969f74ae 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java @@ -94,26 +94,27 @@ public class BasicOrderPrintController { @PostMapping("/udiwms/pdf/template/order/file") public void printSupCertProduction(@RequestBody FilterOrderPrintRequest filterOrderPrintRequest, HttpServletRequest request, HttpServletResponse response) throws Exception { SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(filterOrderPrintRequest.getTemplateId()); + SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntityt = systemPDFTemplateRelevanceService.selectModuleldAndAction(filterOrderPrintRequest.getModuleId(), filterOrderPrintRequest.getAction()); //打印单号标签 Map data = new HashMap<>(1); List list = new ArrayList<>(); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");//定义新的日期格式 //查询打印格式 - BasicBussinessTypeEntity basicBussinessTypeEntity=basicBussinessTypeService.findByAction(filterOrderPrintRequest.getAction()); + BasicBussinessTypeEntity basicBussinessTypeEntity = basicBussinessTypeService.findByAction(filterOrderPrintRequest.getAction()); //根据批次号打印 - if(basicBussinessTypeEntity.getOrderVisibleType()==0){ + if (basicBussinessTypeEntity.getOrderVisibleType() == 0) { //查询单据表 - FilterOrderRequest filterOrderRequest=new FilterOrderRequest(); + FilterOrderRequest filterOrderRequest = new FilterOrderRequest(); filterOrderRequest.setBillNo(filterOrderPrintRequest.getOrderIdFk()); - IoOrderResponse ioOrderResponse= ioOrderService.filterList(filterOrderRequest).get(0); + IoOrderResponse ioOrderResponse = ioOrderService.filterList(filterOrderRequest).get(0); //查询业务单详情 - List ioOrderDetailBizEntityList=ioOrderDetailBizService.findByOrderId(filterOrderPrintRequest.getOrderIdFk()); + List ioOrderDetailBizEntityList = ioOrderDetailBizService.findByOrderId(filterOrderPrintRequest.getOrderIdFk()); int i = 1; if (ioOrderDetailBizEntityList != null && ioOrderDetailBizEntityList.size() > 0) { for (IoOrderDetailBizEntity obj : ioOrderDetailBizEntityList) { //查询产品表 - UdiProductEntity udiProductEntity=udiProductService.findByUuid(obj.getUuidFk()); + UdiProductEntity udiProductEntity = udiProductService.findByUuid(obj.getUuidFk()); //组装数据 Map bizData = new HashMap<>(); bizData.put("index", i); @@ -121,45 +122,48 @@ public class BasicOrderPrintController { bizData.put("locInv", ioOrderResponse.getInvName() == null ? ' ' : ioOrderResponse.getInvName()); bizData.put("billNo", ioOrderResponse.getBillNo() == null ? ' ' : ioOrderResponse.getBillNo()); bizData.put("billdate", formatter.format(ioOrderResponse.getCreateTime())); - bizData.put("remark1", obj.getRemark1() == null ? ' ' : obj.getRemark1()); - bizData.put("remark2", obj.getRemark2() == null ? ' ' : obj.getRemark2()); -// bizData.put("productName", udiProductEntity.getCpms() == null ? ' ' : udiProductEntity.getCpms()); + bizData.put("remark1", systemPDFTemplateRelevanceEntityt.getRemark1() == null ? ' ' : systemPDFTemplateRelevanceEntityt.getRemark1()); + bizData.put("remark2", systemPDFTemplateRelevanceEntityt.getRemark2() == null ? ' ' : systemPDFTemplateRelevanceEntityt.getRemark2()); + bizData.put("productName", udiProductEntity.getCpms() == null ? ' ' : udiProductEntity.getCpms()); bizData.put("spmc", obj.getCoName() == null ? ' ' : obj.getCoName()); bizData.put("spec", obj.getSpec() == null ? ' ' : obj.getSpec()); bizData.put("count", obj.getCount()); bizData.put("measname", obj.getMeasname() == null ? ' ' : obj.getMeasname()); bizData.put("price", obj.getPrice() == null ? '0' : obj.getPrice()); bizData.put("batchNo", obj.getBatchNo() == null ? ' ' : obj.getBatchNo()); -// bizData.put("serialNo", udiProductEntity.getSerialNo() == null ? ' ' : udiProductEntity.getSerialNo()); - bizData.put("productDate",obj.getProductDate()); - bizData.put("expireDate", obj.getExpireDate()); - bizData.put("manufactor", obj.getManufacturer()); -// bizData.put("zczbhhzbapzbh",udiProductEntity.getZczbhhzbapzbh() == null ? ' ' : udiProductEntity.getZczbhhzbapzbh()); -// bizData.put("ylqxzcrbarmc", udiProductEntity.getYlqxzcrbarmc() == null ? ' ' : udiProductEntity.getYlqxzcrbarmc()); + bizData.put("serialNo", udiProductEntity.getSerialNo() == null ? ' ' : udiProductEntity.getSerialNo()); + bizData.put("productDate", obj.getProductDate()); + bizData.put("expireDate", obj.getExpireDate()); + bizData.put("manufactor", obj.getManufacturer()); + bizData.put("zczbhhzbapzbh", obj.getCertCode() == null ? ' ' : obj.getCertCode()); + bizData.put("ylqxzcrbarmc", udiProductEntity.getYlqxzcrbarmc() == null ? ' ' : udiProductEntity.getYlqxzcrbarmc()); list.add(bizData); i++; } } - }else{ + } else { //查询单据表 - FilterOrderRequest filterOrderRequest=new FilterOrderRequest(); + FilterOrderRequest filterOrderRequest = new FilterOrderRequest(); filterOrderRequest.setBillNo(filterOrderPrintRequest.getOrderIdFk()); - IoOrderResponse ioOrderResponse= ioOrderService.filterList(filterOrderRequest).get(0); + IoOrderResponse ioOrderResponse = ioOrderService.filterList(filterOrderRequest).get(0); //查询扫码单详情 - List ioCodeEntityList=ioCodeService.findByOrderId(filterOrderPrintRequest.getOrderIdFk()); + List ioCodeEntityList = ioCodeService.findByOrderId(filterOrderPrintRequest.getOrderIdFk()); //查询业务单据表 - List ioOrderDetailBizEntityList=ioOrderDetailBizService.findByOrderId(filterOrderPrintRequest.getOrderIdFk()); + List ioOrderDetailBizEntityList = ioOrderDetailBizService.findByOrderId(filterOrderPrintRequest.getOrderIdFk()); int i = 1; if (ioCodeEntityList != null && ioCodeEntityList.size() > 0) { - IoOrderDetailBizEntity ioOrderDetailBizEntity=new IoOrderDetailBizEntity(); + IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity(); for (IoCodeEntity obj : ioCodeEntityList) { //查询业务表 - for(IoOrderDetailBizEntity ioObj:ioOrderDetailBizEntityList){ - if(ioObj.getBatchNo().equals(obj.getBatchNo()) && ioObj.getBindRlFk().equals(obj.getRelId())){ - ioOrderDetailBizEntity=ioObj; + for (IoOrderDetailBizEntity ioObj : ioOrderDetailBizEntityList) { + if (ioObj.getBatchNo().equals(obj.getBatchNo()) && ioObj.getBindRlFk().equals(obj.getRelId())) { + ioOrderDetailBizEntity = ioObj; break; } - } + } + //查询产品表 + UdiProductEntity udiProductEntity = udiProductService.findByUuid(ioOrderDetailBizEntity.getUuidFk()); + //组装数据 Map bizData = new HashMap<>(); bizData.put("index", i); @@ -167,9 +171,9 @@ public class BasicOrderPrintController { bizData.put("locInv", ioOrderResponse.getInvName() == null ? ' ' : ioOrderResponse.getInvName()); bizData.put("billNo", ioOrderResponse.getBillNo() == null ? ' ' : ioOrderResponse.getBillNo()); bizData.put("billdate", formatter.format(ioOrderResponse.getCreateTime())); - bizData.put("remark1", ioOrderDetailBizEntity.getRemark1() == null ? ' ' : ioOrderDetailBizEntity.getRemark1()); - bizData.put("remark2", ioOrderDetailBizEntity.getRemark2() == null ? ' ' : ioOrderDetailBizEntity.getRemark2()); -// bizData.put("productName", udiProductEntity.getCpms() == null ? ' ' : udiProductEntity.getCpms()); + bizData.put("remark1", systemPDFTemplateRelevanceEntityt.getRemark1() == null ? ' ' : systemPDFTemplateRelevanceEntityt.getRemark1()); + bizData.put("remark2", systemPDFTemplateRelevanceEntityt.getRemark2() == null ? ' ' : systemPDFTemplateRelevanceEntityt.getRemark2()); + bizData.put("productName", udiProductEntity.getCpms() == null ? ' ' : udiProductEntity.getCpms()); bizData.put("spmc", ioOrderDetailBizEntity.getCoName() == null ? ' ' : ioOrderDetailBizEntity.getCoName()); bizData.put("spec", ioOrderDetailBizEntity.getSpec() == null ? ' ' : ioOrderDetailBizEntity.getSpec()); bizData.put("count", ioOrderDetailBizEntity.getCount()); @@ -177,11 +181,11 @@ public class BasicOrderPrintController { bizData.put("price", ioOrderDetailBizEntity.getPrice() == null ? '0' : ioOrderDetailBizEntity.getPrice()); bizData.put("batchNo", ioOrderDetailBizEntity.getBatchNo() == null ? ' ' : ioOrderDetailBizEntity.getBatchNo()); bizData.put("serialNo", obj.getSerialNo() == null ? ' ' : obj.getSerialNo()); - bizData.put("productDate",ioOrderDetailBizEntity.getProductDate()); - bizData.put("expireDate", ioOrderDetailBizEntity.getExpireDate()); - bizData.put("manufactor", ioOrderDetailBizEntity.getManufacturer()); -// bizData.put("zczbhhzbapzbh",udiProductEntity.getZczbhhzbapzbh() == null ? ' ' : udiProductEntity.getZczbhhzbapzbh()); -// bizData.put("ylqxzcrbarmc", udiProductEntity.getYlqxzcrbarmc() == null ? ' ' : udiProductEntity.getYlqxzcrbarmc()); + bizData.put("productDate", ioOrderDetailBizEntity.getProductDate()); + bizData.put("expireDate", ioOrderDetailBizEntity.getExpireDate()); + bizData.put("manufactor", ioOrderDetailBizEntity.getManufacturer()); + bizData.put("zczbhhzbapzbh", ioOrderDetailBizEntity.getCertCode() == null ? ' ' : ioOrderDetailBizEntity.getCertCode()); + bizData.put("ylqxzcrbarmc", udiProductEntity.getYlqxzcrbarmc() == null ? ' ' : udiProductEntity.getYlqxzcrbarmc()); list.add(bizData); i++; } @@ -189,11 +193,9 @@ public class BasicOrderPrintController { } - - data.put("data", list); String param = JSON.toJSONString(data); JasperUtils.jasperReport(request, response, param, systemPDFTemplateEntity.getPath(), "pdf"); } -} +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java index e23129e02..e29cd3263 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java @@ -104,7 +104,7 @@ public class SupCertController { supCertEntity.setCustomerId(customerId); supCertEntity.setType(postSelCertRequest.getCertType()); supCertEntity.setCreateTime(new Date()); - supCertEntity.setStatus(supCertSetEntity.isNeed()==true ? 0:1); + supCertEntity.setStatus(0); supCertEntity.setAuditStatus(ConstantStatus.AUDIT_DRAFT); supCertEntity.setUpdateTime(new Date()); boolean b = supCertService.insertCompanyCert(supCertEntity); diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCertSetController.java b/src/main/java/com/glxp/api/controller/purchase/SupCertSetController.java index 3e38a53a3..dc0d134fd 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCertSetController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCertSetController.java @@ -86,6 +86,8 @@ public class SupCertSetController { FilterCertSetsRequest filterCertSetsRequest=new FilterCertSetsRequest(); filterCertSetsRequest.setType(supCertSetEntity.getType()); filterCertSetsRequest.setName(supCertSetEntity.getName()); + filterCertSetsRequest.setId(supCertSetEntity.getId()); + filterCertSetsRequest.setUpdateType(1); List supCertEntityList = supCertSetService.filterCertSets(filterCertSetsRequest); if(supCertEntityList.size()!=0){ return ResultVOUtils.error(999,"证书已存在!"); diff --git a/src/main/java/com/glxp/api/req/purchase/FilterCertSetsRequest.java b/src/main/java/com/glxp/api/req/purchase/FilterCertSetsRequest.java index 5a1e558bb..bb8c32f31 100644 --- a/src/main/java/com/glxp/api/req/purchase/FilterCertSetsRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/FilterCertSetsRequest.java @@ -7,10 +7,11 @@ import lombok.Data; @Data public class FilterCertSetsRequest extends ListPageRequest { + private Integer id; private String name; private Integer type; private Integer need; - + private Integer updateType; private String lastUpdateTime; diff --git a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml index 72089f6c5..456ad129e 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml @@ -95,7 +95,7 @@ basic_products.basicPrductRemak7, basic_products.basicPrductRemak8, basic_corp.name companyName, - company_product_relevance.price + basic_products.price FROM company_product_relevance inner JOIN basic_udirel ON company_product_relevance.udiRlIdFk = basic_udirel.id diff --git a/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml b/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml index 86803735c..0a2cb1a1b 100644 --- a/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml @@ -16,6 +16,9 @@ and `need` = #{need} + + and id != #{id} + = DATE_FORMAT(#{lastUpdateTime}, '%Y-%m-%d %H:%i:%S') ]]>