#
18516761980
2022-07-28 19054a376b84d4aafa9d4f0a9460a9c547e48ec7
#
2个文件已修改
31 ■■■■■ 已修改文件
src/main/java/com/slcf/dao/WaitPakOutDao.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/slcf/filter/UpdateThread.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/slcf/dao/WaitPakOutDao.java
@@ -127,7 +127,7 @@
     * 查询最早一笔待打印标签数据,action=2单独打印模式,prnstatus=1需求打印状态
     * @return
     */
    @Select("select top 1 * from cust_wait_pakout where status='Y' and io_status='N' and action=2 and prnstatus=1 order by io_status desc,modi_time asc")
    @Select("select top 1 * from cust_wait_pakout where status='Y' and io_status='N' and action=2 and (prnstatus=1 or prnstatus=3) order by io_status desc,modi_time asc")
    public WaitPakOutBean getWaitPakOutPrint();
    /**
src/main/java/com/slcf/filter/UpdateThread.java
@@ -8,6 +8,7 @@
import java.net.URL;
import java.util.Date;
import java.util.HashMap;
import java.util.concurrent.TimeUnit;
import javax.annotation.Resource;
@@ -71,12 +72,16 @@
    public void setWaitPakOutService(WaitPakOutService waitPakOutService) {
        this.waitPakOutService = waitPakOutService;
    }
    public static boolean updateFlag = true;
    public void run() {
        waitPakInService = getWaitPakInService();
        waitPakOutService = getWaitPakOutService();
        while(true) {
            try {
                if(!updateFlag) return;
                updateFlag = false;
                updateWaitPakInData(); // 入库
                sendPickPrintCmd(); // 打印
                updateWaitPakOutData(); // 出库
@@ -86,6 +91,8 @@
                Thread.sleep(15000);
            } catch (InterruptedException e) {
                e.printStackTrace();
            } finally {
                updateFlag = true;
            }
        }
    }
@@ -104,6 +111,7 @@
            s = new HttpHandler.Builder()
                    .setUri(url)
                    .setJson(body.toString())
                    .setTimeout(10, TimeUnit.SECONDS)
                    .setHeaders(requestHeader)
                    .build()
                    .doPost();
@@ -326,6 +334,21 @@
////            System.out.println(e.getMessage());
//        }
        return result;
    }
    /**
     * 处理出库通知档数据
     */
    private void updateWaitPakOutData1() {
        try {
//            logger.info("waitOut:" + count++);
            WaitPakOutBean waitPakOutBean = waitPakOutService.queryWaitPakOutFnh();
            if(waitPakOutBean!=null) {
            }
        }catch(Exception e) {
            logger.error("SAP Error updateWaitPakOutData---" + e.getMessage());
        }
    }
    /**
@@ -632,7 +655,7 @@
//        }
        try {
//            logger.error("sendPrinCommand2-----开始调用打印接口" + waitPakOut.getMaktx());
            logger.error("sendPrinCommand2-----开始调用打印接口" + waitPakOut.getMatnr() + "--" + waitPakOut.getMaktx());
            JSONObject jsObj = new JSONObject();
            JSONArray arr = new JSONArray();
            for(int i=0;i<1;i++) {
@@ -700,14 +723,16 @@
//                }
////                System.out.println(sb.toString());
//                JSONObject json = JSONObject.fromObject(sb.toString());
                logger.error("sendPrinCommand4-----调用打印接口" + waitPakOut.getTanum() + "==" + waitPakOut.getMatnr() + "==" + waitPakOut.getMaktx());
                JSONObject json = requestSAP(jsObj, httpUrl);
                String d = json.get("d").toString();
                JSONObject jsonD = JSONObject.fromObject(d);
                String Item = jsonD.get("item").toString();
                JSONObject jsonItem = JSONObject.fromObject(Item);
                String results = jsonItem.get("results").toString();
                JSONArray array = JSONArray.fromObject(results);
                logger.error("sendPrinCommand4-----调用打印接口" + waitPakOut.getMaktx());
                if(array.size()>0) {
                    for(int i=0;i<array.size();i++){
                        JSONObject job = array.getJSONObject(i);