1.箱轨迹增加检索条件

2.增加校验是否存在相同船名航次起运港单据并且开船日期不同接口
3.增加更新相同船名航次起运港单据开船日期接口
4.箱轨迹增加分单号字段
5.海运出口配箱列表增加行删除接口
6.配箱信息增加是否系统生成字段用于前端区分处理

blade-service-api/blade-los-api/src/main/java/org/springblade/los/box/entity/ArchivesTrajectory.java

@@ -310,6 +310,12 @@ public class ArchivesTrajectory implements Serializable {
 	private String mblno;
 
 	/**
+	 * 分单号
+	 */
+	@ApiModelProperty(value = "分单号")
+	private String hblno;
+
+	/**
 	 * 船名
 	 */
 	@ApiModelProperty(value = "船名")

blade-service-api/blade-los-api/src/main/java/org/springblade/los/business/sea/entity/Containers.java

@@ -634,6 +634,12 @@ public class Containers implements Serializable {
 	private String actualEta;
 
 	/**
+	 * 是否系统生成
+	 */
+	@ApiModelProperty(value = "是否系统生成")
+	private String whetherSystemGenerate;
+
+	/**
 	 * 配箱类型
 	 */
 	@TableField(exist = false)

blade-service/blade-los/src/main/java/org/springblade/los/box/controller/ArchivesTrajectoryController.java

@@ -33,11 +33,9 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.los.box.entity.ArchivesTrajectory;
 import org.springblade.los.box.service.IArchivesTrajectoryService;
-import org.springblade.los.box.vo.ArchivesTrajectoryVO;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import java.util.Date;
 
 /**
  * 箱轨迹表 控制器
@@ -73,13 +71,18 @@ public class ArchivesTrajectoryController extends BladeController {
 	public R<IPage<ArchivesTrajectory>> list(ArchivesTrajectory archivesTrajectory, Query query) {
 		LambdaQueryWrapper<ArchivesTrajectory> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(ArchivesTrajectory::getTenantId, AuthUtil.getTenantId()).eq(ArchivesTrajectory::getIsDeleted, 0).like(ObjectUtils.isNotNull(archivesTrajectory.getCode()), ArchivesTrajectory::getCode, archivesTrajectory.getCode())//箱号
-			.like(ObjectUtils.isNotNull(archivesTrajectory.getPortCname()), ArchivesTrajectory::getPortCname, archivesTrajectory.getPortCname())//地点
-			.like(ObjectUtils.isNotNull(archivesTrajectory.getStationCname()), ArchivesTrajectory::getStationCname, archivesTrajectory.getStationCname())//地点
-			.like(ObjectUtils.isNotNull(archivesTrajectory.getBoxDynamics()), ArchivesTrajectory::getBoxDynamics, archivesTrajectory.getBoxDynamics())//地点
-			.like(ObjectUtils.isNotNull(archivesTrajectory.getCode()), ArchivesTrajectory::getCode, archivesTrajectory.getCode())//地点
-			.eq(ObjectUtils.isNotNull(archivesTrajectory.getBillType()), ArchivesTrajectory::getBillType, archivesTrajectory.getBillType())//业务类型
-			.eq(ObjectUtils.isNotNull(archivesTrajectory.getStatus()), ArchivesTrajectory::getStatus, archivesTrajectory.getStatus())//状态
-			.eq(ObjectUtils.isNotNull(archivesTrajectory.getCorpId()), ArchivesTrajectory::getCorpId, archivesTrajectory.getCorpId());//客户
+			.like(ObjectUtils.isNotNull(archivesTrajectory.getPortCname()), ArchivesTrajectory::getPortCname, archivesTrajectory.getPortCname())
+			.like(ObjectUtils.isNotNull(archivesTrajectory.getStationCname()), ArchivesTrajectory::getStationCname, archivesTrajectory.getStationCname())
+			.like(ObjectUtils.isNotNull(archivesTrajectory.getBoxDynamics()), ArchivesTrajectory::getBoxDynamics, archivesTrajectory.getBoxDynamics())
+//			.like(ObjectUtils.isNotNull(archivesTrajectory.getCode()), ArchivesTrajectory::getCode, archivesTrajectory.getCode())
+			.like(ObjectUtils.isNotNull(archivesTrajectory.getContainerNumber()), ArchivesTrajectory::getContainerNumber, archivesTrajectory.getContainerNumber())
+			.eq(ObjectUtils.isNotNull(archivesTrajectory.getBoxCategory()), ArchivesTrajectory::getBoxCategory, archivesTrajectory.getBoxCategory())
+			.like(ObjectUtils.isNotNull(archivesTrajectory.getMblno()), ArchivesTrajectory::getMblno, archivesTrajectory.getMblno())
+			.like(ObjectUtils.isNotNull(archivesTrajectory.getHblno()), ArchivesTrajectory::getHblno, archivesTrajectory.getHblno())
+			.apply(ObjectUtils.isNotNull(archivesTrajectory.getCode()), "find_in_set(code,'" + archivesTrajectory.getCode() + "')")
+			.eq(ObjectUtils.isNotNull(archivesTrajectory.getBillType()), ArchivesTrajectory::getBillType, archivesTrajectory.getBillType())
+			.eq(ObjectUtils.isNotNull(archivesTrajectory.getStatus()), ArchivesTrajectory::getStatus, archivesTrajectory.getStatus())
+			.eq(ObjectUtils.isNotNull(archivesTrajectory.getCorpId()), ArchivesTrajectory::getCorpId, archivesTrajectory.getCorpId());
 		if (archivesTrajectory.getNewDateList() != null && archivesTrajectory.getNewDateList().size() > 1) {//日期
 			lambdaQueryWrapper.ge(ArchivesTrajectory::getNewDate, archivesTrajectory.getNewDateList().get(0));
 			lambdaQueryWrapper.le(ArchivesTrajectory::getNewDate, archivesTrajectory.getNewDateList().get(1));
@@ -94,6 +97,7 @@ public class ArchivesTrajectoryController extends BladeController {
 		lambdaQueryWrapper.groupBy(ArchivesTrajectory::getStationId);
 		lambdaQueryWrapper.groupBy(ArchivesTrajectory::getContainerNumber);
 		lambdaQueryWrapper.groupBy(ArchivesTrajectory::getMblno);
+		lambdaQueryWrapper.groupBy(ArchivesTrajectory::getHblno);
 		lambdaQueryWrapper.groupBy(ArchivesTrajectory::getSrcId);
 		lambdaQueryWrapper.orderByDesc(ArchivesTrajectory::getCreateTime);
 		IPage<ArchivesTrajectory> pages = archivesTrajectoryService.page(Condition.getPage(query), lambdaQueryWrapper);

blade-service/blade-los/src/main/java/org/springblade/los/box/dynamics/service/impl/BoxDynamicsRecordServiceImpl.java

@@ -3528,6 +3528,7 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 						archivesTrajectory.setBoxEastId(item.getBoxEastId());
 						archivesTrajectory.setBoxEastName(item.getBoxEastName());
 						archivesTrajectory.setMblno(item.getMblno());
+						archivesTrajectory.setHblno(item.getHblno());
 						archivesTrajectory.setBoxDynamics("空箱进场");
 						archivesTrajectory.setStatus(tradingBox.getBoxClass());
 						archivesTrajectory.setCorpId(item.getBoxEastId());
@@ -4236,6 +4237,7 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 									archivesTrajectory.setBoxEastId(item.getBoxEastId());
 									archivesTrajectory.setBoxEastName(item.getBoxEastName());
 									archivesTrajectory.setMblno(item.getMblno());
+									archivesTrajectory.setHblno(item.getHblno());
 									archivesTrajectory.setBoxDynamics("空箱返场");
 									archivesTrajectory.setStatus(item.getBoxDynamics());
 									archivesTrajectory.setBillType(putBox.getBoxClass());
@@ -4766,6 +4768,7 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 							archivesTrajectory.setBoxEastId(item.getBoxEastId());
 							archivesTrajectory.setBoxEastName(item.getBoxEastName());
 							archivesTrajectory.setMblno(item.getMblno());
+							archivesTrajectory.setHblno(item.getHblno());
 							archivesTrajectory.setBoxDynamics("调箱进场");
 							archivesTrajectory.setStatus(tradingBox.getBoxClass());
 							archivesTrajectory.setCorpId(item.getBoxEastId());
@@ -5283,6 +5286,7 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 							archivesTrajectory.setBoxEastId(item.getBoxEastId());
 							archivesTrajectory.setBoxEastName(item.getBoxEastName());
 							archivesTrajectory.setMblno(item.getMblno());
+							archivesTrajectory.setHblno(item.getHblno());
 							archivesTrajectory.setBoxDynamics("调箱出场");
 							archivesTrajectory.setStatus(tradingBox.getBoxClass());
 							archivesTrajectory.setCorpId(item.getBoxEastId());
@@ -6034,6 +6038,7 @@ public class BoxDynamicsRecordServiceImpl extends ServiceImpl<BoxDynamicsRecordM
 							archivesTrajectory.setBoxEastId(item.getBoxEastId());
 							archivesTrajectory.setBoxEastName(item.getBoxEastName());
 							archivesTrajectory.setMblno(item.getMblno());
+							archivesTrajectory.setHblno(item.getHblno());
 							archivesTrajectory.setBoxDynamics("空箱出场");
 							archivesTrajectory.setStatus(tradingBox.getBoxClass());
 							archivesTrajectory.setCorpId(item.getBoxEastId());

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/controller/BillsController.java

@@ -50,6 +50,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -681,8 +682,8 @@ public class BillsController extends BladeController {
 				.like(Bills::getCorpEnName, bills.getCorpCnName()))
 			.and(ObjectUtils.isNotNull(bills.getCarrierCnName()), i -> i.like(Bills::getCarrierCnName, bills.getCarrierCnName()).or()
 				.like(Bills::getCarrierEnName, bills.getCarrierCnName()).or().like(Bills::getCarrierArgreementNo, bills.getCarrierCnName()))
-			.and(ObjectUtils.isNotNull(bills.getPodCnName()), i -> i.like(Bills::getPodCnName, bills.getPodCnName()).or()
-				.like(Bills::getPodEnName, bills.getPodCnName()).or().like(Bills::getPodCode, bills.getPodCnName()))
+			.and(ObjectUtils.isNotNull(bills.getPodEnName()), i -> i.like(Bills::getPodCnName, bills.getPodEnName()).or()
+				.like(Bills::getPodEnName, bills.getPodEnName()).or().like(Bills::getPodCode, bills.getPodEnName()))
 			.and(ObjectUtils.isNotNull(bills.getPolEnName()), i -> i.like(Bills::getPolCnName, bills.getPolEnName()).or()
 				.like(Bills::getPolEnName, bills.getPolEnName()).or().like(Bills::getPolCode, bills.getPolEnName()))
 			.and(ObjectUtils.isNotNull(bills.getLineCnName()), i -> i.like(Bills::getLineCnName, bills.getLineCnName()).or()
@@ -1066,5 +1067,23 @@ public class BillsController extends BladeController {
 		ExcelUtil.export(response, "下货纸数据", "下货纸数据", excelList, DeliveryPaperExcel.class);
 	}
 
+
+	/**
+	 * 校验是否存在相同船名航次起运港单据并且开船日期不同
+	 */
+	@GetMapping("/verifyData")
+	public R verifyData(@RequestParam("vesselId") Long vesselId,@RequestParam("voyageNo") String voyageNo,@RequestParam("polId") Long polId) {
+		return billsService.verifyData(vesselId,voyageNo,polId);
+	}
+
+	/**
+	 * 更新相同船名航次起运港单据开船日期
+	 */
+	@GetMapping("/updateVerifyData")
+	public R updateVerifyData(@RequestParam("vesselId") Long vesselId,@RequestParam("voyageNo") String voyageNo,
+							  @RequestParam("polId") Long polId,@RequestParam("etd") Date etd) {
+		return billsService.updateVerifyData(vesselId,voyageNo,polId,etd);
+	}
+
 }
 

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/controller/ContainersController.java

@@ -226,6 +226,14 @@ public class ContainersController extends BladeController {
 	}
 
 	/**
+	 * 删除 配箱信息
+	 */
+	@GetMapping("/removeById")
+	public R removeById( @RequestParam("id") Long id) {
+		return containersService.deleteById(id);
+	}
+
+	/**
 	 * 配箱 - 平均分配件数
 	 */
 	@PostMapping("/equalDistribution")

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/IBillsService.java

@@ -27,6 +27,7 @@ import org.springblade.los.check.entity.LosAuditPathsLevels;
 import org.springblade.los.excel.DeliveryPaperExcel;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -250,4 +251,8 @@ public interface IBillsService extends IService<Bills> {
 	List<DeliveryPaperExcel> sendDeliveryPaperExport(String ids);
 
 	R synchronizeCustoms(Bills bills);
+
+	R verifyData(Long vesselId, String voyageNo, Long polId);
+
+	R updateVerifyData(Long vesselId, String voyageNo, Long polId, Date etd);
 }

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/IContainersService.java

@@ -91,4 +91,6 @@ public interface IContainersService extends IService<Containers> {
 	IPage<UpdatePodStationExcel> updatePodStationPage(IPage<UpdatePodStationExcel> page, UpdatePodStationExcel excel);
 
 	List<UpdatePodStationExcel> updatePodStationList(UpdatePodStationExcel excel);
+
+	R deleteById(Long id);
 }

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/BillsServiceImpl.java

@@ -161,6 +161,8 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 
 	private final IBillUtils billUtils;
 
+	private final IBPortsService bPortsService;
+
 	@Override
 	public IPage<Bills> selectBillsPage(IPage<Bills> page, Bills bills) {
 		return page.setRecords(baseMapper.selectBillsPage(page, bills));
@@ -507,7 +509,9 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				item.setVesselCnName(bills.getVesselCnName());
 				item.setVoyageNo(bills.getVoyageNo());
 				item.setMblno(bills.getMblno());
-				item.setHblno(bills.getHblno());
+				if (!"MM".equals(bills.getBillType())) {
+					item.setHblno(bills.getHblno());
+				}
 				item.setEtd(bills.getEtd());
 				item.setEta(bills.getEta());
 				item.setPolId(bills.getPolId());
@@ -579,9 +583,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				item.setVesselCnName(bills.getVesselCnName());
 				item.setVoyageNo(bills.getVoyageNo());
 				item.setMblno(bills.getMblno());
-				if (ObjectUtils.isNotNull(item.getSrcItemId())) {
-					item.setHblno(null);
-				} else {
+				if (!"MM".equals(bills.getBillType())) {
 					item.setHblno(bills.getHblno());
 				}
 				item.setEtd(bills.getEtd());
@@ -4912,6 +4914,12 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			}
 			filesCenterService.saveOrUpdateBatch(bills.getFilesList());
 		}
+		if (ObjectUtils.isNotNull(bills.getPodId())) {
+			BPorts bPorts = bPortsService.getById(bills.getPodId());
+			if (bPorts != null && !bPorts.getEnName().equals(bills.getPodEnName())) {
+				bills.setPodEnName(bPorts.getEnName());
+			}
+		}
 		this.updateById(bills);
 		return R.data(bills);
 	}
