|
@@ -219,6 +219,9 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
|
|
Map<String, Object> mesMap = utilsMapper.getOrderTypeByOrderNumber(orderNumber);
|
|
Map<String, Object> mesMap = utilsMapper.getOrderTypeByOrderNumber(orderNumber);
|
|
int orderType = DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue();
|
|
int orderType = DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue();
|
|
String capacityNumber = (String) mesMap.get("capacityNumber");
|
|
String capacityNumber = (String) mesMap.get("capacityNumber");
|
|
|
|
+ String thisOrderId = (String) mesMap.get("orderId");
|
|
|
|
+ String materialName = utilsMapper.getOrderMaterialByOrderId(thisOrderId);
|
|
|
|
+ mesMap.put("materialName", materialName);
|
|
if(orderType == 11 || orderType == 15 || orderType == 16){
|
|
if(orderType == 11 || orderType == 15 || orderType == 16){
|
|
return orderType11Use(map, mesMap,capacityNumber);
|
|
return orderType11Use(map, mesMap,capacityNumber);
|
|
}else if(orderType == 21){
|
|
}else if(orderType == 21){
|
|
@@ -523,6 +526,12 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
|
|
mesMap.put("orderLineSequence",sqe);
|
|
mesMap.put("orderLineSequence",sqe);
|
|
utilsService.updateOrderLineSqeByOrderNumber(mesMap);
|
|
utilsService.updateOrderLineSqeByOrderNumber(mesMap);
|
|
utilsService.pushMesToWebsocket(capacityNumber, "出厂");
|
|
utilsService.pushMesToWebsocket(capacityNumber, "出厂");
|
|
|
|
+ if(mesMap.get("materialName") != null && "粒化高炉矿渣".equals(mesMap.get("materialName")) && mesMap.get("orderId") != null){
|
|
|
|
+ Map updateMap = new HashMap();
|
|
|
|
+ updateMap.put("orderId", mesMap.get("orderId"));
|
|
|
|
+ updateMap.put("orderStatus", 2);
|
|
|
|
+ utilsMapper.updateOrderStatusByOrderIdOrNum(updateMap);
|
|
|
|
+ }
|
|
return 1;
|
|
return 1;
|
|
}
|
|
}
|
|
|
|
|