|
@@ -5,11 +5,14 @@ import com.steerinfo.dil.mapper.*;
|
|
import com.steerinfo.dil.model.TmstruckUnloadResult;
|
|
import com.steerinfo.dil.model.TmstruckUnloadResult;
|
|
import com.steerinfo.dil.service.ITmstruckUnloadResultService;
|
|
import com.steerinfo.dil.service.ITmstruckUnloadResultService;
|
|
import com.steerinfo.dil.util.DataChange;
|
|
import com.steerinfo.dil.util.DataChange;
|
|
|
|
+import com.steerinfo.dil.util.HTTPRequestUtils;
|
|
|
|
+import org.apache.http.ParseException;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
import javax.xml.crypto.Data;
|
|
import javax.xml.crypto.Data;
|
|
|
|
+import java.io.IOException;
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
import java.util.HashMap;
|
|
import java.util.HashMap;
|
|
@@ -163,7 +166,6 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
|
|
//卸货时查询是否含有净重
|
|
//卸货时查询是否含有净重
|
|
BigDecimal totalId = DataChange.dataToBigDecimal(mesMap.get("totalId"));
|
|
BigDecimal totalId = DataChange.dataToBigDecimal(mesMap.get("totalId"));
|
|
Integer netWeight = tmstruckUnloadResultMapper.getNetWeightByTotalId(totalId);
|
|
Integer netWeight = tmstruckUnloadResultMapper.getNetWeightByTotalId(totalId);
|
|
-
|
|
|
|
int orderType = DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue();
|
|
int orderType = DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue();
|
|
//判断是不是内转
|
|
//判断是不是内转
|
|
if(orderType == 11 || orderType == 15 || orderType == 16 || orderType == 25){
|
|
if(orderType == 11 || orderType == 15 || orderType == 16 || orderType == 25){
|
|
@@ -214,6 +216,15 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
|
|
map.put("inwardTypes",3);
|
|
map.put("inwardTypes",3);
|
|
tmstruckTimeTaskResultService.addTimeTaskResult(map);
|
|
tmstruckTimeTaskResultService.addTimeTaskResult(map);
|
|
}
|
|
}
|
|
|
|
+ //
|
|
|
|
+ try {
|
|
|
|
+ String url = "https://jl.dasteel.cn:44326/api/logistics/LoadAndUnloadFlag?orderNumber=" + orderNumber;
|
|
|
|
+ HTTPRequestUtils.sendGet(url,"utf-8");
|
|
|
|
+ } catch (ParseException e) {
|
|
|
|
+ e.printStackTrace();
|
|
|
|
+ } catch (IOException e) {
|
|
|
|
+ e.printStackTrace();
|
|
|
|
+ }
|
|
return 1;
|
|
return 1;
|
|
}
|
|
}
|
|
//如果是零星多拼订单 需要查询这个物资是否已经卸过了
|
|
//如果是零星多拼订单 需要查询这个物资是否已经卸过了
|
|
@@ -268,6 +279,14 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
//卸货成功后推送消息给websocket
|
|
//卸货成功后推送消息给websocket
|
|
|
|
+ try {
|
|
|
|
+ String url = "https://jl.dasteel.cn:44326/api/logistics/LoadAndUnloadFlag?orderNumber=" + orderNumber;
|
|
|
|
+ HTTPRequestUtils.sendGet(url,"utf-8");
|
|
|
|
+ } catch (ParseException e) {
|
|
|
|
+ e.printStackTrace();
|
|
|
|
+ } catch (IOException e) {
|
|
|
|
+ e.printStackTrace();
|
|
|
|
+ }
|
|
utilsService.pushMesToWebsocket((String) mesMap.get("capacityNumber"), "卸货");
|
|
utilsService.pushMesToWebsocket((String) mesMap.get("capacityNumber"), "卸货");
|
|
return 1;
|
|
return 1;
|
|
}
|
|
}
|
|
@@ -430,5 +449,10 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
|
|
return i;
|
|
return i;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ public int toSendUnloadFlagToJl(String orderNumber) {
|
|
|
|
+
|
|
|
|
+ return 1;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
|
|
}
|
|
}
|