1.增加文件中心一键保存

2.箱池动态导入箱黑名单判断修改

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

@@ -23,7 +23,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
 import org.springblade.client.entity.BasicContainerDesc;
 import org.springblade.client.entity.BasicPortDesc;
-import org.springblade.client.entity.CorpsDesc;
 import org.springblade.client.feign.IContainerDescClient;
 import org.springblade.client.feign.ICorpsDescClient;
 import org.springblade.client.feign.IPortClient;
@@ -44,6 +43,7 @@ import org.springblade.los.box.mapper.ArchivesMapper;
 import org.springblade.los.box.mapper.TradingBoxMapper;
 import org.springblade.los.box.service.IArchivesService;
 import org.springblade.los.box.vo.ArchivesVO;
+import org.springblade.system.feign.ISysClient;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -74,6 +74,8 @@ public class ArchivesServiceImpl extends ServiceImpl<ArchivesMapper, Archives> i
 
 	private final IBPortsService bPortsService;
 
+	private final ISysClient sysClient;
+
 	@Override
 	public IPage<ArchivesVO> selectArchivesPage(IPage<ArchivesVO> page, ArchivesVO archives) {
 		return page.setRecords(baseMapper.selectArchivesPage(page, archives));
@@ -179,17 +181,46 @@ public class ArchivesServiceImpl extends ServiceImpl<ArchivesMapper, Archives> i
 			.eq(BPorts::getTenantId, AuthUtil.getTenantId())
 			.eq(BPorts::getIsDeleted, 0)
 			.in(BPorts::getCnName, portsList));
