1.箱轨迹增加检索条件

2.增加修改轨迹状态接口
3.提单修改审核通过生成改单费问题修改
4.提单修改审核报错问题修改
5.海运出口保存时同步船司截单日期到客户订舱
6.提单修改列表增加权限

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

@@ -348,6 +348,18 @@ public class ArchivesTrajectory implements Serializable {
 	private String boxDynamics;
 
 	/**
+	 * 箱好坏
+	 */
+	@ApiModelProperty(value = "箱好坏")
+	private String boxStatus;
+
+	/**
+	 * 轨迹状态
+	 */
+	@ApiModelProperty(value = "轨迹状态")
+	private String trajectoryStatus;
+
+	/**
 	 * 是否还箱 0否1是
 	 */
 	@TableField(exist = false)

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

@@ -87,6 +87,8 @@ public class ArchivesTrajectoryController extends BladeController {
 			.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.getTrajectoryStatus()), ArchivesTrajectory::getTrajectoryStatus, archivesTrajectory.getTrajectoryStatus())
+			.eq(ObjectUtils.isNotNull(archivesTrajectory.getBoxStatus()), ArchivesTrajectory::getBoxStatus, archivesTrajectory.getBoxStatus())
 			.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));
@@ -142,4 +144,13 @@ public class ArchivesTrajectoryController extends BladeController {
 	}
 
 
+	/**
+	 * 修改轨迹状态
+	 */
+	@GetMapping("/updateTrajectoryStatus")
+	public R updateTrajectoryStatus(@RequestParam("id") String id, @RequestParam("type") String type) {
+		return archivesTrajectoryService.updateTrajectoryStatus(id, type);
+	}
+
+
 }

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

@@ -175,4 +175,12 @@ public class BoxDynamicsRecordController extends BladeController {
 	public R synchronous(@RequestParam ("id") String id ,@RequestParam ("ids") String ids)throws IOException {
 		return boxDynamicsRecordService.synchronous(id,ids);
 	}
+
+	/**
+	 * 撤销同步
+	 */
+	@GetMapping("/revokeSynchronous")
+	public R revokeSynchronous(@RequestParam ("id") String id ,@RequestParam ("ids") String ids)throws IOException {
+		return boxDynamicsRecordService.revokeSynchronous(id,ids);
+	}
 }

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

@@ -49,4 +49,6 @@ public interface IBoxDynamicsRecordService extends IService<BoxDynamicsRecord> {
 	R synchronous(String id, String ids) throws IOException;
 
 	R cyctnrItem(ApiRequest apiRequest) throws IOException;
+
+	R revokeSynchronous(String id, String ids)throws IOException;
 }

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

@@ -40,4 +40,6 @@ public interface IArchivesTrajectoryService extends IService<ArchivesTrajectory>
 	IPage<ArchivesTrajectoryVO> selectArchivesTrajectoryPage(IPage<ArchivesTrajectoryVO> page, ArchivesTrajectoryVO archivesTrajectory);
 
     R clearData();
+
+    R updateTrajectoryStatus(String id, String type);
 }

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

@@ -19,14 +19,16 @@ package org.springblade.los.box.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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.box.entity.ArchivesTrajectory;
 import org.springblade.los.box.mapper.ArchivesTrajectoryMapper;
 import org.springblade.los.box.service.IArchivesTrajectoryService;
 import org.springblade.los.box.vo.ArchivesTrajectoryVO;
-import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -58,4 +60,18 @@ public class ArchivesTrajectoryServiceImpl extends ServiceImpl<ArchivesTrajector
 		return R.data("操作成功");
 	}
 
+	@Override
+	public R updateTrajectoryStatus(String id, String type) {
+		if (ObjectUtils.isNull(id)) {
+			throw new RuntimeException("缺少必要请求参数");
+		}
+		ArchivesTrajectory trajectory = baseMapper.selectById(id);
+		trajectory.setTrajectoryStatus(type);
+		trajectory.setUpdateUser(AuthUtil.getUserId());
+		trajectory.setUpdateUserName(AuthUtil.getUserName());
+		trajectory.setUpdateTime(new Date());
+		baseMapper.updateById(trajectory);
+		return R.success("操作成功");
+	}
+
 }

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

@@ -32,6 +32,7 @@ import org.springblade.core.tool.utils.Func;
 import org.springblade.los.business.sea.entity.Deadline;
 import org.springblade.los.business.sea.service.IDeadlineService;
 import org.springblade.los.business.sea.vo.DeadlineVO;
+import org.springblade.los.finance.operatingExpenses.entity.OperatingExpenses;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -73,6 +74,12 @@ public class DeadlineController extends BladeController {
 			.like(ObjectUtils.isNotNull(deadline.getSrcBillNo()), Deadline::getSrcBillNo, deadline.getSrcBillNo())
 			.apply(ObjectUtils.isNotNull(deadline.getBillStatus()), "find_in_set(bill_status,'" + deadline.getBillStatus() + "')")
 			.orderByDesc(Deadline::getCreateTime);
+		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
+			lambdaQueryWrapper.eq(Deadline::getCreateUser, AuthUtil.getUserId());
+		} else {
+			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(deadline.getBranchId()), Deadline::getBranchId, deadline.getBranchId());
+			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(deadline.getBranchName()), Deadline::getBranchName, deadline.getBranchName());
+		}
 		IPage<Deadline> pages = deadlineService.page(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(pages);
 	}

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

