修改

src/main/java/com/steerinfo/dil/service/impl/TmstruckWeightResultServiceImpl.java

@@ -805,19 +805,19 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
                 logger.info("=========" + "计量检查" + format.format(new Date()));
                 logger.info(jsonObject.toString());
                 logger.info("=========" + "计量检查" + format.format(new Date()));
-                //try{
-                //    new Thread( new Runnable() {
-                //        public void run(){
-                //            try {
-                //                newFileTool.newFile(jsonObject.toString(),"计量物流金蝶核对");
-                //            } catch (IOException e) {
-                //                e.printStackTrace();
-                //            }
-                //        }
-                //    }).start();
-                //}catch (Exception e) {
-                //    e.printStackTrace();
-                //}
+                try{
+                    new Thread( new Runnable() {
+                        public void run(){
+                            try {
+                                newFileTool.newFile(jsonObject.toString(),"计量物流金蝶核对");
+                            } catch (IOException e) {
+                                e.printStackTrace();
+                            }
+                        }
+                    }).start();
+                }catch (Exception e) {
+                    e.printStackTrace();
+                }
                 //判断该车的运输订单号是否是钢材且是否是正在作业中的,如果不是就返回true
                 int i = tmstruckWeightResultMapper.checkOrderIsSteel(map);
                 if (i == 0) {
@@ -828,7 +828,6 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
                 if (j == 0) {
                     //判断是否自提
                     String isSelfMention = tmstruckWeightResultMapper.getIsSelfMention(map);
-                    if(isSelfMention != null && isSelfMention.equals("是")) {
                         //如果是自提,则更换规格
                         BigDecimal jlSaleOrderMaterialId = tmstruckWeightResultMapper.getJlSaleOrderMaterialId(map);
                         BigDecimal wlSaleOrderMaterialId = tmstruckWeightResultMapper.getWlSaleOrderMaterialId(map);
@@ -857,12 +856,6 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
                         //根据分录ID查询车序号
                         utilsService.pushMesToWebsocket((String) map.get("carNo"), "计量");
                         return false;
-                    }else {
-                        //如果对不上,那么就将运输订单里面的状态变一下
-                        tmstruckWeightResultMapper.updateOmsRedQrCode(map);
-                        utilsService.pushMesToWebsocket((String) map.get("carNo"), "计量");
-                        return false;
-                    }
                 }else{
                     return true;
                 }