2023年8月25日17:31:30

blade-service-api/blade-client-api/src/main/java/org/springblade/client/feign/ICorpsArchivesClient.java

@@ -0,0 +1,26 @@
+package org.springblade.client.feign;
+
+import org.springblade.common.constant.LauncherConstant;
+import org.springblade.core.tool.api.R;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.Date;
+
+@FeignClient(
+	value = LauncherConstant.APPLICATION_CLIENT_NAME
+)
+/**
+ * 设备档案feign
+ */
+public interface ICorpsArchivesClient {
+
+	String API_PREFIX = "/client";
+	String UPDATE_ARCHIVES = API_PREFIX + "/corpequipmentarchives/updateArchives";
+
+	@GetMapping(UPDATE_ARCHIVES)
+	R updateArchives(@RequestParam("archivesId") String archivesId,
+					 @RequestParam("date") Date date,
+					 @RequestParam("deviceId") String deviceId);
+}

blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/vojo/Settlement.java

@@ -339,4 +339,10 @@ public class Settlement implements Serializable {
 	@ApiModelProperty(value = "会员结算余额")
 	private BigDecimal memberBalance;
 
+	/**
+	 * 箱号
+	 */
+	@ApiModelProperty(value = "箱号")
+	private String code;
+
 }

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/controller/TradingBoxController.java

