|
|
@ -245,7 +245,7 @@ public class ChanjetSchedule {
|
|
|
|
|
|
|
|
|
|
|
|
// 判断物料编码+物料名称+规格+颜色是否存在
|
|
|
|
// 判断物料编码+物料名称+规格+颜色是否存在
|
|
|
|
for (Integer idx = 0; idx < topLayer.getDynamicPropertyValues().size(); idx++) {
|
|
|
|
for (Integer idx = 0; idx < topLayer.getDynamicPropertyValues().size(); idx++) {
|
|
|
|
if (topLayer.getDynamicPropertyKeys().get(idx).contains("freeItem0".toLowerCase())
|
|
|
|
if (topLayer.getDynamicPropertyKeys().get(idx).equals("freeItem0".toLowerCase())
|
|
|
|
&& !StringUtils.isEmpty(topLayer.getDynamicPropertyValues().get(idx))) {
|
|
|
|
&& !StringUtils.isEmpty(topLayer.getDynamicPropertyValues().get(idx))) {
|
|
|
|
String color = topLayer.getDynamicPropertyValues().get(idx);
|
|
|
|
String color = topLayer.getDynamicPropertyValues().get(idx);
|
|
|
|
|
|
|
|
|
|
|
@ -354,7 +354,7 @@ public class ChanjetSchedule {
|
|
|
|
//判断物料编码+物料名称+规格+颜色是否存在
|
|
|
|
//判断物料编码+物料名称+规格+颜色是否存在
|
|
|
|
// 判断物料编码+物料名称+规格+颜色是否存在
|
|
|
|
// 判断物料编码+物料名称+规格+颜色是否存在
|
|
|
|
for (Integer idx = 0; idx < dto.getDynamicPropertyValues().size(); idx++) {
|
|
|
|
for (Integer idx = 0; idx < dto.getDynamicPropertyValues().size(); idx++) {
|
|
|
|
if (dto.getDynamicPropertyKeys().get(idx).contains("freeitem0".toLowerCase())
|
|
|
|
if (dto.getDynamicPropertyKeys().get(idx).equals("freeitem0".toLowerCase())
|
|
|
|
&& !StringUtils.isEmpty(dto.getDynamicPropertyValues().get(idx))) {
|
|
|
|
&& !StringUtils.isEmpty(dto.getDynamicPropertyValues().get(idx))) {
|
|
|
|
String color = dto.getDynamicPropertyValues().get(idx);
|
|
|
|
String color = dto.getDynamicPropertyValues().get(idx);
|
|
|
|
|
|
|
|
|
|
|
@ -440,11 +440,13 @@ public class ChanjetSchedule {
|
|
|
|
if(dataList == null) dataList = new ArrayList<>(16);
|
|
|
|
if(dataList == null) dataList = new ArrayList<>(16);
|
|
|
|
dataList.forEach(ro->{
|
|
|
|
dataList.forEach(ro->{
|
|
|
|
TplusLastestStockDO tplusLastestStockDO = tplusLastestStockMapper.selectOne(TplusLastestStockDO::getWarehouseCode,ro.getWarehouseCode(),TplusLastestStockDO::getInventoryCode,ro.getInventoryCode());
|
|
|
|
TplusLastestStockDO tplusLastestStockDO = tplusLastestStockMapper.selectOne(TplusLastestStockDO::getWarehouseCode,ro.getWarehouseCode(),TplusLastestStockDO::getInventoryCode,ro.getInventoryCode());
|
|
|
|
|
|
|
|
MaterialDO materialDO = materialMapper.selectOne(MaterialDO::getCode,ro.getInventoryCode());
|
|
|
|
if(tplusLastestStockDO== null){
|
|
|
|
if(tplusLastestStockDO== null){
|
|
|
|
tplusLastestStockDO = new TplusLastestStockDO();
|
|
|
|
tplusLastestStockDO = new TplusLastestStockDO();
|
|
|
|
tplusLastestStockDO.setId(null);
|
|
|
|
tplusLastestStockDO.setId(null);
|
|
|
|
tplusLastestStockDO.setWarehouseId(ro.getWarehouseID2());
|
|
|
|
tplusLastestStockDO.setWarehouseId(ro.getWarehouseID2());
|
|
|
|
tplusLastestStockDO.setInventoryId(ro.getInventoryID2());
|
|
|
|
// tplusLastestStockDO.setInventoryId(ro.getInventoryID2());
|
|
|
|
|
|
|
|
tplusLastestStockDO.setInventoryId(materialDO==null?null:materialDO.getId().toString());
|
|
|
|
tplusLastestStockDO.setWarehouseCode(ro.getWarehouseCode());
|
|
|
|
tplusLastestStockDO.setWarehouseCode(ro.getWarehouseCode());
|
|
|
|
tplusLastestStockDO.setWarehouseName(ro.getWarehouseName());
|
|
|
|
tplusLastestStockDO.setWarehouseName(ro.getWarehouseName());
|
|
|
|
tplusLastestStockDO.setWarehouseCode(ro.getWarehouseCode());
|
|
|
|
tplusLastestStockDO.setWarehouseCode(ro.getWarehouseCode());
|
|
|
@ -461,7 +463,8 @@ public class ChanjetSchedule {
|
|
|
|
// insertList.add(newDo);
|
|
|
|
// insertList.add(newDo);
|
|
|
|
}else{
|
|
|
|
}else{
|
|
|
|
tplusLastestStockDO.setWarehouseId(ro.getWarehouseID2());
|
|
|
|
tplusLastestStockDO.setWarehouseId(ro.getWarehouseID2());
|
|
|
|
tplusLastestStockDO.setInventoryId(ro.getInventoryID2());
|
|
|
|
// tplusLastestStockDO.setInventoryId(ro.getInventoryID2());
|
|
|
|
|
|
|
|
tplusLastestStockDO.setInventoryId(materialDO==null?null:materialDO.getId().toString());
|
|
|
|
tplusLastestStockDO.setWarehouseCode(ro.getWarehouseCode());
|
|
|
|
tplusLastestStockDO.setWarehouseCode(ro.getWarehouseCode());
|
|
|
|
tplusLastestStockDO.setWarehouseName(ro.getWarehouseName());
|
|
|
|
tplusLastestStockDO.setWarehouseName(ro.getWarehouseName());
|
|
|
|
tplusLastestStockDO.setWarehouseCode(ro.getWarehouseCode());
|
|
|
|
tplusLastestStockDO.setWarehouseCode(ro.getWarehouseCode());
|
|
|
|