|
|
@@ -16,6 +16,7 @@ import com.cnbm.packing.mapper.WoPackagingBoxMapper; |
|
|
|
import com.cnbm.packing.mapper.WoPackagingBoxSubstrateMapper; |
|
|
|
import com.cnbm.packing.param.PowerReportQueryParam; |
|
|
|
import com.cnbm.packing.service.WoPackagingBoxServiceBiz; |
|
|
|
import com.cnbm.packing.service.WoPackagingBoxSubstrateServiceBiz; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.stereotype.Service; |
|
|
@@ -41,6 +42,8 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBox |
|
|
|
private WoPackagingBoxMapper mapper; |
|
|
|
@Autowired |
|
|
|
private WoPackagingBoxSubstrateMapper substrateMapper; |
|
|
|
@Autowired |
|
|
|
private WoPackagingBoxSubstrateServiceBiz woPackagingBoxSubstrateServiceBiz; |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
@@ -68,6 +71,9 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBox |
|
|
|
Integer model = Integer.parseInt(params.get("model").toString()); |
|
|
|
wrapper.eq(ObjectUtils.isNotNull(model), WoPackagingBox.MODEL, model); |
|
|
|
} |
|
|
|
if(params.get("startTime")==null && params.get("endTime")==null && params.get("boxNo")==null && params.get("lineBody")==null && params.get("printStatus")==null){ |
|
|
|
wrapper.apply(true, "TO_DAYS(NOW())-TO_DAYS(create_time) = 0"); |
|
|
|
} |
|
|
|
|
|
|
|
return wrapper; |
|
|
|
} |
|
|
@@ -153,13 +159,31 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBox |
|
|
|
List<WoPackagingBox> boxList = new ArrayList<>(); |
|
|
|
for(WoPackagingBoxSubstrate substrate: substrateList){ |
|
|
|
QueryWrapper<WoPackagingBox> boxQueryWrapper = new QueryWrapper<>(); |
|
|
|
boxQueryWrapper.eq(StringUtils.isNotBlank(substrate.getPackagingBoxId()), WoPackagingBox.BOX_NO, substrate.getPackagingBoxId()); |
|
|
|
boxQueryWrapper.like(StringUtils.isNotBlank(substrate.getPackagingBoxId()), WoPackagingBox.BOX_NO, substrate.getPackagingBoxId()); |
|
|
|
List<WoPackagingBox> woPackagingBoxList = mapper.selectList(boxQueryWrapper); |
|
|
|
boxList.addAll(woPackagingBoxList); |
|
|
|
} |
|
|
|
return boxList; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public IdVo insertSubstrateManual(WoPackagingBoxDTO dto) { |
|
|
|
//新增包装箱 |
|
|
|
WoPackagingBox box = ConvertUtils.sourceToTarget(dto, WoPackagingBox.class); |
|
|
|
BaseSupportUtils.setCommonField(box); |
|
|
|
insert(box); |
|
|
|
//新增模组 |
|
|
|
List<WoPackagingBoxSubstrate> substrateList = dto.getSubstrateList(); |
|
|
|
for(WoPackagingBoxSubstrate substrate : substrateList){ |
|
|
|
substrate.setPackagingBoxId(box.getBoxNo()); |
|
|
|
substrate.setPowerLevel(box.getPowerLevel()); |
|
|
|
BaseSupportUtils.setCommonField(substrate); |
|
|
|
woPackagingBoxSubstrateServiceBiz.insert(substrate); |
|
|
|
} |
|
|
|
return IdVo.builder().id(box.getId()).build(); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public int updateIsArrivedByBoxNo(Integer isArrived, String boxNo) { |
|
|
|
return mapper.updateIsArrivedByBoxNo(isArrived,boxNo); |
|
|
|