+		String blacklist = sysClient.getParamService("box.blacklist");
+		StringBuilder textCode = new StringBuilder();
+		StringBuilder textContainerNumber = new StringBuilder();
+		StringBuilder textType = new StringBuilder();
+		StringBuilder text = new StringBuilder();
 		for (ArchivesExcelEnter archivesExcelEnter : excelList) {
-			Archives archives = new Archives();
 			if (ObjectUtils.isNull(archivesExcelEnter.getCode())) {
-				throw new RuntimeException("箱号不能为空");
+				textCode.append(archivesExcelEnter.getCode()).append(",");
+			}
+			if (ObjectUtils.isNotNull(blacklist)) {
+				if (archivesExcelEnter.getCode().length() > 3) {
+					String head = archivesExcelEnter.getCode().substring(0, 4);
+					if (blacklist.contains(head)) {
+						text.append(archivesExcelEnter.getTypeName()).append(",");
+					}
+				}
 			}
 			if (ObjectUtils.isNull(archivesExcelEnter.getContainerNumber())) {
+				textContainerNumber.append(archivesExcelEnter.getContainerNumber()).append(",");
 				throw new RuntimeException("放箱号不能为空");
 			}
 			if (ObjectUtils.isNull(archivesExcelEnter.getTypeName())) {
+				textType.append(archivesExcelEnter.getTypeName()).append(",");
 				throw new RuntimeException("箱型不能为空");
 			}
+		}
+		if (ObjectUtils.isNotNull(textCode)) {
+			throw new RuntimeException("箱号:" + textCode + "不能为空");
+		}
+		if (ObjectUtils.isNotNull(textContainerNumber)) {
+			throw new RuntimeException("箱号:" + textContainerNumber + "放箱号不能为空");
+		}
+		if (ObjectUtils.isNotNull(textType)) {
+			throw new RuntimeException("箱号:" + textType + "箱型不能为空");
+		}
+		if (ObjectUtils.isNotNull(text)) {
+			throw new RuntimeException("箱号：" + text + "为黑名单箱，请修改数据后再操作");
+		}
+		for (ArchivesExcelEnter archivesExcelEnter : excelList) {
+			Archives archives = new Archives();
 			BeanUtil.copy(archivesExcelEnter, archives);
 			//港口
 			if (ObjectUtils.isNotNull(archives.getAddressCname())) {

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

@@ -693,7 +693,7 @@ public class PutBoxServiceImpl extends ServiceImpl<PutBoxMapper, PutBox> impleme
 			StringBuilder text = new StringBuilder();
 			for (String item : boxCodeList) {
 				if (item.length() > 3) {
-					String head = item.substring(0, 3);
+					String head = item.substring(0, 4);
 					if (blacklist.contains(head)) {
 						text.append(item).append(",");
 					}
@@ -2592,7 +2592,7 @@ public class PutBoxServiceImpl extends ServiceImpl<PutBoxMapper, PutBox> impleme
 			StringBuilder text = new StringBuilder();
 			for (String item : boxCodeList) {
 				if (item.length() > 3) {
-					String head = item.substring(0, 3);
+					String head = item.substring(0, 4);
 					if (blacklist.contains(head)) {
 						text.append(item).append(",");
 					}
@@ -2736,6 +2736,7 @@ public class PutBoxServiceImpl extends ServiceImpl<PutBoxMapper, PutBox> impleme
 						putBoxItem.setContainerNumber(item.getContainerNumber());
 						putBoxItem.setBoxCode(item.getBoxCode());
 						putBoxItem.setBoxType(item.getBoxType());
+						putBoxItem.setBoxClass(putBox.getBusType());
 						putBoxItem.setMblno(item.getMblno());
 						putBoxItem.setBoxDynamics("空箱提箱进场");
 						putBoxItem.setPolCyId(corps.getId());
@@ -2752,6 +2753,7 @@ public class PutBoxServiceImpl extends ServiceImpl<PutBoxMapper, PutBox> impleme
 					putBoxItem.setBoxCondition("新");
 					putBoxItem.setBoxStatus("好");
 					putBoxItem.setStatus("待使用");
+					putBoxItem.setBoxClass(putBox.getBusType());
 					putBoxItem.setPid(putBox.getId());
 					putBoxItem.setContainerNumber(item.getContainerNumber());
 					putBoxItem.setBoxCode(item.getBoxCode());
@@ -3733,7 +3735,7 @@ public class PutBoxServiceImpl extends ServiceImpl<PutBoxMapper, PutBox> impleme
 			StringBuilder text = new StringBuilder();
 			for (String item : boxCodeList) {
 				if (item.length() > 3) {
-					String head = item.substring(0, 3);
+					String head = item.substring(0, 4);
 					if (blacklist.contains(head)) {
 						text.append(item).append(",");
 					}
@@ -3929,7 +3931,7 @@ public class PutBoxServiceImpl extends ServiceImpl<PutBoxMapper, PutBox> impleme
 			StringBuilder text = new StringBuilder();
 			for (String item : boxCodeList) {
 				if (item.length() > 3) {
-					String head = item.substring(0, 3);
+					String head = item.substring(0, 4);
 					if (blacklist.contains(head)) {
 						text.append(item).append(",");
 					}

blade-service/blade-los/src/main/java/org/springblade/los/business/files/controller/FilesCenterController.java

@@ -25,6 +25,7 @@ import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.los.business.files.entity.FilesCenter;
@@ -33,6 +34,8 @@ import org.springblade.los.business.files.vo.FilesCenterVO;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 物流-文件中心 控制器
@@ -111,6 +114,28 @@ public class FilesCenterController extends BladeController {
 		return filesCenterService.submit(filesCenter);
 	}
 
+	/**
+	 * 新增或修改 物流-文件中心
+	 */
+	@PostMapping("/submitList")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入filesCenter")
+	public R submitList(@Valid @RequestBody List<FilesCenter> filesCenter) {
+		for (FilesCenter item : filesCenter){
+			if (item.getId() == null){
+				item.setCreateUser(AuthUtil.getUserId());
+				item.setCreateUserName(AuthUtil.getUserName());
+				item.setCreateTime(new Date());
+			}else{
+				item.setUpdateUser(AuthUtil.getUserId());
+				item.setUpdateUserName(AuthUtil.getUserName());
+				item.setUpdateTime(new Date());
+			}
+		}
+		filesCenterService.saveOrUpdateBatch(filesCenter);
+		return R.data(filesCenter);
+	}
+
 
 	/**
 	 * 删除 物流-文件中心

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/mapper/ContainersMapper.xml

@@ -165,11 +165,10 @@
             </if>
         </if>
         <if test='data.whether != null and data.whether != "" and data.whether == "0"'>
-            and sc.pod_station_cname is null
+            and sc.pod_station_id is null
         </if>
         <if test='data.whether != null and data.whether != ""  and data.whether == "1"'>
-            and sc.pod_station_cname is not null
-            and  sc.pod_station_cname != ''
+            and sc.pod_station_id is not null
         </if>
         GROUP BY sc.id
     </select>
@@ -262,11 +261,10 @@
             </if>
         </if>
         <if test='data.whether != null and data.whether != "" and data.whether == "0"'>
-            and sc.pod_station_cname is null
+            and sc.pod_station_id is null
         </if>
         <if test='data.whether != null and data.whether != ""  and data.whether == "1"'>
-            and sc.pod_station_cname is not null
-            and  sc.pod_station_cname != ''
+            and sc.pod_station_id is not null
         </if>
         GROUP BY sc.id
     </select>