Merge branch 'master' of http://47.97.1.152:5880/r/kls-asrs

18516761980

2022-07-28 eee9f10932e0f0faefb97471119c1796628055ca

 src/main/java/com/slcf/filter/UpdateThread.java

@@ -457,9 +457,9 @@
            json.put("arbpl","A01-01");
            arr.add(json);
         }
         int action = 3;
         if(waitPakOut.getAction()==1 && waitPakOut.getPrnstatus()==2) {
            action = 1;
         int action = 1;
         if (waitPakOut.getAction() == 3){
            action = waitPakOut.getAction();
         }
         jsObj.put("trart", Integer.toString(action));
         jsObj.put("item", arr);