|
@@ -1461,7 +1461,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
|
}
|
|
|
result += amsSaleOrderMaterialMapper.updateByPrimaryKeySelective(amsSaleOrderMaterial);
|
|
|
|
|
|
- if ((Integer) isNewCar == 0) {
|
|
|
+ if (isNewCar != null && (Integer) isNewCar == 0) {
|
|
|
|
|
|
BigDecimal dispatchId = amsSaleOrderMapper.getDispatchId(saleOrderMaterialId);
|
|
|
if (dispatchId != null) {
|
|
@@ -1725,7 +1725,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
|
|
|
|
BigDecimal oldCapacityId = omstruckOrderMapper.getOldCapacityId(DataChange.dataToBigDecimal(mapValue.get("orderId")));
|
|
|
if(oldCapacityId.compareTo(DataChange.dataToBigDecimal(mapValue.get("capacityId"))) == 0){
|
|
|
- return 0;
|
|
|
+ return 1;
|
|
|
}
|
|
|
if (lineSequence == null || "0".equals(lineSequence.toString()) || "1".equals(lineSequence.toString()) || "2".equals(lineSequence.toString())) {
|
|
|
|
|
@@ -1991,5 +1991,64 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
|
return amsSaleOrderMapper.getKucunList(map);
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public int reverseCloseOrder(Map<String, Object> map) {
|
|
|
+ Integer isOpenEas = (Integer) map.get("isOpenEas");
|
|
|
+ String operateName = (String) map.get("operateName");
|
|
|
+ int result = 0;
|
|
|
+
|
|
|
+ BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
|
|
|
+
|
|
|
+ BigDecimal saleOrderMaterialId = DataChange.dataToBigDecimal(map.get("saleOrderMaterialId"));
|
|
|
+ Map<String,Object> head = new HashMap<>();
|
|
|
+ Map<String,Object> input = new HashMap<>();
|
|
|
+
|
|
|
+ String wholeOrder = "0";
|
|
|
+
|
|
|
+ String status = "unClose";
|
|
|
+ if( orderId != null && orderId.intValue() != 0){
|
|
|
+
|
|
|
+ int resultCount = amsSaleMaterialMapper.getOrderResults(orderId);
|
|
|
+ OmstruckOrder omstruckOrder = new OmstruckOrder();
|
|
|
+ omstruckOrder.setOrderId(orderId);
|
|
|
+ if(resultCount == 0){
|
|
|
+ omstruckOrder.setOrderStatus(new BigDecimal(4));
|
|
|
+ }else{
|
|
|
+ omstruckOrder.setOrderStatus(new BigDecimal(5));
|
|
|
+ }
|
|
|
+ if(operateName != null){
|
|
|
+ omstruckOrder.setOptionerCode(operateName);
|
|
|
+ }
|
|
|
+ omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
|
|
|
+
|
|
|
+ amsSaleMaterialMapper.updateSaleMaterial(saleOrderMaterialId);
|
|
|
+
|
|
|
+ List<Map<String,Object>> saleMaterialIdList = amsSaleOrderMapper.getSaleMaterialId(saleOrderMaterialId);
|
|
|
+ for(Map<String,Object> easMap:saleMaterialIdList){
|
|
|
+
|
|
|
+ head.put("unCloseEntryId",easMap.get("closeEntryId"));
|
|
|
+
|
|
|
+ head.put("wholeOrder",wholeOrder);
|
|
|
+
|
|
|
+ head.put("number",map.get("saleNumber"));
|
|
|
+
|
|
|
+ head.put("status",status);
|
|
|
+ input.put("head",head);
|
|
|
+ Map<String, Object> totalMap = easUtil.getTotalMap();
|
|
|
+ input.put("head",head);
|
|
|
+ totalMap.put("input",input);
|
|
|
+
|
|
|
+ String json = JSONUtils.toJSONString(totalMap);
|
|
|
+ System.out.println(json);
|
|
|
+ Map<String,Object> resultMap = joinFeign.deleteSaleOrderToEas(totalMap);
|
|
|
+ System.out.println(resultMap);
|
|
|
+ }
|
|
|
+ return 0;
|
|
|
+
|
|
|
+ }
|
|
|
+ return 1;
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
}
|