From fda2478831d7c40198b5bc2fe27f13fcd266d2e5 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 14 Aug 2024 15:26:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=88=86=E6=94=AF=E5=A4=87?= =?UTF-8?q?=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/SysWorkplaceController.java | 48 +++++++++++++++++-- .../inout/IoCodeTempController.java | 2 + .../controller/inout/IoOrderController.java | 13 +++-- .../api/req/system/PrintLabelRequest.java | 9 ++++ 4 files changed, 61 insertions(+), 11 deletions(-) create mode 100644 src/main/java/com/glxp/api/req/system/PrintLabelRequest.java diff --git a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java index 34fb9b88b..f4bc1cbcc 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java @@ -16,6 +16,7 @@ import com.glxp.api.entity.system.SystemPDFTemplateEntity; import com.glxp.api.exception.JsonException; import com.glxp.api.req.auth.SysWorkplaceRequest; import com.glxp.api.req.dev.DeviceInfoDetailQuery; +import com.glxp.api.req.system.PrintLabelRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.auth.SysWorkplaceService; import com.glxp.api.service.system.SystemPDFModuleService; @@ -31,10 +32,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @author : zhuzhu @@ -141,5 +139,47 @@ public class SysWorkplaceController extends BaseController { return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误"); } +/** + * {"DMHotskey":{"workPlace": 60011001}} + * {"DMHotskey":{"splitBusType": "SC72197936495755"}} + */ + + /** + * 打印拆零标签 + */ + @AuthRuleAnnotation("") + @PostMapping("/udiwms/split/label/print") + public BaseResponse printSplitLabel(@RequestBody PrintLabelRequest printLabelRequest, HttpServletRequest request, HttpServletResponse response) throws Exception { + + SysPdfTemplateRelevanceLabelEntity sysPdfTemplateRelevanceLabelEntity = systemPDFModuleService.selectByLabelId(printLabelRequest.getLabelId() + ""); + if (null == sysPdfTemplateRelevanceLabelEntity) { + return ResultVOUtils.error(ResultEnum.DATA_NOT, "所属模块错误"); + } + + SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(String.valueOf(sysPdfTemplateRelevanceLabelEntity.getTemplateId())); + if (null == systemPDFTemplateEntity) { + return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误"); + } + //打印单号标签 + Map data = new HashMap<>(1); + List list = new ArrayList<>(); + Map supData = new HashMap<>(); + supData.put("title", "拆零上货"); + supData.put("qrCode", "{\"DMHotskey\":{\"fifoSplit\": 1}}"); + + Map supData2 = new HashMap<>(); + supData2.put("title", "整取上货"); + supData2.put("qrCode", "{\"DMHotskey\":{\"fifoSplit\": 2}}"); + + list.add(supData); + list.add(supData2); + data.put("data", list); + String param = JSON.toJSONString(data); + log.error(param); + JasperUtils.jasperReport(request, response, param, filePath + "pdf/template/" + systemPDFTemplateEntity.getPath(), "pdf"); + + return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误"); + } + } 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 b3b356427..7bd7e564e 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -709,6 +709,7 @@ public class IoCodeTempController extends BaseController { codeEnttity.setInvCode(addOrderRequest.getInvCode()); codeEnttity.setWarehouseCode(addOrderRequest.getCurSpaceCode()); codeEnttity.setPreSpaceCode(addOrderRequest.getPreCurSpaceCode()); + codeEnttity.setProductType(1); codeEnttity.setPreInSpaceCode(addOrderRequest.getCheckPreInSpaceCode()); codeEnttity.setRelId(addOrderRequest.getRelId()); codeEnttity.setFifoSplit(addOrderRequest.getFifoSplit()); @@ -791,6 +792,7 @@ public class IoCodeTempController extends BaseController { orderEntity.setBusType(bussinessTypeEntity.getBusType()); orderEntity.setSickerAdNum(addOrderRequest.getSickerAdNum()); orderEntity.setWorkPlaceCode(addOrderRequest.getWorkPlaceCode()); + orderEntity.setProductType(1); orderEntity.setFifoSplit(addOrderRequest.getFifoSplit()); orderService.insertOrder(orderEntity); } diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index 49bc20b09..613515d97 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -198,7 +198,6 @@ public class IoOrderController extends BaseController { } ioOrderResponse = orderInvoiceService.findRegStausByBillNo(ioOrderResponse); } - PageInfo pageInfo = new PageInfo<>(list); return ResultVOUtils.page(pageInfo); } @@ -344,10 +343,10 @@ public class IoOrderController extends BaseController { orderEntity.setDeptCode(addOrderRequest.getDeptCode()); orderEntity.setBillNo(addOrderRequest.getBillNo()); orderEntity.setInvCode(addOrderRequest.getInvCode()); - if (addOrderRequest.getProductType() == null){ + if (addOrderRequest.getProductType() == null) { //器械单据 orderEntity.setProductType(1); - }else { + } else { //药品单据 orderEntity.setProductType(addOrderRequest.getProductType()); } @@ -678,7 +677,7 @@ public class IoOrderController extends BaseController { } } UdiProductEntity drug = udiProductDao.findByNameCode(codeTempEntity.getNameCode()); - if (drug.getProductsType() == 2){ + if (drug.getProductsType() == 2) { //药品添加药品数据 codeTempEntity.setBzgg(drug.getBzgg()); codeTempEntity.setPrepnUnit(drug.getPrepnUnit()); @@ -972,15 +971,15 @@ public class IoOrderController extends BaseController { * @return */ @GetMapping("udiwms/inout/order/filterOrderTrace") - public BaseResponse filterOrderTrace(String billNo,Integer productType) { + public BaseResponse filterOrderTrace(String billNo, Integer productType) { if (StrUtil.isBlank(billNo)) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } - if (productType == null){ + if (productType == null) { productType = 1; } //只用于单据维护 加了状态判断了 - List list = orderService.filterOrderTrace(billNo,productType); + List list = orderService.filterOrderTrace(billNo, productType); List responses = orderService.findResponse(list); return ResultVOUtils.success(responses); } diff --git a/src/main/java/com/glxp/api/req/system/PrintLabelRequest.java b/src/main/java/com/glxp/api/req/system/PrintLabelRequest.java new file mode 100644 index 000000000..f4cfc0243 --- /dev/null +++ b/src/main/java/com/glxp/api/req/system/PrintLabelRequest.java @@ -0,0 +1,9 @@ +package com.glxp.api.req.system; + +import lombok.Data; + +@Data +public class PrintLabelRequest { + private String labelId; + +}