切换分支备份

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.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * @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<String, Object> data = new HashMap<>(1);
+        List<Object> list = new ArrayList<>();
+        Map<String, Object> supData = new HashMap<>();
+        supData.put("title", "拆零上货");
+        supData.put("qrCode", "{\"DMHotskey\":{\"fifoSplit\": 1}}");
+
+        Map<String, Object> 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, "模板错误");
+    }
+
 
 }

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);
             }

src/main/java/com/glxp/api/controller/inout/IoOrderController.java

@@ -198,7 +198,6 @@ public class IoOrderController extends BaseController {
             }
             ioOrderResponse = orderInvoiceService.findRegStausByBillNo(ioOrderResponse);
         }
-
         PageInfo<IoOrderResponse> 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<IoOrderEntity> list = orderService.filterOrderTrace(billNo,productType);
+        List<IoOrderEntity> list = orderService.filterOrderTrace(billNo, productType);
         List<IoOrderResponse> responses = orderService.findResponse(list);
         return ResultVOUtils.success(responses);
     }

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;
+
+}