From 3fd70cfdecca718402807b682acd2caa0d85d974 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 14 Mar 2023 18:43:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A9=E5=B9=B3=E5=8F=B0=E5=90=8C?= =?UTF-8?q?=E6=AD=A5bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicOrderPrintController.java | 86 +++++++++---------- .../inout/IoCodeTempController.java | 38 +++++--- .../glxp/api/upload/DownloadController.java | 60 +++++++++---- .../com/glxp/api/upload/uploadController.java | 8 +- src/main/resources/application-pro.yml | 2 +- src/main/resources/application.yml | 2 +- 6 files changed, 121 insertions(+), 75 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..bb2dcb7ac 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java @@ -72,20 +72,20 @@ public class BasicOrderPrintController { //校验模板是否正确 @AuthRuleAnnotation("") @PostMapping("/udiwms/pdf/template/inspection/order/file") - public BaseResponse inspectionStockOrderPDFFromTemplateFile(@RequestBody FilterOrderPrintRequest filterOrderPrintRequest){ + public BaseResponse inspectionStockOrderPDFFromTemplateFile(@RequestBody FilterOrderPrintRequest filterOrderPrintRequest) { - SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntityt=systemPDFTemplateRelevanceService.selectModuleldAndAction(filterOrderPrintRequest.getModuleId(),filterOrderPrintRequest.getAction()); - if(systemPDFTemplateRelevanceEntityt!=null){ - SystemPDFTemplateEntity systemPDFTemplateEntity=systemPDFTemplateService.selectById(systemPDFTemplateRelevanceEntityt.getTemplateId()+""); - if (systemPDFTemplateEntity==null){ - return ResultVOUtils.error(999,"所属模板错误！"); - }else{ - return ResultVOUtils.success(systemPDFTemplateEntity.getId()); - } - }else{ - return ResultVOUtils.error(999,"所属模板错误！"); - } + SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntityt = systemPDFTemplateRelevanceService.selectModuleldAndAction(filterOrderPrintRequest.getModuleId(), filterOrderPrintRequest.getAction()); + if (systemPDFTemplateRelevanceEntityt != null) { + SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(systemPDFTemplateRelevanceEntityt.getTemplateId() + ""); + if (systemPDFTemplateEntity == null) { + return ResultVOUtils.error(999, "所属模板错误！"); + } else { + return ResultVOUtils.success(systemPDFTemplateEntity.getId()); + } + } else { + return ResultVOUtils.error(999, "所属模板错误！"); + } } @@ -100,20 +100,20 @@ public class BasicOrderPrintController { 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); @@ -123,43 +123,45 @@ public class BasicOrderPrintController { 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("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", udiProductEntity.getZczbhhzbapzbh() == null ? ' ' : udiProductEntity.getZczbhhzbapzbh()); + 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); @@ -169,7 +171,7 @@ public class BasicOrderPrintController { 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("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 +179,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", udiProductEntity.getZczbhhzbapzbh() == null ? ' ' : udiProductEntity.getZczbhhzbapzbh()); + bizData.put("ylqxzcrbarmc", udiProductEntity.getYlqxzcrbarmc() == null ? ' ' : udiProductEntity.getYlqxzcrbarmc()); list.add(bizData); i++; } @@ -189,8 +191,6 @@ public class BasicOrderPrintController { } - - data.put("data", list); String param = JSON.toJSONString(data); JasperUtils.jasperReport(request, response, param, systemPDFTemplateEntity.getPath(), "pdf"); diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 6e77a5a1f..589d111cf 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -91,6 +91,9 @@ public class IoCodeTempController extends BaseController { InvProductDetailService invProductDetailService; @Resource IoCodeLostService codeLostService; + @Resource + IoOrderDetailBizService orderDetailBizService; + //手持端扫码单据上传调用接口 @AuthRuleAnnotation("") @@ -843,24 +846,39 @@ public class IoCodeTempController extends BaseController { } + //更新供应商 IoCodeTempEntity codeTempEntity = codeTempService.selectById(codeSaveRequest.getId()); - codeTempEntity.setSupId(codeSaveRequest.getSupId()); - if (StrUtil.isNotEmpty(codeTempEntity.getSupId())) { - codeTempEntity.setSupId(codeTempEntity.getSupId()); - codeTempService.updateById(codeTempEntity); + if (StrUtil.isNotEmpty(codeSaveRequest.getMySupId())) { + codeTempEntity.setSupId(codeSaveRequest.getMySupId()); + codeTempService.updateById(codeSaveRequest); } - if (codeTempEntity.getRelId() != null) { - codeTempEntity = codeTempService.selectById(codeTempEntity.getId()); - int reCount = udiCalCountUtil.getActCount(codeTempEntity); - codeTempEntity.setReCount(reCount); - codeTempService.updateById(codeTempEntity); + + + //更新耗材字典 + if (codeSaveRequest.getRelId() != null) { + BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(codeTempEntity.getAction()); BaseResponse baseResponse = checkSupId(bussinessTypeEntity, codeTempEntity, codeTempEntity.getSupId()); if (baseResponse != null) return baseResponse; + + codeTempEntity.setRelId(codeSaveRequest.getRelId()); + int reCount = udiCalCountUtil.getActCount(codeTempEntity); + codeTempEntity.setReCount(reCount); } - codeTempEntity = codeTempService.selectById(codeTempEntity.getId()); IoOrderEntity orderEntity = orderService.findByBillNo(codeTempEntity.getOrderId()); + BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction()); + + if (orderEntity.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL && bussinessTypeEntity.isCheckEnable() && bussinessTypeEntity.isCheckWebNew()) { + String errMsg = ioCheckInoutService.checkCode(codeTempEntity); + if (errMsg != null) { + return ResultVOUtils.error(500, errMsg); + } else + codeTempService.updateById(codeTempEntity); + } else { + codeTempService.updateById(codeTempEntity); + } + ioAddInoutService.genOrderDetailCode(orderEntity, codeTempEntity); return ResultVOUtils.success("绑定成功"); diff --git a/src/main/java/com/glxp/api/upload/DownloadController.java b/src/main/java/com/glxp/api/upload/DownloadController.java index 220f82b49..b66c74bd0 100644 --- a/src/main/java/com/glxp/api/upload/DownloadController.java +++ b/src/main/java/com/glxp/api/upload/DownloadController.java @@ -1,5 +1,6 @@ package com.glxp.api.upload; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @@ -15,29 +16,56 @@ import java.io.OutputStream; @RestController public class DownloadController { + @Value("${file_path}") + private String filePath; + @GetMapping(value = "/udiwms/image/register/file/getImage") public void getImage(HttpServletResponse response , @RequestParam String type , @RequestParam String name) throws IOException { - OutputStream os = null; - try { - // 读取图片 - BufferedImage image = ImageIO.read( - new FileInputStream(new File("d:/1s/udiwms/register/file/" + type + "/" + name))); - response.setContentType("image/png"); - os = response.getOutputStream(); - if (image != null) { - ImageIO.write(image, "png", os); + if (name.endsWith("pdf") || name.endsWith("doc")) { + OutputStream os = null; + try { + FileInputStream input = new FileInputStream(new File(filePath + "/register/file/" + type + "/" + name)); + OutputStream out = response.getOutputStream(); + byte[] b = new byte[2048]; + int len; + while ((len = input.read(b)) != -1) { + out.write(b, 0, len); + } + input.close(); + } catch (IOException e) { + + } finally { + if (os != null) { + os.flush(); + os.close(); + } } - } catch (IOException e) { - e.printStackTrace(); - } finally { - if (os != null) { - os.flush(); - os.close(); + } else { + OutputStream os = null; + try { + // 读取图片 + BufferedImage image = ImageIO.read( + new FileInputStream(new File(filePath + "/register/file/" + type + "/" + name))); + response.setContentType("image/png"); + os = response.getOutputStream(); + + if (image != null) { + ImageIO.write(image, "png", os); + } + } catch (IOException e) { + e.printStackTrace(); + } finally { + if (os != null) { + os.flush(); + os.close(); + } } } + + } @GetMapping(value = "/udiwms/donwload/file") @@ -63,4 +91,4 @@ public class DownloadController { } } -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/upload/uploadController.java b/src/main/java/com/glxp/api/upload/uploadController.java index a61ab36fb..676c9388f 100644 --- a/src/main/java/com/glxp/api/upload/uploadController.java +++ b/src/main/java/com/glxp/api/upload/uploadController.java @@ -112,11 +112,11 @@ public class uploadController { String fileName = file.getOriginalFilename(); String fileType = fileName.substring(fileName.lastIndexOf(".")); // 文件类型判断 - if (StringUtils.isBlank(fileType) || !fileType.equals(".jpg") && !fileType.equals(".png")) { - return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传文件只能是 .jpg,.png 格式"); + if (StringUtils.isBlank(fileType) || (!fileType.equals(".jpg") && !fileType.equals(".png") && !fileType.equals(".doc") && !fileType.equals(".pdf"))) { + return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传文件只能是 jpg,png,doc,pdf 格式"); } String newName = UUID.randomUUID() + fileType;//生成新文件名 - String savePath = "d:/1s/udiwms/register/file/" + type; + String savePath = filePath + "/register/" + type; File file1 = new File(savePath); if (!file1.exists()) {// 判断目录是否存在 @@ -135,4 +135,4 @@ public class uploadController { } return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传失败"); } -} \ No newline at end of file +} diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml index c2300674a..655c37d57 100644 --- a/src/main/resources/application-pro.yml +++ b/src/main/resources/application-pro.yml @@ -3,7 +3,7 @@ server: spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - jdbc-url: jdbc:mysql://192.168.0.66:3364/udi_wms_glxp?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root password: Glxp@6066 hikari: diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 833ca2c7f..afaae9e7a 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: pro + active: dev jmx: enabled: true