@@ -155,8 +155,13 @@ public class TradingBoxController extends BladeController {
 	@RepeatSubmit
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
 		TradingBox tradingBox = tradingBoxService.getById(ids);
-		if (ObjectUtils.isNotNull(tradingBox) && 3 == tradingBox.getStatus()) {
-			throw new RuntimeException("审核通过不允许删除");
+		if (ObjectUtils.isNotNull(tradingBox)) {
+			if (!tradingBox.getCreateUser().equals(AuthUtil.getUserId())){
+				throw new RuntimeException("当前登录人没有删除该单据权限");
+			}
+			if(3 == tradingBox.getStatus()){
+				throw new RuntimeException("审核通过不允许删除");
+			}
 		}
 		if (tradingBox.getType().equals("DCF")) {
 			LambdaQueryWrapper<TradingBoxFees> lambdaQueryWrapper = new LambdaQueryWrapper<>();

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/controller/TradingBoxFeesController.java

@@ -92,6 +92,7 @@ public class TradingBoxFeesController extends BladeController {
 		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(tradingBoxFees.getCode()),TradingBoxFees::getCode,tradingBoxFees.getCode())
 			.eq(TradingBoxFees::getPid,tradingBoxFees.getPid())
 			.eq(TradingBoxFees::getIsDeleted,0)
+			.eq(TradingBoxFees::getFeesType,tradingBoxFees.getFeesType())
 			.eq(TradingBoxFees::getTenantId,AuthUtil.getTenantId())
 			.orderByDesc(TradingBoxFees::getCreateTime);
 		IPage<TradingBoxFees> pages = tradingBoxFeesService.page(Condition.getPage(query),lambdaQueryWrapper);
@@ -178,6 +179,10 @@ public class TradingBoxFeesController extends BladeController {
 	@ApiOperation(value = "删除", notes = "传入ids")
 	@RepeatSubmit
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		TradingBoxFees tradingBoxFees = tradingBoxFeesService.getById(ids);
+		if (ObjectUtils.isNotNull(tradingBoxFees) && !tradingBoxFees.getCreateUser().equals(AuthUtil.getUserId())){
+			throw new RuntimeException("当前登录人没有删除该单据权限");
+		}
 		return R.status(tradingBoxFeesService.removeByIds(Func.toLongList(ids)));
 	}
 

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/controller/TradingBoxItemController.java

@@ -567,6 +567,10 @@ public class TradingBoxItemController extends BladeController {
 	@ApiOperation(value = "删除", notes = "传入ids")
 	@RepeatSubmit
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		TradingBoxItem tradingBoxItem = tradingBoxItemService.getById(ids);
+		if (ObjectUtils.isNotNull(tradingBoxItem) && !tradingBoxItem.getCreateUser().equals(AuthUtil.getUserId())){
+			throw new RuntimeException("当前登录人没有删除该单据权限");
+		}
 		return R.status(tradingBoxItemService.removeByIds(Func.toLongList(ids)));
 	}
 

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/controller/TransportController.java

@@ -159,8 +159,13 @@ public class TransportController extends BladeController {
 	@RepeatSubmit
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
 		Transport transport = transportService.getById(ids);
-		if (ObjectUtils.isNotNull(transport) && 3 == transport.getStatus()) {
-			throw new RuntimeException("审核通过不允许删除");
+		if (ObjectUtils.isNotNull(transport)) {
+			if (!transport.getCreateUser().equals(AuthUtil.getUserId())) {
+				throw new RuntimeException("当前登录人没有删除该单据权限");
+			}
+			if (3 == transport.getStatus()) {
+				throw new RuntimeException("审核通过不允许删除");
+			}
 		}
 		return R.status(transportService.removeByIds(Func.toLongList(ids)));
 	}

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/controller/TransportItemController.java

@@ -25,6 +25,7 @@ import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
 import org.springblade.box.tube.entity.Archives;
+import org.springblade.box.tube.entity.TradingBoxItem;
 import org.springblade.box.tube.service.IArchivesService;
 import org.springblade.box.tube.service.ITransferService;
 import org.springblade.common.annotation.RepeatSubmit;
@@ -162,6 +163,10 @@ public class TransportItemController extends BladeController {
 	@ApiOperation(value = "删除", notes = "传入ids")
 	@RepeatSubmit
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		TransportItem transportItem = transportItemService.getById(ids);
+		if (ObjectUtils.isNotNull(transportItem) && !transportItem.getCreateUser().equals(AuthUtil.getUserId())){
+			throw new RuntimeException("当前登录人没有删除该单据权限");
+		}
 		return R.status(transportItemService.removeByIds(Func.toLongList(ids)));
 	}
 

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/controller/TransportItemFeesController.java

@@ -27,6 +27,7 @@ import javax.validation.Valid;
 
 import org.springblade.box.tube.entity.TradingBoxFees;
 import org.springblade.box.tube.entity.Transport;
+import org.springblade.box.tube.entity.TransportItem;
 import org.springblade.box.tube.service.ITransportService;
 import org.springblade.client.entity.CorpsDesc;
 import org.springblade.client.entity.FeesDesc;
@@ -97,6 +98,7 @@ public class TransportItemFeesController extends BladeController {
 		lambdaQueryWrapper.eq(ObjectUtils.isNotNull(transportItemFees.getCode()),TransportItemFees::getCode,transportItemFees.getCode())
 			.eq(TransportItemFees::getPid,transportItemFees.getPid())
 			.eq(TransportItemFees::getIsDeleted,0)
+			.eq(TransportItemFees::getFeesType,transportItemFees.getFeesType())
 			.eq(TransportItemFees::getTenantId,AuthUtil.getTenantId())
 		.orderByDesc(TransportItemFees::getCreateTime);
 		IPage<TransportItemFees> pages = transportItemFeesService.page(Condition.getPage(query),lambdaQueryWrapper);
@@ -184,6 +186,10 @@ public class TransportItemFeesController extends BladeController {
 	@ApiOperation(value = "删除", notes = "传入ids")
 	@RepeatSubmit
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		TransportItemFees transportItemFees = transportItemFeesService.getById(ids);
+		if (ObjectUtils.isNotNull(transportItemFees) && !transportItemFees.getCreateUser().equals(AuthUtil.getUserId())){
+			throw new RuntimeException("当前登录人没有删除该单据权限");
+		}
 		return R.status(transportItemFeesService.removeByIds(Func.toLongList(ids)));
 	}
 

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/mapper/TradingBoxMapper.xml

@@ -29,31 +29,25 @@
     </select>
     <select id="exportTradingBoxItemOut" resultType="org.springblade.box.tube.dto.ExportTradingBoxItemOut">
         SELECT
-            c.contract_no AS contractNo,
-            i.`code` AS CODE,
-            i.new_date AS newDate,
-            i.amount AS amount,
-            i.address AS address,
-            i.`status` AS STATUS,
-        ( CASE c.bill_type WHEN 'CKZY' THEN '出口装运' WHEN 'JKFC' THEN '进口返程' END ) AS type
+        c.contract_no AS contractNo,
+        i.`code` AS CODE,
+        i.new_date AS newDate,
+        i.amount AS amount,
+        i.address AS address,
+        i.`status` AS STATUS,
+        ( CASE c.type WHEN 'ZR' THEN '租入' WHEN 'ZC' THEN '租出' WHEN 'BUY' THEN '买箱' WHEN 'SELL' THEN '卖箱' END ) AS type
         FROM
-        container_transport_item i
-                LEFT JOIN container_transport c ON i.pid = c.id
+        container_trading_box_item i
+        LEFT JOIN container_trading_box c ON i.pid = c.id
         WHERE
-            i.tenant_id = #{item.tenantId}
-          AND i.is_deleted = '0'
-          AND c.is_deleted = '0'
-        <if test='item.effectiveDateList != null and item.effectiveDateList[0] != null and item.effectiveDateList[0]!= ""'>
-            and c.effective_date &gt;= #{item.effectiveDateList[0]}
+        i.tenant_id = #{item.tenantId}
+        AND i.is_deleted = '0'
+        AND c.is_deleted = '0'
+        <if test='item.purchaseDateList != null and item.purchaseDateList[0] != null and item.purchaseDateList[0]!= ""'>
+            and c.purchase_date &gt;= #{item.purchaseDateList[0]}
         </if>
-        <if test='item.effectiveDateList != null and item.effectiveDateList[1] != null and item.effectiveDateList[1]!= ""'>
-            and c.effective_date &lt;= #{item.effectiveDateList[1]}
-        </if>
-        <if test='item.startingRentDateList != null and item.startingRentDateList[0] != null and item.startingRentDateList[0]!= ""'>
-            and c.starting_rent_date &gt;= #{item.startingRentDateList[0]}
-        </if>
-        <if test='item.startingRentDateList != null and item.startingRentDateList[1] != null and item.startingRentDateList[1]!= ""'>
-            and c.starting_rent_date &lt;= #{item.startingRentDateList[1]}
+        <if test='item.purchaseDateList != null and item.purchaseDateList[1] != null and item.purchaseDateList[1]!= ""'>
+            and c.purchase_date &lt;= #{item.purchaseDateList[1]}
         </if>
         <if test='item.createTimeList != null and item.createTimeList[0] != null and item.createTimeList[0]!= ""'>
             and c.create_time &gt;= #{item.createTimeList[0]}
@@ -73,20 +67,8 @@
         <if test="item.contractNo != null and item.contractNo != ''">
             AND c.contract_no like CONCAT(CONCAT('%', #{item.contractNo}), '%')
         </if>
-        <if test="item.code != null and item.code != ''">
-            AND c.code like CONCAT(CONCAT('%', #{item.code}), '%')
-        </if>
-        <if test="item.corpId!=null">
-            and c.corp_id = #{item.corpId}
-        </if>
-        <if test="item.departureHarborId!=null">
-            and c.departure_harbor_id = #{item.departureHarborId}
-        </if>
-        <if test="item.objectiveHarborId!=null">
-            and c.objective_harbor_id = #{item.objectiveHarborId}
-        </if>
-        <if test="item.shippingCompanyId!=null">
-            and c.shipping_company_id = #{item.shippingCompanyId}
+        <if test="item.purchaseCompanyId!=null">
+            and c.purchase_company_id = #{item.purchaseCompanyId}
         </if>
         <if test="item.status!=null">
             and c.status = #{item.status}
@@ -97,8 +79,8 @@
         <if test="item.updateUser!=null and item.updateUser != ''">
             and c.update_user = #{item.updateUser}
         </if>
-        <if test="item.billType!=null and item.billType != ''">
-            and c.bill_type = #{item.billType}
+        <if test="item.type!=null and item.type != ''">
+            and c.type = #{item.type}
         </if>
         order by c.create_time desc
     </select>

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/mapper/TransportMapper.xml

@@ -46,19 +46,25 @@
         i.amount AS amount,
         i.address AS address,
         i.`status` AS STATUS,
-        ( CASE c.type WHEN 'ZR' THEN '租入' WHEN 'ZC' THEN '租出' WHEN 'BUY' THEN '买箱' WHEN 'SELL' THEN '卖箱' END ) AS type
+        ( CASE c.bill_type WHEN 'CKZY' THEN '出口装运' WHEN 'JKFC' THEN '进口返程' END ) AS type
         FROM
-        container_trading_box_item i
-        LEFT JOIN container_trading_box c ON i.pid = c.id
+        container_transport_item i
+        LEFT JOIN container_transport c ON i.pid = c.id
         WHERE
         i.tenant_id = #{item.tenantId}
         AND i.is_deleted = '0'
         AND c.is_deleted = '0'
-        <if test='item.purchaseDateList != null and item.purchaseDateList[0] != null and item.purchaseDateList[0]!= ""'>
-            and c.purchase_date &gt;= #{item.purchaseDateList[0]}
+        <if test='item.effectiveDateList != null and item.effectiveDateList[0] != null and item.effectiveDateList[0]!= ""'>
+            and c.effective_date &gt;= #{item.effectiveDateList[0]}
         </if>
-        <if test='item.purchaseDateList != null and item.purchaseDateList[1] != null and item.purchaseDateList[1]!= ""'>
-            and c.purchase_date &lt;= #{item.purchaseDateList[1]}
+        <if test='item.effectiveDateList != null and item.effectiveDateList[1] != null and item.effectiveDateList[1]!= ""'>
+            and c.effective_date &lt;= #{item.effectiveDateList[1]}
+        </if>
+        <if test='item.startingRentDateList != null and item.startingRentDateList[0] != null and item.startingRentDateList[0]!= ""'>
+            and c.starting_rent_date &gt;= #{item.startingRentDateList[0]}
+        </if>
+        <if test='item.startingRentDateList != null and item.startingRentDateList[1] != null and item.startingRentDateList[1]!= ""'>
+            and c.starting_rent_date &lt;= #{item.startingRentDateList[1]}
         </if>
         <if test='item.createTimeList != null and item.createTimeList[0] != null and item.createTimeList[0]!= ""'>
             and c.create_time &gt;= #{item.createTimeList[0]}
@@ -78,8 +84,20 @@
         <if test="item.contractNo != null and item.contractNo != ''">
             AND c.contract_no like CONCAT(CONCAT('%', #{item.contractNo}), '%')
         </if>
-        <if test="item.purchaseCompanyId!=null">
-            and c.purchase_company_id = #{item.purchaseCompanyId}
+        <if test="item.code != null and item.code != ''">
+            AND c.code like CONCAT(CONCAT('%', #{item.code}), '%')
+        </if>
+        <if test="item.corpId!=null">
+            and c.corp_id = #{item.corpId}
+        </if>
+        <if test="item.departureHarborId!=null">
+            and c.departure_harbor_id = #{item.departureHarborId}
+        </if>
+        <if test="item.objectiveHarborId!=null">
+            and c.objective_harbor_id = #{item.objectiveHarborId}
+        </if>
+        <if test="item.shippingCompanyId!=null">
+            and c.shipping_company_id = #{item.shippingCompanyId}
         </if>
         <if test="item.status!=null">
             and c.status = #{item.status}
@@ -90,8 +108,8 @@
         <if test="item.updateUser!=null and item.updateUser != ''">
             and c.update_user = #{item.updateUser}
         </if>
-        <if test="item.type!=null and item.type != ''">
-            and c.type = #{item.type}
+        <if test="item.billType!=null and item.billType != ''">
+            and c.bill_type = #{item.billType}
         </if>
         order by c.create_time desc
     </select>

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/TradingBoxServiceImpl.java

@@ -1027,8 +1027,8 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 				tradingBoxItem.setRentEndDate(tradingBoxItem.getLeaseCommencementDate());
 				tradingBoxItem.setRentStartDate(tradingBoxItem.getLeaseCommencementDate());
 			} else {
-				tradingBoxItem.setRentEndDate(tradingBoxFeesList.get(0).getRentEndDate());
-				tradingBoxItem.setRentStartDate(tradingBoxFeesList.get(0).getRentStartDate());
+				tradingBoxItem.setRentEndDate(tradingBoxFeesList.get(1).getRentEndDate());
+				tradingBoxItem.setRentStartDate(tradingBoxFeesList.get(1).getRentStartDate());
 			}
 			tradingBoxItemService.updateById(tradingBoxItem);
 		}
@@ -1497,6 +1497,8 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 					items.setBillNo(tradingBox.getSysNo());//系统号
 					items.setSrcSysno(tradingBoxFees.getCode());//箱号
 					items.setSrcBillNo(null);//提单号
+					items.setRentEndDate(tradingBoxFees.getRentEndDate());
+					items.setRentStartDate(tradingBoxFees.getRentStartDate());
 					itemsList.add(items);
 					applyDTO.setItemsList(itemsList);
 					//修改费用明细

blade-service/blade-client/src/main/java/org/springblade/client/equipment/controller/CorpEquipmentArchivesController.java

@@ -37,11 +37,11 @@ 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.salesPart.maintenance.entity.Maintenance;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -201,4 +201,11 @@ public class CorpEquipmentArchivesController extends BladeController {
 		return R.data(detail);
 	}
 
+	@GetMapping("/updateArchives")
+	public R updateArchives(@RequestParam("archivesId") String archivesId,
+							@RequestParam("date") Date date,
+							@RequestParam("deviceId") String deviceId) {
+		return corpEquipmentArchivesService.updateArchives(archivesId,date,deviceId);
+	}
+
 }

blade-service/blade-client/src/main/java/org/springblade/client/equipment/controller/CorpEquipmentArchivesItemController.java

@@ -27,8 +27,11 @@ import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
 import org.springblade.client.entity.CorpEquipmentArchives;
+import org.springblade.client.entity.CorpEquipmentArchivesFiles;
+import org.springblade.client.equipment.service.ICorpEquipmentArchivesFilesService;
 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.springframework.web.bind.annotation.*;
@@ -52,6 +55,8 @@ public class CorpEquipmentArchivesItemController extends BladeController {
 
 	private final ICorpEquipmentArchivesItemService corpEquipmentArchivesItemService;
 
+	private final ICorpEquipmentArchivesFilesService corpEquipmentArchivesFilesService;
+
 	/**
 	 * 详情
 	 */
@@ -83,6 +88,15 @@ public class CorpEquipmentArchivesItemController extends BladeController {
 			);
 		}
 		IPage<CorpEquipmentArchivesItem> pages = corpEquipmentArchivesItemService.page(Condition.getPage(query), Condition.getQueryWrapper(corpEquipmentArchivesItem));
+		for (CorpEquipmentArchivesItem item : pages.getRecords()) {
+			item.setFilesList(corpEquipmentArchivesFilesService.list(new LambdaQueryWrapper<CorpEquipmentArchivesFiles>()
+				.eq(CorpEquipmentArchivesFiles::getTenantId, AuthUtil.getTenantId())
+				.eq(CorpEquipmentArchivesFiles::getIsDeleted, 0)
+				.eq(CorpEquipmentArchivesFiles::getPid, item.getPid())
+				.eq(CorpEquipmentArchivesFiles::getItemId, item.getId())
+				.eq(CorpEquipmentArchivesFiles::getType, "1")));
+
+		}
 		return R.data(pages);
 	}
 

blade-service/blade-client/src/main/java/org/springblade/client/equipment/fegin/CorpsArchivesClient.java

@@ -0,0 +1,27 @@
+package org.springblade.client.equipment.fegin;
+
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.client.equipment.service.ICorpEquipmentArchivesService;
+import org.springblade.client.feign.ICorpsArchivesClient;
+import org.springblade.core.tenant.annotation.NonDS;
+import org.springblade.core.tool.api.R;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.Date;
+
+@Slf4j
+@NonDS
+@ApiIgnore()
+@RestController
+@AllArgsConstructor
+public class CorpsArchivesClient implements ICorpsArchivesClient {
+
+	private final ICorpEquipmentArchivesService corpEquipmentArchivesService;
+
+	@Override
+	public R updateArchives(String archivesId, Date date, String deviceId) {
+		return corpEquipmentArchivesService.updateArchives(archivesId, date, deviceId);
+	}
+}

blade-service/blade-client/src/main/java/org/springblade/client/equipment/service/ICorpEquipmentArchivesService.java

@@ -16,13 +16,14 @@
  */
 package org.springblade.client.equipment.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import org.springblade.client.entity.CorpEquipmentArchives;
 import org.springblade.client.excel.CorpEquipmentArchivesExcel;
 import org.springblade.client.vo.CorpEquipmentArchivesVO;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.tool.api.R;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -46,5 +47,7 @@ public interface ICorpEquipmentArchivesService extends IService<CorpEquipmentArc
 
 	R submit(CorpEquipmentArchives corpEquipmentArchives);
 
-    List<CorpEquipmentArchivesExcel> exportOutInfo(CorpEquipmentArchives corpEquipmentArchives);
+	List<CorpEquipmentArchivesExcel> exportOutInfo(CorpEquipmentArchives corpEquipmentArchives);
+
+	R updateArchives(String archivesId, Date date,String deviceId);
 }

blade-service/blade-client/src/main/java/org/springblade/client/equipment/service/impl/CorpEquipmentArchivesServiceImpl.java

@@ -165,7 +165,7 @@ public class CorpEquipmentArchivesServiceImpl extends ServiceImpl<CorpEquipmentA
 			}
 			corpEquipmentArchivesItemService.saveOrUpdateBatch(corpEquipmentArchives.getCorpEquipmentArchivesItemList());
 			for (CorpEquipmentArchivesItem item : corpEquipmentArchives.getCorpEquipmentArchivesItemList()) {
-				if(ObjectUtils.isNull(item.getUrl())){
+				if (ObjectUtils.isNull(item.getUrl())) {
 					//生成二维码图片
 					try {
 						//创建文件夹
@@ -220,4 +220,27 @@ public class CorpEquipmentArchivesServiceImpl extends ServiceImpl<CorpEquipmentA
 		return baseMapper.exportOutInfo(corpEquipmentArchives);
 	}
 
+	@Override
+	public R updateArchives(String archivesId, Date date, String deviceId) {
+		if (ObjectUtils.isNull(archivesId)) {
+			throw new RuntimeException("缺少必要参数");
+		}
+		CorpEquipmentArchives corpEquipmentArchives = baseMapper.selectById(archivesId);
+		if (ObjectUtils.isNull(date)) {
+			date = new Date();
+		}
+		corpEquipmentArchives.setRepairReportDate(date);
+		corpEquipmentArchives.setMaintenanceSecond(1 + (corpEquipmentArchives.getMaintenanceSecond() == null ? 0 : corpEquipmentArchives.getMaintenanceSecond()));
+		CorpEquipmentArchivesItem corpEquipmentArchivesItem = corpEquipmentArchivesItemService.getOne(new LambdaQueryWrapper<CorpEquipmentArchivesItem>()
+			.eq(CorpEquipmentArchivesItem::getPid, archivesId)
+			.eq(CorpEquipmentArchivesItem::getId, deviceId)
+			.eq(CorpEquipmentArchivesItem::getIsDeleted, 0));
+		if (ObjectUtils.isNotNull(corpEquipmentArchivesItem)) {
+			corpEquipmentArchivesItem.setMaintenanceSecond(1 + (corpEquipmentArchivesItem.getMaintenanceSecond() == null ? 0 : corpEquipmentArchivesItem.getMaintenanceSecond()));
+			corpEquipmentArchivesItem.setRepairReportDate(date);
+			corpEquipmentArchivesItemService.updateById(corpEquipmentArchivesItem);
+		}
+		return R.data("操作成功");
+	}
+
 }

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/maintenance/controller/MaintenanceController.java

@@ -83,8 +83,8 @@ public class MaintenanceController extends BladeController {
 			.like(ObjectUtils.isNotNull(maintenance.getSysNo()), Maintenance::getSysNo, maintenance.getSysNo())
 			.like(ObjectUtils.isNotNull(maintenance.getDeviceName()), Maintenance::getDeviceName, maintenance.getDeviceName())
 			.like(ObjectUtils.isNotNull(maintenance.getCorpName()), Maintenance::getCorpName, maintenance.getCorpName())
-			.eq(ObjectUtils.isNotNull(maintenance.getCorpTel()), Maintenance::getCorpTel, maintenance.getCorpTel())
-			.eq(ObjectUtils.isNotNull(maintenance.getMaintenanceWorkerTel()), Maintenance::getMaintenanceWorkerTel, maintenance.getMaintenanceWorkerTel())
+			.like(ObjectUtils.isNotNull(maintenance.getCorpTel()), Maintenance::getCorpTel, maintenance.getCorpTel())
+			.like(ObjectUtils.isNotNull(maintenance.getMaintenanceWorkerTel()), Maintenance::getMaintenanceWorkerTel, maintenance.getMaintenanceWorkerTel())
 			.eq(ObjectUtils.isNotNull(maintenance.getMaintenanceWorkerId()), Maintenance::getMaintenanceWorkerId, maintenance.getMaintenanceWorkerId())
 			.eq(ObjectUtils.isNotNull(maintenance.getPaymentStatus()), Maintenance::getPaymentStatus, maintenance.getPaymentStatus())
 			.eq(ObjectUtils.isNotNull(maintenance.getDeviceId()), Maintenance::getDeviceId, maintenance.getDeviceId())
@@ -105,6 +105,7 @@ public class MaintenanceController extends BladeController {
 			.or().like(Maintenance::getMaintenanceWorkerTel,maintenance.getRetrieval())
 			.or().like(Maintenance::getDeviceName,maintenance.getRetrieval())
 			.or().like(Maintenance::getDeviceDescribe,maintenance.getRetrieval())
+			.or().like(Maintenance::getFaultDescribe,maintenance.getRetrieval())
 			.or().like(Maintenance::getRepairDescription,maintenance.getRetrieval())
 			);
 		}
@@ -140,7 +141,7 @@ public class MaintenanceController extends BladeController {
 				lambdaQueryWrapper.eq(ObjectUtils.isNotNull(maintenance.getStatus()), Maintenance::getStatus, maintenance.getStatus());
 			}
 		}
-		lambdaQueryWrapper.orderByDesc(Maintenance::getCreateTime);
+		lambdaQueryWrapper.orderByAsc(Maintenance::getStatus);
 		IPage<Maintenance> pages = maintenanceService.page(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(pages);
 	}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/maintenance/service/impl/MaintenanceServiceImpl.java

@@ -24,6 +24,7 @@ import io.seata.spring.annotation.GlobalTransactional;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.client.entity.Message;
+import org.springblade.client.feign.ICorpsArchivesClient;
 import org.springblade.client.feign.IMessageClient;
 import org.springblade.client.feign.ISerialClient;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -81,6 +82,8 @@ public class MaintenanceServiceImpl extends ServiceImpl<MaintenanceMapper, Maint
 	//支付
 	private final IPaymentClient paymentClient;
 
+	private final ICorpsArchivesClient corpsArchivesClient;
+
 	/**
 	 * 生成系统编号
 	 */
@@ -509,6 +512,7 @@ public class MaintenanceServiceImpl extends ServiceImpl<MaintenanceMapper, Maint
 		maintenance.setUpdateUser(AuthUtil.getUserId());
 		maintenance.setUpdateUserName(AuthUtil.getUserName());
 		baseMapper.updateById(maintenance);
+		corpsArchivesClient.updateArchives(maintenance.getArchivesId() + "", maintenance.getRepairReportDate(), maintenance.getDeviceId() + "");
 		MaintenanceLog maintenanceLog = new MaintenanceLog();
 		maintenanceLog.setSysNo(maintenance.getSysNo());
 		maintenanceLog.setSrcId(maintenance.getId());

blade-service/trade-finance/src/main/java/org/springblade/finance/controller/SettlementController.java

@@ -210,6 +210,7 @@ public class SettlementController extends BladeController {
 		settlementLambdaQueryWrapper.eq(Settlement::getTenantId, AuthUtil.getTenantId());
 		settlementLambdaQueryWrapper.eq(Settlement::getIsDeleted, 0);
 		settlementLambdaQueryWrapper.like(ObjectUtil.isNotEmpty(settlement.getAmount()), Settlement::getAmount, settlement.getAmount());//金额
+		settlementLambdaQueryWrapper.like(ObjectUtil.isNotEmpty(settlement.getCode()), Settlement::getCode, settlement.getCode());//箱号
 		settlementLambdaQueryWrapper.orderByDesc(Settlement::getCreateTime);
 		IPage<Settlement> pages = settlementService.page(Condition.getPage(query), settlementLambdaQueryWrapper);
 		List<Settlement> settlementList = pages.getRecords();

blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/SettlementServiceImpl.java

@@ -1615,14 +1615,21 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 
 		//拼接合同号
 		StringBuilder sysOrderNo = new StringBuilder();
+		StringBuilder srcSysNo = new StringBuilder();
 		for (Items items : itemsList) {
-			if (sysOrderNo.indexOf(items.getSrcOrderno()) == -1) {
-				sysOrderNo = sysOrderNo.append(items.getSrcRefno()).append(",");
+			if (ObjectUtils.isNotNull(items.getSrcOrderno())) {
+				sysOrderNo.append(items.getSrcRefno()).append(",");
+			}
+			if (ObjectUtils.isNotNull(items.getSrcSysno())) {
+				srcSysNo.append(items.getSrcSysno()).append(",");
 			}
 		}
 		if (ObjectUtil.isNotEmpty(sysOrderNo)) {
 			model.setSrcOrderno(sysOrderNo.substring(0, sysOrderNo.toString().length() - 1));
 		}
+		if (ObjectUtil.isNotEmpty(srcSysNo)) {
+			model.setCode(srcSysNo.substring(0, srcSysNo.toString().length() - 1));
+		}
 
 		model.setForeignAmount(foreignTotal);
 		// todo 暂定用租户判断 国内贸易 收费 人民币金额 可以手输