@@ -6726,4 +6734,68 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		}
 		return R.data(bills);
 	}
+
+	@Override
+	public R verifyData(Long vesselId, String voyageNo, Long polId) {
+		Bills bills = baseMapper.selectOne(new LambdaQueryWrapper<Bills>()
+			.eq(Bills::getTenantId, AuthUtil.getTenantId())
+			.eq(Bills::getIsDeleted, 0)
+			.eq(Bills::getVesselId, vesselId)
+			.eq(Bills::getVoyageNo, voyageNo)
+			.eq(Bills::getPolId, polId)
+			.last("LIMIT 1"));
+		return R.data(bills);
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public R updateVerifyData(Long vesselId, String voyageNo, Long polId, Date etd) {
+		List<Bills> billsList = baseMapper.selectList(new LambdaQueryWrapper<Bills>()
+			.eq(Bills::getTenantId, AuthUtil.getTenantId())
+			.eq(Bills::getIsDeleted, 0)
+			.ne(Bills::getBillStatus, 3)
+			.eq(Bills::getVesselId, vesselId)
+			.eq(Bills::getVoyageNo, voyageNo)
+			.eq(Bills::getPolId, polId));
+		if (!billsList.isEmpty()) {
+			for (Bills item : billsList) {
+				item.setEtd(etd);
+				item.setUpdateUser(AuthUtil.getUserId());
+				item.setUpdateUserName(AuthUtil.getUserName());
+				item.setUpdateTime(new Date());
+			}
+			this.updateBatchById(billsList);
+			List<FeeCenter> feeCenterList = feeCenterService.list(new LambdaQueryWrapper<FeeCenter>()
+				.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
+				.eq(FeeCenter::getIsDeleted, 0)
+				.in(FeeCenter::getPid, billsList.stream().map(Bills::getId).distinct().collect(Collectors.toList())));
+			if (!feeCenterList.isEmpty()){
+				for (FeeCenter item : feeCenterList) {
+					item.setEtd(etd);
+					int version = StringUtil.isBlank(item.getVersion()) ? 1 : Integer.parseInt(item.getVersion());
+					item.setVersion(String.valueOf(version + 1));
+					item.setUpdateUser(AuthUtil.getUserId());
+					item.setUpdateUserName(AuthUtil.getUserName());
+					item.setUpdateTime(new Date());
+				}
+				feeCenterService.updateBatchById(feeCenterList);
+			}
+			List<FinAccBills> finAccBillsList = finAccBillsService.list(new LambdaQueryWrapper<FinAccBills>()
+				.eq(FinAccBills::getTenantId, AuthUtil.getTenantId())
+				.eq(FinAccBills::getIsDeleted, 0)
+				.in(FinAccBills::getBusinessBillId, billsList.stream().map(Bills::getId).distinct().collect(Collectors.toList())));
+			if (!finAccBillsList.isEmpty()){
+				for (FinAccBills item : finAccBillsList) {
+					item.setEtd(etd);
+					int version = StringUtil.isBlank(item.getVersion()) ? 1 : Integer.parseInt(item.getVersion());
+					item.setVersion(String.valueOf(version + 1));
+					item.setUpdateUser(AuthUtil.getUserId());
+					item.setUpdateUserName(AuthUtil.getUserName());
+					item.setUpdateTime(new Date());
+				}
+				finAccBillsService.updateBatchById(finAccBillsList);
+			}
+		}
+		return R.data(billsList);
+	}
 }

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/ContainersServiceImpl.java

