|
@@ -107,6 +107,8 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
|
|
|
case 5:
|
|
|
case 6:
|
|
|
case 7:
|
|
|
+ i = addCGPurOrders(map);
|
|
|
+ break;
|
|
|
case 8:
|
|
|
i = addCGPurOrder(map);
|
|
|
break;
|
|
@@ -120,9 +122,44 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
|
|
|
return i;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ * 新增采购其他订单
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ public int addCGPurOrders(Map<String, Object> map){
|
|
|
+
|
|
|
+ List<Map<String, Object>> driverCapacityIdList = (List<Map<String, Object>>) map.get("driverCapacityIdList");
|
|
|
+ BigDecimal purchaseOrderId = DataChange.dataToBigDecimal(map.get("purchaseOrderId"));
|
|
|
+
|
|
|
+ Object materialId = map.get("materialId");
|
|
|
+ BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderType"));
|
|
|
+
|
|
|
+ Date orderEntryTime = new Date((long) map.get("orderEntryTime"));
|
|
|
+ int count = 0;
|
|
|
+ for (Map<String, Object> capacityMap : driverCapacityIdList) {
|
|
|
+
|
|
|
+ OmstruckOrder omstruckOrder = generateOmsTruckOrder(map);
|
|
|
+ omstruckOrder.setOrderPlanId(purchaseOrderId);
|
|
|
+ omstruckOrder.setDriverCapacityId(DataChange.dataToBigDecimal(capacityMap.get("driverCapacityId")));
|
|
|
+ omstruckOrder.setOrderEntryTime(orderEntryTime);
|
|
|
+ omstruckOrder.setLineId(new BigDecimal(1));
|
|
|
+ count += omstruckOrderMapper.insertSelective(omstruckOrder);
|
|
|
+ BigDecimal orderId = omstruckOrder.getOrderId();
|
|
|
+
|
|
|
+ capacityMap.put("materialId", materialId);
|
|
|
+ capacityMap.put("orderType", orderType);
|
|
|
+ addOrderMaterial(capacityMap,orderId);
|
|
|
+
|
|
|
+ capacityMap.put("orderId", orderId);
|
|
|
+ tmsTruckFeign.addTotalResult(map);
|
|
|
+
|
|
|
+ }
|
|
|
+ return count;
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
|
|
|
- * 新增采购运输订单订单
|
|
|
+ * 新增采购进口矿运输订单订单
|
|
|
*
|
|
|
* @param map
|
|
|
* @return
|
|
@@ -140,6 +177,9 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
|
|
|
if (map.get("orderMaterialWeight") != null) {
|
|
|
amsFeign.updateMaterial(map);
|
|
|
}
|
|
|
+
|
|
|
+ BigDecimal driverCapacityId = DataChange.dataToBigDecimal(map.get("driverCapacityId"));
|
|
|
+ omstruckOrder.setDriverCapacityId(driverCapacityId);
|
|
|
|
|
|
omstruckOrderMapper.insertSelective(omstruckOrder);
|
|
|
|
|
@@ -186,11 +226,6 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
|
|
|
case 8:
|
|
|
if (map.get("purchaseOrderId") != null)
|
|
|
omstruckOrder.setOrderPlanId(DataChange.dataToBigDecimal(map.get("purchaseOrderId")));
|
|
|
- if (map.get("purchaseOrderNo") != null) {
|
|
|
-
|
|
|
- BigDecimal purchaseOrderId = omstruckOrderMapper.getPurchaseOrderIdByNo((String) map.get("purchaseOrderNo"));
|
|
|
- omstruckOrder.setOrderPlanId(purchaseOrderId);
|
|
|
- }
|
|
|
if (map.get("unloadPointId") != null)
|
|
|
omstruckOrder.setUnloadPointId(DataChange.dataToBigDecimal(map.get("unloadPointId")));
|
|
|
break;
|
|
@@ -202,9 +237,6 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
|
|
|
}
|
|
|
|
|
|
omstruckOrder.setOrderType(orderType);
|
|
|
-
|
|
|
- BigDecimal driverCapacityId = DataChange.dataToBigDecimal(map.get("driverCapacityId"));
|
|
|
- omstruckOrder.setDriverCapacityId(driverCapacityId);
|
|
|
omstruckOrder.setInsertUsername("admin");
|
|
|
omstruckOrder.setInsertTime(new Date());
|
|
|
return omstruckOrder;
|
|
@@ -286,10 +318,10 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
|
|
|
omstruckOrderMaterial.setOrderMaterialId(omstruckOrderMaterialMapper.selectMaxId());
|
|
|
omstruckOrderMaterial.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
|
|
|
omstruckOrderMaterial.setOrderId(orderId);
|
|
|
- Object orderMaterialWeight = map.get("orderMaterialWeight");
|
|
|
- if (orderMaterialWeight != null) {
|
|
|
- omstruckOrderMaterial.setOrderMaterialWeight(DataChange.dataToBigDecimal(orderMaterialWeight));
|
|
|
- }
|
|
|
+ if (map.get("orderMaterialWeight") != null)
|
|
|
+ omstruckOrderMaterial.setOrderMaterialWeight(DataChange.dataToBigDecimal(map.get("orderMaterialWeight")));
|
|
|
+ if(map.get("orderMaterialNumber") != null)
|
|
|
+ omstruckOrderMaterial.setOrderMaterialNumber(DataChange.dataToBigDecimal(map.get("orderMaterialNumber")));
|
|
|
omstruckOrderMaterial.setInsertUsername("admin");
|
|
|
omstruckOrderMaterial.setInsertTime(new Date());
|
|
|
omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
|
|
@@ -322,8 +354,10 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
|
|
|
if (map.get("capacityId") != null) {
|
|
|
omstruckOrder.setCapacityId(DataChange.dataToBigDecimal(map.get("capacityId")));
|
|
|
}
|
|
|
- if (map.get("orderEntryTime") != null) {
|
|
|
+ if(map.get("orderEntryTime") != null){
|
|
|
omstruckOrder.setOrderEntryTime(new Date((long) map.get("orderEntryTime")));
|
|
|
+ }
|
|
|
+ if(map.get("unloadPointId")!=null || map.get("capacityId") != null || map.get("orderEntryTime") != null){
|
|
|
omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
|
|
|
}
|
|
|
Integer orderType = (Integer) map.get("orderType");
|
|
@@ -347,10 +381,13 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
|
|
|
omstruckOrderMaterial.setOrderMaterialId(orderMaterialId);
|
|
|
if (map.get("orderMaterialWeight") != null) {
|
|
|
omstruckOrderMaterial.setOrderMaterialWeight(DataChange.dataToBigDecimal(map.get("orderMaterialWeight")));
|
|
|
-
|
|
|
- amsFeign.updateMaterial(map);
|
|
|
+ if(orderType == 8)
|
|
|
+ amsFeign.updateMaterial(map);
|
|
|
+ }
|
|
|
+ if(map.get("orderMaterialNumber") != null) {
|
|
|
+ omstruckOrderMaterial.setOrderMaterialNumber(DataChange.dataToBigDecimal(map.get("orderMaterialNumber")));
|
|
|
}
|
|
|
- if (map.get("materialId") != null) {
|
|
|
+ if (map.get("materialId") != null) {
|
|
|
omstruckOrderMaterial.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
|
|
|
}
|
|
|
omstruckOrderMaterialMapper.updateByPrimaryKeySelective(omstruckOrderMaterial);
|
|
@@ -418,17 +455,23 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
|
|
|
|
|
|
* 发送消息到 websocket 推送消息
|
|
|
* orderId 订单Id (unloadPointId)卸货点Id
|
|
|
- *
|
|
|
* @return
|
|
|
*/
|
|
|
public void pushMesToWebsocket(Map<String, Object> map) {
|
|
|
Map<String, Object> mesMap = omstruckOrderMapper.pushMesToWebsocket(map);
|
|
|
- HashMap<String, Object> sendMap = new HashMap<>();
|
|
|
- sendMap.put("messageType", 2);
|
|
|
- sendMap.put("receivePerson", mesMap.get("capacityNumber"));
|
|
|
- sendMap.put("sendPerson", "system");
|
|
|
- sendMap.put("messageContent", mesMap);
|
|
|
+
|
|
|
+ HashMap<Object, Object> mapp = new HashMap<>();
|
|
|
+ mapp.put("messageType", 2);
|
|
|
+ mapp.put("sendPerson", "system");
|
|
|
+ mapp.put("receivePerson", mesMap.get("capacityNumber"));
|
|
|
+ mapp.put("messageContent", mesMap);
|
|
|
+ mapp.put("createTime", new Date());
|
|
|
+ ArrayList<Object> list = new ArrayList<>();
|
|
|
+ list.add(mapp);
|
|
|
|
|
|
+ HashMap<Object, Object> sendMap = new HashMap<>();
|
|
|
+
|
|
|
+ sendMap.put("messages", list);
|
|
|
String s = imFeign.sendToUser(sendMap);
|
|
|
System.out.println(s);
|
|
|
}
|
|
@@ -480,14 +523,16 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
|
|
|
@Override
|
|
|
public int driverReceiveOrRefuse(Map<String, Object> map) {
|
|
|
OmstruckOrder omstruckOrder = new OmstruckOrder();
|
|
|
- if ((Integer) map.get("orderReceiveStatus") == 1) {
|
|
|
+ if((Integer) map.get("orderReceiveStatus") == 1){
|
|
|
omstruckOrder.setOrderReceiveStatus(new BigDecimal(1));
|
|
|
omstruckOrder.setOrderStatus(new BigDecimal(5));
|
|
|
|
|
|
addSomeResult(DataChange.dataToBigDecimal(map.get("orderId")).intValue());
|
|
|
- } else {
|
|
|
+ }else {
|
|
|
omstruckOrder.setOrderReceiveStatus(new BigDecimal(0));
|
|
|
omstruckOrder.setOrderStatus(new BigDecimal(6));
|
|
|
+
|
|
|
+ omstruckOrder.setInsertUpdateRemark((String) map.get("insertUpdateRemark"));
|
|
|
|
|
|
|
|
|
|
|
@@ -504,7 +549,7 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
|
|
|
long time = receiveTime.getTime() - issueTime.getTime();
|
|
|
long min = time / (1000 * 60);
|
|
|
omstruckOrder.setOrderCommunicationDuration(new BigDecimal(min));
|
|
|
- return omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
|
|
|
+ return omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -919,8 +964,8 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
|
|
|
|
|
|
|
|
|
@Override
|
|
|
- public String selectNewOrderId(BigDecimal materialId) {
|
|
|
- return omstruckOrderMapper.selectNewOrderId(materialId);
|
|
|
+ public Map<String, Object> selectNewOrderId(Map<String, Object> map) {
|
|
|
+ return omstruckOrderMapper.selectNewOrderId(map);
|
|
|
}
|
|
|
|
|
|
|