|
@@ -9,6 +9,7 @@ import com.steerinfo.dil.model.TmstruckWeightResult;
|
|
import com.steerinfo.dil.service.ITmstruckWeightResultService;
|
|
import com.steerinfo.dil.service.ITmstruckWeightResultService;
|
|
import com.steerinfo.dil.util.DataChange;
|
|
import com.steerinfo.dil.util.DataChange;
|
|
import com.steerinfo.dil.util.newFileTool;
|
|
import com.steerinfo.dil.util.newFileTool;
|
|
|
|
+import org.apache.commons.lang.time.FastDateFormat;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.LoggerFactory;
|
|
import org.slf4j.LoggerFactory;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -736,20 +737,10 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
|
|
try {
|
|
try {
|
|
if (map != null) {
|
|
if (map != null) {
|
|
JSONObject jsonObject = new JSONObject(map);
|
|
JSONObject jsonObject = new JSONObject(map);
|
|
- logger.info(jsonObject.toString() + "计量检查");
|
|
|
|
- try{
|
|
|
|
- new Thread( new Runnable() {
|
|
|
|
- public void run(){
|
|
|
|
- try {
|
|
|
|
- newFileTool.newFile(jsonObject.toString(),"计量物流金蝶核对");
|
|
|
|
- } catch (IOException e) {
|
|
|
|
- e.printStackTrace();
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- }).start();
|
|
|
|
- }catch (Exception e) {
|
|
|
|
- e.printStackTrace();
|
|
|
|
- }
|
|
|
|
|
|
+ FastDateFormat format = FastDateFormat.getInstance("yyyy-MM-dd HH:mm:ss");
|
|
|
|
+ logger.info("=========" + "计量检查" + format.format(new Date()));
|
|
|
|
+ logger.info(jsonObject.toString());
|
|
|
|
+ logger.info("=========" + "计量检查" + format.format(new Date()));
|
|
//判断该车的运输订单号是否是钢材且是否是正在作业中的,如果不是就返回true
|
|
//判断该车的运输订单号是否是钢材且是否是正在作业中的,如果不是就返回true
|
|
int i = tmstruckWeightResultMapper.checkOrderIsSteel(map);
|
|
int i = tmstruckWeightResultMapper.checkOrderIsSteel(map);
|
|
if (i == 0) {
|
|
if (i == 0) {
|
|
@@ -764,6 +755,8 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
|
|
if (j == 0) {
|
|
if (j == 0) {
|
|
//如果对不上,那么就将运输订单里面的状态变一下
|
|
//如果对不上,那么就将运输订单里面的状态变一下
|
|
tmstruckWeightResultMapper.updateOmsRedQrCode(map);
|
|
tmstruckWeightResultMapper.updateOmsRedQrCode(map);
|
|
|
|
+ //推送数据
|
|
|
|
+ utilsService.pushMesToWebsocket((String) map.get("carNo"), "计量");
|
|
return false;
|
|
return false;
|
|
}else{
|
|
}else{
|
|
return true;
|
|
return true;
|