diff --git a/src/main/java/com/gaotao/modules/pda/service/impl/DumpServiceImpl.java b/src/main/java/com/gaotao/modules/pda/service/impl/DumpServiceImpl.java index 6b67225..9d1035b 100644 --- a/src/main/java/com/gaotao/modules/pda/service/impl/DumpServiceImpl.java +++ b/src/main/java/com/gaotao/modules/pda/service/impl/DumpServiceImpl.java @@ -74,6 +74,19 @@ public class DumpServiceImpl implements DumpService { return responseData; } + + + //判断状态是否可以接收 + String status = rollInfo.getStatus_DB(); + + //判断发料状态还是退料状态 + if(("0".equals(send_back)&&"I".equals(status))||"1".equals(send_back)&&"S".equals(status)){ + logger.info("卷状态通过检查!卷号为："+rollNo+"状态为："+status); + }else{ + responseData.setCode("1"); + responseData.setMsg("当前卷无法接收，请检查卷状态!"); + return responseData; + } // todo 判断当前卷号的入库日期是否在指定范围内 2021-9-14 sxm if ("0".equals(send_back)) { RollInfo rollPart = new RollInfo(); @@ -91,18 +104,6 @@ public class DumpServiceImpl implements DumpService { } } } - - //判断状态是否可以接收 - String status = rollInfo.getStatus_DB(); - - //判断发料状态还是退料状态 - if(("0".equals(send_back)&&"I".equals(status))||"1".equals(send_back)&&"S".equals(status)){ - logger.info("卷状态通过检查!卷号为："+rollNo+"状态为："+status); - }else{ - responseData.setCode("1"); - responseData.setMsg("当前卷无法接收，请检查卷状态!"); - return responseData; - } //抽取公共的参数 String site = rollInfo.getSite(); String partNo = rollInfo.getPartNo(); diff --git a/src/main/java/com/gaotao/modules/print/controller/PrintController.java b/src/main/java/com/gaotao/modules/print/controller/PrintController.java index f005835..85c8bae 100644 --- a/src/main/java/com/gaotao/modules/print/controller/PrintController.java +++ b/src/main/java/com/gaotao/modules/print/controller/PrintController.java @@ -7,12 +7,15 @@ import com.gaotao.modules.print.service.PrintService; import org.apache.commons.lang3.StringUtils; import org.apache.tomcat.util.net.openssl.ciphers.Authentication; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpSession; +import java.util.HashMap; import java.util.List; +import java.util.Map; @Controller @@ -22,6 +25,9 @@ public class PrintController { @Autowired private PrintService printService; + @Value("${clodp.printUrl}") + private String printUrl; + /** * @Author sxm * @Description 转储订单 标签打印 @@ -35,6 +41,7 @@ public class PrintController { // session.setAttribute("dumpPrintList",crt00000018); List dumpPrintList = (List)session.getAttribute("dumpPrintList"); model.addAttribute("dumpPrintList", JSONObject.toJSONString(dumpPrintList)); + session.setAttribute("printIp",printUrl); return "print/dump_order"; } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index b8d6777..637b169 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -72,6 +72,9 @@ logging: com.gaotao.modules: debug org.springframework.jdbc.core.JdbcTemplate: DEBUG +clodp: + printUrl: 192.168.1.150 + gaotao: redis: open: false diff --git a/src/main/resources/static/pda/js/dump/dump_page.js b/src/main/resources/static/pda/js/dump/dump_page.js index 56628ce..17f876b 100644 --- a/src/main/resources/static/pda/js/dump/dump_page.js +++ b/src/main/resources/static/pda/js/dump/dump_page.js @@ -121,7 +121,6 @@ function getRollNos(partNo, nums) { // 结束扫描 function endScan() { - // 判断是否已经开启扫描 var flag = $("#flag").val(); if (flag == 'Y') { diff --git a/src/main/resources/templates/print/base.ftl b/src/main/resources/templates/print/base.ftl index 0a2551a..922e43e 100644 --- a/src/main/resources/templates/print/base.ftl +++ b/src/main/resources/templates/print/base.ftl @@ -3,7 +3,7 @@ - + @@ -16,8 +16,8 @@ //LODOP.SET_LICENSES("","13F0BF6589BB32E960918E33F9C109A1","",""); LODOP.SET_LICENSES("","7B5624CC84E599D6B17F27DF40F4310C","",""); lodopReady && lodopReady(); - //LODOP.PREVIEW(); - LODOP.PRINT(); + LODOP.PREVIEW(); + // LODOP.PRINT(); // LODOP.PRINT_DESIGN(); window.On_CLodop_Opened=null; }; diff --git a/src/test/java/com/gaotao/service/DateTimeTest.java b/src/test/java/com/gaotao/service/DateTimeTest.java new file mode 100644 index 0000000..68674dc --- /dev/null +++ b/src/test/java/com/gaotao/service/DateTimeTest.java @@ -0,0 +1,25 @@ +package com.gaotao.service; + +import cn.hutool.core.date.DateTime; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import java.util.List; + +/** + * @CLASSNAME DateTimeTest + * @AUTHOR sxm + * @DESCRIPTION + * @DATE 2022/4/24 8:46 + * @VERSION 1.0 + **/ +@RunWith(SpringRunner.class) +@SpringBootTest +public class DateTimeTest { + + + + +}