|
@@ -171,14 +171,16 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
|
|
|
@Override
|
|
|
public synchronized int insertSelectiveNew(BigDecimal orderId) throws Exception {
|
|
|
List<Map<String,Object>> weightTaskResultIdList = bmstruckDetailsOrderMapper.getSteelWeightTaskResultId(orderId);
|
|
|
+ System.out.println("根据运单查询到的计量实绩数据为," + weightTaskResultIdList);
|
|
|
Map<String,Object> priceMap = getPriceId(orderId);
|
|
|
- if (priceMap == null || priceMap.size() == 0) {
|
|
|
+ System.out.println("根据运单查询到单价数据为," + priceMap);
|
|
|
+ if (priceMap == null || priceMap.size() == 0 || priceMap.get("priceId") == null) {
|
|
|
return 0;
|
|
|
}
|
|
|
BigDecimal priceId = (BigDecimal) priceMap.get("priceId");
|
|
|
-// if (priceId.intValue() == 0) {
|
|
|
-// return 0;
|
|
|
-// }
|
|
|
+ //if (priceId.intValue() == 0) {
|
|
|
+ // return 0;
|
|
|
+ //}
|
|
|
int result = 0;
|
|
|
for (Map<String, Object> map : weightTaskResultIdList) {
|
|
|
if(map == null) {
|
|
@@ -230,6 +232,7 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
|
|
|
bmstruckDetailsOrder.setUpdateUsername("admin");
|
|
|
bmstruckDetailsOrder.setInsertUpdateRemark("无");
|
|
|
result += bmstruckDetailsOrderMapper.insertSelective(bmstruckDetailsOrder);
|
|
|
+ System.out.println("订单生成了结算单据" + orderId);
|
|
|
}catch (Exception e){
|
|
|
//不打印给控制台(有可能是正常情况)
|
|
|
e.printStackTrace();
|
|
@@ -703,8 +706,11 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
|
|
|
@Transactional
|
|
|
@Override
|
|
|
public synchronized int updateDetailsOrder(Map<String, Object> mapValue) {
|
|
|
+ System.out.println("修改单价,时间:" + new Date() + "-----------" + mapValue);
|
|
|
BigDecimal orderId = DataChange.dataToBigDecimal(mapValue.get("orderId"));
|
|
|
BigDecimal priceId = DataChange.dataToBigDecimal(mapValue.get("priceId"));
|
|
|
+ System.out.println("运单Id,为" + orderId);
|
|
|
+ System.out.println("随接口传输过来的单价Id,为" + priceId);
|
|
|
try {
|
|
|
int i = insertSelectiveNew(orderId);
|
|
|
} catch (Exception e) {
|
|
@@ -717,6 +723,7 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
|
|
|
try{
|
|
|
//通过userId查询出用户名
|
|
|
String carrierName = bmstruckDetailsOrderMapper.getCarrierNameForPriceValue((String) mapValue.get("userId"));
|
|
|
+ System.out.println("正在执行该操作的人员为:" + carrierName + "时间为:" + new Date()) ;
|
|
|
//根据运输ID查询出记录下来的用户名
|
|
|
String recordUserName = bmstruckDetailsOrderMapper.getUserName(orderId);
|
|
|
if (recordUserName==null){
|
|
@@ -761,6 +768,7 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
|
|
|
}catch (Exception e) {
|
|
|
System.out.println("更新历史时间失败");
|
|
|
}
|
|
|
+ System.out.println("更新详单数据成功");
|
|
|
result = bmstruckDetailsOrderMapper.updateByPrimaryKeySelective(bmstruckDetailsOrder);
|
|
|
}
|
|
|
/*try {
|
|
@@ -769,6 +777,7 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
|
|
|
e.printStackTrace();
|
|
|
}*/
|
|
|
if(DataChange.dataToBigDecimal(mapValue.get("updatePlace")).intValue() == 1) {
|
|
|
+ System.out.println("更新asom里面的实际地址数据");
|
|
|
Map<String, Object> stringObjectMap = bmstruckDetailsOrderMapper.getsaleShippingAddressId(mapValue);
|
|
|
BigDecimal saleShippingAddressId = (BigDecimal) stringObjectMap.get("saleShippingAddressId");
|
|
|
BigDecimal historyShippingAddressId = (BigDecimal) stringObjectMap.get("historyShippingAddressId");
|
|
@@ -782,11 +791,13 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
|
|
|
// bmstruckDetailsOrderMapper.updatePlace(mapValue);
|
|
|
//}
|
|
|
}
|
|
|
+ System.out.println("修改单价,时间:" + new Date() + "-----------" + mapValue);
|
|
|
return result;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public int updateAsomPriceId(Map<String, Object> mapValue) {
|
|
|
+ System.out.println("更新ASOM表里面的数据实际地址数据" + mapValue + "----------" + new Date());
|
|
|
//前面更新运单时更新过地址了,这里就不更新了,如果订单ID为空,才更新
|
|
|
if(DataChange.dataToBigDecimal(mapValue.get("updatePlace")).intValue() == 1 && mapValue.get("orderId")==null) {
|
|
|
Map<String, Object> stringObjectMap = bmstruckDetailsOrderMapper.getsaleShippingAddressId(mapValue);
|