|
@@ -488,75 +488,55 @@ public class AmstruckSporadicOrderServiceImpl implements IAmstruckSporadicOrderS
|
|
|
|
|
|
return result;
|
|
|
}
|
|
|
-
|
|
|
- @Override
|
|
|
- public int closeSporadicOrderInward(Map<String, Object> map) {
|
|
|
- int result=0;
|
|
|
- BigDecimal sporadicOrderId =DataChange.dataToBigDecimal(map.get("sporadicOrderId"));
|
|
|
- AmstruckSporadicOrder amstruckSporadicOrder=new AmstruckSporadicOrder();
|
|
|
- amstruckSporadicOrder.setSporadicOrderId(sporadicOrderId);
|
|
|
- amstruckSporadicOrder.setTransStatus(new BigDecimal(0));
|
|
|
- result+=amstruckSporadicOrderMapper.updateByPrimaryKeySelective(amstruckSporadicOrder);
|
|
|
-
|
|
|
- List<Map<String, Object>> stringObjectMap = amstruckSporadicOrderMapper.selectOrderIdbySporadicOrderid(sporadicOrderId.intValue());
|
|
|
- for (Map<String,Object> map1:stringObjectMap) {
|
|
|
-
|
|
|
- BigDecimal orderId =(BigDecimal) map1.get("orderId");
|
|
|
- OmstruckOrder omstruckOrder=new OmstruckOrder();
|
|
|
- omstruckOrder.setOrderId(orderId);
|
|
|
- omstruckOrder.setOrderStatus(new BigDecimal(8));
|
|
|
- result+=omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
|
|
|
- }
|
|
|
- return result;
|
|
|
|
|
|
- }
|
|
|
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
@Override
|
|
|
- public int closeSporadicOrder(Map<String, Object> map) {
|
|
|
- int result=0;
|
|
|
- BigDecimal sporadicOrderId =DataChange.dataToBigDecimal(map.get("sporadicOrderId"));
|
|
|
- AmstruckSporadicOrder amstruckSporadicOrder=new AmstruckSporadicOrder();
|
|
|
+ public int closeSporadic(Map<String, Object> map) {
|
|
|
+ int result = 0;
|
|
|
+ BigDecimal sporadicOrderId = DataChange.dataToBigDecimal(map.get("sporadicOrderId"));
|
|
|
+ AmstruckSporadicOrder amstruckSporadicOrder = new AmstruckSporadicOrder();
|
|
|
amstruckSporadicOrder.setSporadicOrderId(sporadicOrderId);
|
|
|
amstruckSporadicOrder.setSporadicOrderTimes(new BigDecimal(0));
|
|
|
- result+=amstruckSporadicOrderMapper.updateByPrimaryKeySelective(amstruckSporadicOrder);
|
|
|
+ amstruckSporadicOrder.setTransStatus(new BigDecimal(0));
|
|
|
+ result += amstruckSporadicOrderMapper.updateByPrimaryKeySelective(amstruckSporadicOrder);
|
|
|
|
|
|
List<Map<String, Object>> stringObjectMap = amstruckSporadicOrderMapper.selectOrderIdbySporadicOrderid(sporadicOrderId.intValue());
|
|
|
- for (Map<String,Object> map1:stringObjectMap) {
|
|
|
+ for (Map<String, Object> map1 : stringObjectMap) {
|
|
|
|
|
|
- BigDecimal orderId =(BigDecimal) map1.get("orderId");
|
|
|
- OmstruckOrder omstruckOrder=new OmstruckOrder();
|
|
|
+ BigDecimal orderId = (BigDecimal) map1.get("orderId");
|
|
|
+
|
|
|
+ OmstruckOrder omstruckOrder = new OmstruckOrder();
|
|
|
omstruckOrder.setOrderId(orderId);
|
|
|
omstruckOrder.setOrderStatus(new BigDecimal(8));
|
|
|
- result+=omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
|
|
|
+ result += omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
|
|
|
+
|
|
|
}
|
|
|
return result;
|
|
|
}
|
|
|
+}
|
|
|
|
|
|
- @Override
|
|
|
- public int closeSporadic(Map<String, Object> map) {
|
|
|
- BigDecimal sporadicOrderId =DataChange.dataToBigDecimal(map.get("sporadicOrderId"));
|
|
|
-
|
|
|
- List<Map<String, Object>> stringObjectMap = amstruckSporadicOrderMapper.selectOrderIdbySporadicOrderid(sporadicOrderId.intValue());
|
|
|
- for (Map<String,Object> map1:stringObjectMap){
|
|
|
-
|
|
|
- BigDecimal orderId =(BigDecimal) map1.get("orderId");
|
|
|
-
|
|
|
- int orderType = omstruckOrderMapper.selectOrderTypeByOrderId(orderId);
|
|
|
- switch (orderType){
|
|
|
- case 15:
|
|
|
- case 16:
|
|
|
-
|
|
|
- closeSporadicOrder(map);
|
|
|
- break;
|
|
|
- case 12:
|
|
|
- case 13:
|
|
|
-
|
|
|
- closeSporadicOrderInward(map);
|
|
|
- break;
|
|
|
|
|
|
- }
|
|
|
- }
|
|
|
- return 2;
|
|
|
- }
|
|
|
-}
|