|
@@ -2,13 +2,11 @@ package com.steerinfo.dil.service.impl;
|
|
|
|
|
|
|
|
import com.alibaba.druid.support.json.JSONUtils;
|
|
import com.alibaba.druid.support.json.JSONUtils;
|
|
|
import com.steerinfo.dil.feign.JoinFeign;
|
|
import com.steerinfo.dil.feign.JoinFeign;
|
|
|
-import com.steerinfo.dil.mapper.OmstruckOrderMapper;
|
|
|
|
|
-import com.steerinfo.dil.mapper.OmstruckOrderMaterialMapper;
|
|
|
|
|
-import com.steerinfo.dil.mapper.RmsCapacityMapper;
|
|
|
|
|
-import com.steerinfo.dil.mapper.RmsPwarehouseGridMapper;
|
|
|
|
|
|
|
+import com.steerinfo.dil.mapper.*;
|
|
|
import com.steerinfo.dil.model.OmstruckOrderMaterial;
|
|
import com.steerinfo.dil.model.OmstruckOrderMaterial;
|
|
|
import com.steerinfo.dil.model.RmsCapacity;
|
|
import com.steerinfo.dil.model.RmsCapacity;
|
|
|
import com.steerinfo.dil.model.RmsPwarehouseGrid;
|
|
import com.steerinfo.dil.model.RmsPwarehouseGrid;
|
|
|
|
|
+import com.steerinfo.dil.model.SaleLog;
|
|
|
import com.steerinfo.dil.service.IOmstruckOrderMaterialService;
|
|
import com.steerinfo.dil.service.IOmstruckOrderMaterialService;
|
|
|
import com.steerinfo.dil.util.DataChange;
|
|
import com.steerinfo.dil.util.DataChange;
|
|
|
import com.steerinfo.dil.util.EASMaterialNumberUtil;
|
|
import com.steerinfo.dil.util.EASMaterialNumberUtil;
|
|
@@ -55,6 +53,9 @@ public class OmstruckOrderMaterialServiceImpl implements IOmstruckOrderMaterialS
|
|
|
@Autowired
|
|
@Autowired
|
|
|
EASMaterialNumberUtil easMaterialNumberUtil;
|
|
EASMaterialNumberUtil easMaterialNumberUtil;
|
|
|
|
|
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private SaleLogMapper saleLogMapper;
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 远程调用订单子表新增
|
|
* 远程调用订单子表新增
|
|
|
*
|
|
*
|
|
@@ -302,7 +303,7 @@ public class OmstruckOrderMaterialServiceImpl implements IOmstruckOrderMaterialS
|
|
|
* @param map
|
|
* @param map
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
- @Transactional
|
|
|
|
|
|
|
+ @Transactional(rollbackFor = Exception.class)
|
|
|
public int updateMaterialMes(Map<String, Object> map) throws Exception {
|
|
public int updateMaterialMes(Map<String, Object> map) throws Exception {
|
|
|
OmstruckOrderMaterial omstruckOrderMaterial = new OmstruckOrderMaterial();
|
|
OmstruckOrderMaterial omstruckOrderMaterial = new OmstruckOrderMaterial();
|
|
|
List<Map<String,Object>>mapList = (List<Map<String, Object>>) map.get("mapList");
|
|
List<Map<String,Object>>mapList = (List<Map<String, Object>>) map.get("mapList");
|
|
@@ -359,6 +360,15 @@ public class OmstruckOrderMaterialServiceImpl implements IOmstruckOrderMaterialS
|
|
|
omstruckOrderMaterialMapper.updateSaleOrderMaterialMes(saleMaterialId, materialNum, newWeight);
|
|
omstruckOrderMaterialMapper.updateSaleOrderMaterialMes(saleMaterialId, materialNum, newWeight);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+ SaleLog saleLog = new SaleLog();
|
|
|
|
|
+ saleLog.setResultId(saleLogMapper.selectMaxId());
|
|
|
|
|
+ saleLog.setOrderId(DataChange.dataToBigDecimal(orderIds));
|
|
|
|
|
+ saleLog.setDescription("分类ID:" + saleOrderMaterialId);
|
|
|
|
|
+ saleLog.setJsonData(JSONUtils.toJSONString(map));
|
|
|
|
|
+ saleLog.setInsertTime(new Date());
|
|
|
|
|
+ saleLog.setInsertUsername(map.get("userName") == null ? "" : map.get("userName").toString());
|
|
|
|
|
+ saleLog.setOprationType("修改件数");
|
|
|
|
|
+ saleLogMapper.insertSelective(saleLog);
|
|
|
return 1;
|
|
return 1;
|
|
|
}
|
|
}
|
|
|
|
|
|