|
@@ -170,10 +170,10 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
|
|
if(netWeight == 0 && orderType != 25){
|
|
if(netWeight == 0 && orderType != 25){
|
|
mesMap.put("orderLineSequence",sqe);
|
|
mesMap.put("orderLineSequence",sqe);
|
|
utilsService.updateOrderLineSqeByOrderNumber(mesMap);
|
|
utilsService.updateOrderLineSqeByOrderNumber(mesMap);
|
|
- } else if(requireRemark != null && "不需要过磅".equals(requireRemark)) {
|
|
|
|
|
|
+ } else {
|
|
omsFeign.closeInwardOrder(DataChange.dataToBigDecimal(mesMap.get("orderId")).intValue(), sqe, null);
|
|
omsFeign.closeInwardOrder(DataChange.dataToBigDecimal(mesMap.get("orderId")).intValue(), sqe, null);
|
|
}
|
|
}
|
|
- else {
|
|
|
|
|
|
+ if(requireRemark != null && "不需要过磅".equals(requireRemark)) {
|
|
omsFeign.closeInwardOrder(DataChange.dataToBigDecimal(mesMap.get("orderId")).intValue(), sqe, null);
|
|
omsFeign.closeInwardOrder(DataChange.dataToBigDecimal(mesMap.get("orderId")).intValue(), sqe, null);
|
|
}
|
|
}
|
|
//卸货成功后推送消息给websocket
|
|
//卸货成功后推送消息给websocket
|