@@ -358,6 +358,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 					bills1.setVoyageNo(bills.getVoyageNo());
 					bills1.setCyReturnTime(bills.getCyReturnTime());
 					bills1.setCyTrailerTime(bills.getCyTrailerTime());
+					bills1.setShippingCompanyDeadline(bills.getShippingCompanyDeadline());
 					bills1.setSiRemarks(bills.getSiRemarks());
 					bills1.setEtd(bills.getEtd());
 					bills1.setActualEtd(bills.getActualEtd());

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

@@ -420,6 +420,7 @@ public class DeadlineServiceImpl extends ServiceImpl<DeadlineMapper, Deadline> i
 				deadlineContainers.setVgmWeight(item.getVgmWeight());
 				if (ObjectUtils.isNotNull(item.getTare())) {
 					deadlineContainers.setTare(item.getTare().toString());
+					deadlineContainers.setDeadlineTare(item.getTare().toString());
 				}
 				deadlineContainers.setDeadlineCntrNo(item.getCntrNo());
 				deadlineContainers.setDeadlineSealNo(item.getSealNo());
@@ -427,7 +428,6 @@ public class DeadlineServiceImpl extends ServiceImpl<DeadlineMapper, Deadline> i
 				deadlineContainers.setDeadlineGrossWeight(item.getGrossWeight());
 				deadlineContainers.setDeadlineMeasurement(item.getMeasurement());
 				deadlineContainers.setDeadlineVgmWeight(item.getVgmWeight());
-				deadlineContainers.setDeadlineTare(item.getTare() + "");
 				deadlineContainers.setSrcItemId(item.getId());
 				deadlineContainersList.add(deadlineContainers);
 			}

blade-service/blade-los/src/main/java/org/springblade/los/check/service/impl/AuditProecessServiceImpl.java

@@ -1577,7 +1577,7 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, L
 		}
 		BigDecimal amendmentFee = new BigDecimal("0");
 		String deptName = "";
-		String branchId = AuthUtil.getDeptId();
+		String branchId = bills.getBranchId();
 		R<Dept> res = sysClient.getDept(Long.parseLong(branchId));
 		if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
 			deptName = res.getData().getDeptName();
@@ -1693,8 +1693,8 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, L
 				}
 			}
 			feeCenter.setUnsettledAmount(feeCenter.getAmount());
-			feeCenter.setCreateUser(AuthUtil.getUserId());
-			feeCenter.setCreateUserName(AuthUtil.getUserName());
+			feeCenter.setCreateUser(bills.getOperatorId());
+			feeCenter.setCreateUserName(bills.getOperatorName());
 			feeCenter.setCreateTime(new Date());
 			feeCenter.setAutomaticGenerated("1");
 
@@ -2054,8 +2054,10 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, L
 					}
 					//皮重
 					if (ObjectUtils.isNotNull(item.getDeadlineTare()) && !item.getDeadlineTare().equals(item.getTare())) {
-						containers.setTare(new BigDecimal(item.getDeadlineTare()));
-						containersStatus = true;
+						if (!"null".equals(item.getDeadlineTare())){
+							containers.setTare(new BigDecimal(item.getDeadlineTare()));
+							containersStatus = true;
+						}
 					}
 					if (containersStatus) {
 						containersArrayList.add(containers);

blade-service/blade-los/src/main/java/org/springblade/los/enums/BoxDynamicsEnums.java

@@ -21,9 +21,9 @@ public enum BoxDynamicsEnums {
 	 */
 	K("K", "驳空箱"),
 	/**
-	 * 退关箱
+	 * 无货返空
 	 */
-	TJ("TJ", "退关箱"),
+	TJ("TJ", "无货返空"),
 	/**
 	 * 调拨新箱
 	 */

blade-service/blade-los/src/main/java/org/springblade/los/finance/invoices/service/impl/FinInvoicesServiceImpl.java

@@ -215,18 +215,18 @@ public class FinInvoicesServiceImpl extends ServiceImpl<FinInvoicesMapper, FinIn
 						amountLocC = amountLocC.add(item.getCurrentAmount());
 					}
 				} else {
-					item.setCurrentAmountLoc(item.getCurrentAmount().multiply(item.getExrate()));
+					item.setCurrentAmountLoc(item.getCurrentAmount().multiply(item.getCurrentExrate()));
 					if ("1".equals(finInvoices.getIsExchangeToCny())) {
-						item.setCurrentAmountEx(item.getCurrentAmount().multiply(item.getExrate()));
+						item.setCurrentAmountEx(item.getCurrentAmount().multiply(item.getCurrentExrate()));
 					} else {
-						item.setCurrentAmountEx(item.getCurrentAmount().multiply(item.getExrate()));
+						item.setCurrentAmountEx(item.getCurrentAmount().multiply(item.getCurrentExrate()));
 					}
 					if ("D".equals(item.getDc())) {
 						amountUsdD = amountUsdD.add(item.getCurrentAmount());
-						amountLocD = amountLocD.add(item.getCurrentAmount().multiply(item.getExrate()));
+						amountLocD = amountLocD.add(item.getCurrentAmount().multiply(item.getCurrentExrate()));
 					} else {
 						amountUsdC = amountUsdC.add(item.getCurrentAmount());
-						amountLocC = amountLocC.add(item.getCurrentAmount().multiply(item.getExrate()));
+						amountLocC = amountLocC.add(item.getCurrentAmount().multiply(item.getCurrentExrate()));
 					}
 				}
 				item.setPid(finInvoices.getId());