@@ -416,17 +416,17 @@ public class ContainersServiceImpl extends ServiceImpl<ContainersMapper, Contain
 				if (!cntrTypeList.contains(item.getCntrTypeCode())) {
 					throw new RuntimeException("箱型" + item.getCntrTypeCode() + "与单据箱型不符");
 				}
-			}else{
+			} else {
 				throw new RuntimeException("请先维护单据箱型");
 			}
 			if (bills != null) {
-				if ("SI".equals(bills.getBusinessType())){
+				if ("SI".equals(bills.getBusinessType())) {
 					if ("MH".equals(bills.getBillType()) && ObjectUtils.isNotNull(item.getHblno())) {
 						if (!bills.getHblno().equals(item.getHblno())) {
 							throw new RuntimeException("导入提单号与单据提单号不一致");
 						}
 					}
-				}else{
+				} else {
 					if ("MH".equals(bills.getBillType())) {
 						if (!bills.getHblno().equals(item.getHblno())) {
 							throw new RuntimeException("导入提单号与单据提单号不一致");
@@ -511,7 +511,7 @@ public class ContainersServiceImpl extends ServiceImpl<ContainersMapper, Contain
 		List<ContainersCommodity> containersCommodityList = new ArrayList<>();
 		Bills bills = billsMapper.selectById(list.get(0).getPid());
 		quantity = list.stream().map(Containers::getQuantity).filter(ObjectUtils::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add);
-		if (quantity.compareTo(BigDecimal.ZERO) > 0){
+		if (quantity.compareTo(BigDecimal.ZERO) > 0) {
 			bills.setQuantity(quantity);
 			bills.setGrossWeight(list.stream().map(Containers::getGrossWeight).filter(ObjectUtils::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 			bills.setMeasurement(list.stream().map(Containers::getMeasurement).filter(ObjectUtils::isNotNull).reduce(BigDecimal.ZERO, BigDecimal::add));
@@ -720,4 +720,21 @@ public class ContainersServiceImpl extends ServiceImpl<ContainersMapper, Contain
 		return baseMapper.updatePodStationList(excel);
 	}
 
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public R deleteById(Long id) {
+		Containers containers = baseMapper.selectById(id);
+		if (containers != null) {
+			baseMapper.deleteById(id);
+			Containers containers1 = baseMapper.selectOne(new LambdaQueryWrapper<Containers>()
+				.eq(Containers::getTenantId, AuthUtil.getTenantId())
+				.eq(Containers::getIsDeleted, 0)
+				.eq(Containers::getSrcSplitOrderId,containers.getId()));
+			if (containers1 != null){
+				baseMapper.deleteById(containers1.getId());
+			}
+		}
+		return R.success("操作成功");
+	}
+
 }

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/PreContainersServiceImpl.java

@@ -478,6 +478,7 @@ public class PreContainersServiceImpl extends ServiceImpl<PreContainersMapper, P
 				//生成海运进出口配箱-箱号装箱
 				for (int i = 0; i < preContainers.getQuantity(); i++) {
 					Containers containers = new Containers();
+					containers.setWhetherSystemGenerate("1");
 					containers.setCreateTime(new Date());
 					containers.setCreateUser(AuthUtil.getUserId());
 					containers.setCreateUserName(AuthUtil.getUserName());
@@ -531,6 +532,7 @@ public class PreContainersServiceImpl extends ServiceImpl<PreContainersMapper, P
 					//生成海运进出口配箱-箱号装箱
 					for (int i = 0; i < preContainers.getQuantity() - containersArray.size(); i++) {
 						Containers containers = new Containers();
+						containers.setWhetherSystemGenerate("1");
 						containers.setCreateTime(new Date());
 						containers.setCreateUser(AuthUtil.getUserId());
 						containers.setCreateUserName(AuthUtil.getUserName());

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/SeaContainerNumberItemServiceImpl.java

@@ -307,6 +307,7 @@ public class SeaContainerNumberItemServiceImpl extends ServiceImpl<SeaContainerN
 			//生成海运进出口配箱-箱号装箱
 			for (int i = 0; i < preContainers.getQuantity(); i++) {
 				Containers containers = new Containers();
+				containers.setWhetherSystemGenerate("1");
 				containers.setCreateTime(new Date());
 				containers.setCreateUser(AuthUtil.getUserId());
 				containers.setCreateUserName(AuthUtil.getUserName());