2024年11月29日17:25:07

blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/corps/entity/BCorps.java

@@ -591,5 +591,11 @@ public class BCorps implements Serializable {
 	@TableField(exist = false)
 	private String type;
 
+	/**
+	 * 船公司约号
+	 */
+	@ApiModelProperty(value = "船公司约号")
+	private String carrierArgreementNo;
+
 
 }

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

@@ -1006,7 +1006,7 @@ public class Bills implements Serializable {
 	 * 易燃易爆品闪点
 	 */
 	@ApiModelProperty(value = "易燃易爆品闪点")
-	private Integer dgFlashPoint;
+	private String dgFlashPoint;
 	/**
 	 * 易燃易爆品闪点单位
 	 */

blade-service/blade-los/src/main/java/org/springblade/los/basic/cntr/controller/BCntrTypesController.java

@@ -113,9 +113,9 @@ public class BCntrTypesController extends BladeController {
 			.like(ObjectUtils.isNotNull(bCntrTypes.getCode95()), BCntrTypes::getCode95, bCntrTypes.getCode95());
 		String status = sysClient.getParamServiceNew("basic.data.sort");
 		if ("name".equals(status)) {
-			lambdaQueryWrapper.orderByDesc(BCntrTypes::getCnName);
+			lambdaQueryWrapper.orderByAsc(BCntrTypes::getCnName);
 		} else if ("letter".equals(status)) {
-			lambdaQueryWrapper.orderByDesc(BCntrTypes::getCode);
+			lambdaQueryWrapper.orderByAsc(BCntrTypes::getCode);
 		} else {
 			lambdaQueryWrapper.orderByDesc(BCntrTypes::getCreateTime);
 		}

blade-service/blade-los/src/main/java/org/springblade/los/basic/commodity/controller/BCommodityController.java

@@ -90,9 +90,9 @@ public class BCommodityController extends BladeController {
 			.like(ObjectUtils.isNotNull(bCommodity.getStatus()), BCommodity::getStatus, bCommodity.getStatus());
 		String status = sysClient.getParamServiceNew("basic.data.sort");
 		if ("name".equals(status)) {
-			lambdaQueryWrapper.orderByDesc(BCommodity::getCnName);
+			lambdaQueryWrapper.orderByAsc(BCommodity::getCnName);
 		} else if ("letter".equals(status)) {
-			lambdaQueryWrapper.orderByDesc(BCommodity::getHsCode);
+			lambdaQueryWrapper.orderByAsc(BCommodity::getHsCode);
 		} else {
 			lambdaQueryWrapper.orderByDesc(BCommodity::getCreateTime);
 		}

blade-service/blade-los/src/main/java/org/springblade/los/basic/countrys/controller/BCountrysController.java

@@ -91,9 +91,9 @@ public class BCountrysController extends BladeController {
 			.like(ObjectUtils.isNotNull(bCountrys.getStatus()), BCountrys::getStatus, bCountrys.getStatus());
 		String status = sysClient.getParamServiceNew("basic.data.sort");
 		if ("name".equals(status)) {
-			lambdaQueryWrapper.orderByDesc(BCountrys::getCnName);
+			lambdaQueryWrapper.orderByAsc(BCountrys::getCnName);
 		} else if ("letter".equals(status)) {
-			lambdaQueryWrapper.orderByDesc(BCountrys::getCode);
+			lambdaQueryWrapper.orderByAsc(BCountrys::getCode);
 		} else {
 			lambdaQueryWrapper.orderByDesc(BCountrys::getCreateTime);
 		}

blade-service/blade-los/src/main/java/org/springblade/los/basic/fees/controller/BFeesController.java

@@ -95,9 +95,9 @@ public class BFeesController extends BladeController {
 			.like(ObjectUtils.isNotNull(bFees.getFeesTypeId()), BFees::getFeesTypeId, bFees.getFeesTypeId());
 		String status = sysClient.getParamServiceNew("basic.data.sort");
 		if ("name".equals(status)) {
-			lambdaQueryWrapper.orderByDesc(BFees::getCnName);
+			lambdaQueryWrapper.orderByAsc(BFees::getCnName);
 		} else if ("letter".equals(status)) {
-			lambdaQueryWrapper.orderByDesc(BFees::getCode);
+			lambdaQueryWrapper.orderByAsc(BFees::getCode);
 		} else {
 			lambdaQueryWrapper.orderByDesc(BFees::getCreateTime);
 		}

blade-service/blade-los/src/main/java/org/springblade/los/basic/lines/controller/BLinesController.java

@@ -106,9 +106,9 @@ public class BLinesController extends BladeController {
 			.like(ObjectUtils.isNotNull(bLines.getStatus()), BLines::getStatus, bLines.getStatus());
 		String status = sysClient.getParamServiceNew("basic.data.sort");
 		if ("name".equals(status)) {
-			lambdaQueryWrapper.orderByDesc(BLines::getCnName);
+			lambdaQueryWrapper.orderByAsc(BLines::getCnName);
 		} else if ("letter".equals(status)) {
-			lambdaQueryWrapper.orderByDesc(BLines::getCode);
+			lambdaQueryWrapper.orderByAsc(BLines::getCode);
 		} else {
 			lambdaQueryWrapper.orderByDesc(BLines::getCreateTime);
 		}

blade-service/blade-los/src/main/java/org/springblade/los/basic/locations/controller/BLocationsController.java

@@ -94,9 +94,9 @@ public class BLocationsController extends BladeController {
 			.like(ObjectUtils.isNotNull(bLocations.getStatus()), BLocations::getStatus, bLocations.getStatus());
 		String status = sysClient.getParamServiceNew("basic.data.sort");
 		if ("name".equals(status)) {
-			lambdaQueryWrapper.orderByDesc(BLocations::getCnName);
+			lambdaQueryWrapper.orderByAsc(BLocations::getCnName);
 		} else if ("letter".equals(status)) {
-			lambdaQueryWrapper.orderByDesc(BLocations::getCode);
+			lambdaQueryWrapper.orderByAsc(BLocations::getCode);
 		} else {
 			lambdaQueryWrapper.orderByDesc(BLocations::getCreateTime);
 		}

blade-service/blade-los/src/main/java/org/springblade/los/basic/modes/controller/BTradeModesController.java

@@ -92,9 +92,9 @@ public class BTradeModesController extends BladeController {
 			.like(ObjectUtils.isNotNull(bTradeModes.getStatus()), BTradeModes::getStatus, bTradeModes.getStatus());
 		String status = sysClient.getParamServiceNew("basic.data.sort");
 		if ("name".equals(status)) {
-			lambdaQueryWrapper.orderByDesc(BTradeModes::getCnName);
+			lambdaQueryWrapper.orderByAsc(BTradeModes::getCnName);
 		} else if ("letter".equals(status)) {
-			lambdaQueryWrapper.orderByDesc(BTradeModes::getCode);
+			lambdaQueryWrapper.orderByAsc(BTradeModes::getCode);
 		} else {
 			lambdaQueryWrapper.orderByDesc(BTradeModes::getCreateTime);
 		}

blade-service/blade-los/src/main/java/org/springblade/los/basic/packages/controller/BPackagesController.java

@@ -104,9 +104,9 @@ public class BPackagesController extends BladeController {
 			.like(ObjectUtils.isNotNull(bPackages.getStatus()), BPackages::getStatus, bPackages.getStatus());
 		String status = sysClient.getParamServiceNew("basic.data.sort");
 		if ("name".equals(status)) {
-			lambdaQueryWrapper.orderByDesc(BPackages::getCnName);
+			lambdaQueryWrapper.orderByAsc(BPackages::getCnName);
 		} else if ("letter".equals(status)) {
-			lambdaQueryWrapper.orderByDesc(BPackages::getCode);
+			lambdaQueryWrapper.orderByAsc(BPackages::getCode);
 		} else {
 			lambdaQueryWrapper.orderByDesc(BPackages::getCreateTime);
 		}

blade-service/blade-los/src/main/java/org/springblade/los/basic/ports/controller/BPortsController.java

@@ -110,9 +110,9 @@ public class BPortsController extends BladeController {
 			.like(ObjectUtils.isNotNull(bPorts.getStatus()), BPorts::getStatus, bPorts.getStatus());
 		String status = sysClient.getParamServiceNew("basic.data.sort");
 		if ("name".equals(status)) {
-			lambdaQueryWrapper.orderByDesc(BPorts::getCnName);
+			lambdaQueryWrapper.orderByAsc(BPorts::getCnName);
 		} else if ("letter".equals(status)) {
-			lambdaQueryWrapper.orderByDesc(BPorts::getCode);
+			lambdaQueryWrapper.orderByAsc(BPorts::getCode);
 		} else {
 			lambdaQueryWrapper.orderByDesc(BPorts::getCreateTime);
 		}

blade-service/blade-los/src/main/java/org/springblade/los/basic/terms/controller/BServiceTermsController.java

@@ -105,9 +105,9 @@ public class BServiceTermsController extends BladeController {
 			.like(ObjectUtils.isNotNull(bServiceTerms.getStatus()), BServiceTerms::getStatus, bServiceTerms.getStatus());
 		String status = sysClient.getParamServiceNew("basic.data.sort");
 		if ("name".equals(status)) {
-			lambdaQueryWrapper.orderByDesc(BServiceTerms::getCnName);
+			lambdaQueryWrapper.orderByAsc(BServiceTerms::getCnName);
 		} else if ("letter".equals(status)) {
-			lambdaQueryWrapper.orderByDesc(BServiceTerms::getCode);
+			lambdaQueryWrapper.orderByAsc(BServiceTerms::getCode);
 		} else {
 			lambdaQueryWrapper.orderByDesc(BServiceTerms::getCreateTime);
 		}

blade-service/blade-los/src/main/java/org/springblade/los/basic/units/controller/BUnitsController.java

@@ -90,9 +90,9 @@ public class BUnitsController extends BladeController {
 			.like(ObjectUtils.isNotNull(bUnits.getQuantityRule()), BUnits::getQuantityRule, bUnits.getQuantityRule());
 		String status = sysClient.getParamServiceNew("basic.data.sort");
 		if ("name".equals(status)) {
-			lambdaQueryWrapper.orderByDesc(BUnits::getCnName);
+			lambdaQueryWrapper.orderByAsc(BUnits::getCnName);
 		} else if ("letter".equals(status)) {
-			lambdaQueryWrapper.orderByDesc(BUnits::getCode);
+			lambdaQueryWrapper.orderByAsc(BUnits::getCode);
 		} else {
 			lambdaQueryWrapper.orderByDesc(BUnits::getCreateTime);
 		}

blade-service/blade-los/src/main/java/org/springblade/los/basic/vessels/controller/BVesselsController.java

@@ -115,9 +115,9 @@ public class BVesselsController extends BladeController {
 			.like(ObjectUtils.isNotNull(bVessels.getStatus()), BVessels::getStatus, bVessels.getStatus());
 		String status = sysClient.getParamServiceNew("basic.data.sort");
 		if ("name".equals(status)) {
-			lambdaQueryWrapper.orderByDesc(BVessels::getCnName);
+			lambdaQueryWrapper.orderByAsc(BVessels::getCnName);
 		} else if ("letter".equals(status)) {
-			lambdaQueryWrapper.orderByDesc(BVessels::getCode);
+			lambdaQueryWrapper.orderByAsc(BVessels::getCode);
 		} else {
 			lambdaQueryWrapper.orderByDesc(BVessels::getCreateTime);
 		}

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

@@ -173,7 +173,7 @@ public class PreContainersServiceImpl extends ServiceImpl<PreContainersMapper, P
 			.eq(Containers::getTenantId, AuthUtil.getTenantId())
 			.eq(Containers::getIsDeleted, 0)
 			.eq(Containers::getPid, preContainers.getPid()));
-		if (!removeContainersList.isEmpty()){
+		if (!removeContainersList.isEmpty()) {
 			List<Long> ids = removeContainersList.stream().map(Containers::getId).collect(Collectors.toList());
 			containersService.removeByIds(ids);
 			if (!ids.isEmpty()) {
@@ -314,7 +314,7 @@ public class PreContainersServiceImpl extends ServiceImpl<PreContainersMapper, P
 			.eq(Containers::getTenantId, AuthUtil.getTenantId())
 			.eq(Containers::getIsDeleted, 0)
 			.in(Containers::getPid, idsList));
-		if (!removeContainersList.isEmpty()){
+		if (!removeContainersList.isEmpty()) {
 			List<Long> ids = removeContainersList.stream().map(Containers::getId).collect(Collectors.toList());
 			containersService.removeByIds(ids);
 			if (!ids.isEmpty()) {
@@ -424,7 +424,7 @@ public class PreContainersServiceImpl extends ServiceImpl<PreContainersMapper, P
 		}
 		Calendar calendar = Calendar.getInstance();
 		calendar.setTime(bills.getEta());
-		calendar.add(Calendar.DAY_OF_MONTH, Integer.parseInt(bills.getIqNo()));
+		calendar.add(Calendar.DAY_OF_MONTH, Integer.parseInt(bills.getIqNo()) - 1);
 		Date newDate = calendar.getTime();
 		DispatchVehicles dispatchVehicles = new DispatchVehicles();
 		dispatchVehicles.setShouldBeReturnedDate(newDate);

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/controller/CorpsDescController.java

@@ -436,7 +436,7 @@ public class CorpsDescController extends BladeController {
 			.eq(ObjectUtils.isNotNull(corpsDesc.getEnableOrNot()), PjCorpsDesc::getEnableOrNot, corpsDesc.getEnableOrNot())
 			.like(ObjectUtils.isNotNull(corpsDesc.getCname()), PjCorpsDesc::getCname, corpsDesc.getCname());
 		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")
-			&& !AuthUtil.getUserRole().contains("客户总览")) {
+			&& !AuthUtil.getUserRole().contains("销售总览")) {
 			if (AuthUtil.getUserRole().contains("业务员")) {
 				lambdaQueryWrapper.eq(PjCorpsDesc::getSalesmanId, AuthUtil.getUserId());
 			}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/service/impl/CorpsDescServiceImpl.java

@@ -165,7 +165,7 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, PjCorpsDe
 		corpsDesc.setIsDeleted(0);
 		corpsDesc.setStrTenantId(Arrays.asList(AuthUtil.getDeptId().split(",")));
 		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")
-			&& !AuthUtil.getUserRole().contains("客户总览")) {
+			&& !AuthUtil.getUserRole().contains("销售总览")) {
 			if (AuthUtil.getUserRole().contains("业务员")) {
 				corpsDesc.setSalesmanId(AuthUtil.getUserId());
 			}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/service/impl/OrderServiceImpl.java

@@ -5069,7 +5069,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 					pjShip.setCreateDept(Long.valueOf(AuthUtil.getDeptId()));
 					pjShip.setCreateUser(AuthUtil.getUserId());
 					pjShip.setCreateTime(new Date());
-					pjShip.setWhetherFinancing("1");
 					shipMapper.insert(pjShip);
 					String status = sysClient.getParamService("whether.financing");
 					if (ObjectUtil.isNotEmpty(list)) {

blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java

@@ -179,7 +179,8 @@ public class UserController {
 			.eq(User::getIsDeleted, 0);
 
 		if (ObjectUtil.isNotEmpty(userVO.getDeptPid())) {
-			if ("1504336886057963521".equals(userVO.getDeptPid()) || "1567796746975727617".equals(userVO.getDeptPid())) {
+			if ("1504336886057963521".equals(userVO.getDeptPid()) || "1567796746975727617".equals(userVO.getDeptPid())
+				|| "1862313560907030530".equals(userVO.getDeptPid())) {
 				userVO.setRoleAlias("分管调度");
 			} else {
 				userVO.setRoleAlias("大件调度");