202303222 17:47

blade-service-api/blade-box-tube-api/src/main/java/org/springblade/box/tube/entity/TradingBox.java

@@ -55,6 +55,12 @@ public class TradingBox implements Serializable {
 	private String contractNo;
 
 	/**
+	 * 来源单号
+	 */
+	@ApiModelProperty(value = "来源单号")
+	private String orgSysNo;
+
+	/**
 	 * 合同生效日期
 	 */
 	@ApiModelProperty(value = "合同生效日期")

blade-service-api/blade-box-tube-api/src/main/java/org/springblade/box/tube/entity/TradingBoxFees.java

@@ -235,5 +235,9 @@ public class TradingBoxFees implements Serializable {
 	@TableField(updateStrategy = FieldStrategy.IGNORED)
 	private Date reconciliationDate;
 
-
+	/**
+	 * 是否手动录入（0否，1是）
+	 */
+	@ApiModelProperty(value = "是否手动录入（0否，1是）")
+	private Integer identifier;
 }

blade-service-api/blade-box-tube-api/src/main/java/org/springblade/box/tube/excel/ArchivesExcel.java

@@ -0,0 +1,55 @@
+package org.springblade.box.tube.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *  箱分布明细导出
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class ArchivesExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 编码(箱号)
+	 */
+	@ExcelProperty(value = "箱号")
+	private String code;
+
+	/**
+	 * 箱类型
+	 */
+	@ExcelProperty(value = "箱类型")
+	private String name;
+
+	/**
+	 * 最新地点
+	 */
+	@ExcelProperty(value = "最新地点")
+	private String address;
+
+	/**
+	 * 最新日期
+	 */
+	@ExcelProperty(value = "最新日期")
+	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+	private Date newDate;
+
+	/**
+	 * 箱动态
+	 */
+	@ExcelProperty(value = "箱动态")
+	private String boxAccessStatus;
+
+}

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

@@ -201,7 +201,9 @@ public class Items implements Serializable {
 
 	@TableField(exist = false)
 	private String itemName;
-
+	/**
+	 * 本次金额
+	 */
 	@ApiModelProperty(value = "本次金额")
 	private BigDecimal thisAmount;
 

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

@@ -24,17 +24,21 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.box.tube.entity.Archives;
+import org.springblade.box.tube.excel.ArchivesExcel;
 import org.springblade.box.tube.service.IArchivesService;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.excel.util.ExcelUtil;
 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.BeanUtil;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -81,6 +85,22 @@ public class BoxDataAnalysisController extends BladeController {
 	}
 
 	/**
+	 * 箱分布明细导出
+	 */
+	@GetMapping("/detailsExport")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "箱分布明细导出", notes = "传入archives")
+	public void detailsExport(@RequestParam(value = "address",required = false) String address, HttpServletResponse response){
+		LambdaQueryWrapper<Archives> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(Archives::getTenantId, AuthUtil.getTenantId())
+			.eq(Archives::getIsDeleted, 0)
+			.eq(Archives::getAddress, address);
+		List<Archives> list = archivesService.list(lambdaQueryWrapper);
+		List<ArchivesExcel> excelList = BeanUtil.copy(list, ArchivesExcel.class);
+		ExcelUtil.export(response, "箱分布明细-" + address, "箱分布明细-" + address, excelList , ArchivesExcel.class);
+	}
+
+	/**
 	 * 首页待审核数量
 	 */
 	@GetMapping("/approval")

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

@@ -94,6 +94,7 @@ public class TransferServiceImpl implements ITransferService {
 				TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 				throw new Error("生成系统编号失败");
 			}
+			tradingBox.setOrgSysNo(tradingBox.getSysNo());//来源单号
 			tradingBox.setSysNo(billNo.getData().toString());
 			tradingBox.setCreateTime(new Date());
 			tradingBox.setCreateUser(AuthUtil.getUserId());
@@ -190,20 +191,17 @@ public class TransferServiceImpl implements ITransferService {
 		}
 		tradingBox.setBoxNumber(tradingBoxItemList.size());
 		tradingBoxMapper.updateById(tradingBox);
-		/*//费用明细
+		//费用明细
 		List<TradingBoxFees> tradingBoxFeesList = tradingBox.getTradingBoxFeesList();
 		if (ObjectUtils.isNotNull(tradingBoxFeesList) && tradingBoxFeesList.size() > 0) {
 			for (TradingBoxFees tradingBoxFees : tradingBoxFeesList) {
 				if (tradingBoxFees.getId() == null) {
-					if ("ZR".equals(tradingBox.getType())) {
-						tradingBoxFees.setBillType("租入");
-					} else {
-						tradingBoxFees.setBillType("租出");
-					}
 					tradingBoxFees.setCreateUser(AuthUtil.getUserId());
 					tradingBoxFees.setCreateTime(new Date());
 					tradingBoxFees.setTenantId(AuthUtil.getTenantId());
 					tradingBoxFees.setPid(tradingBox.getId());
+					tradingBoxFees.setSubmitPay(0);
+					tradingBoxFees.setIdentifier(1);
 					tradingBoxFeesMapper.insert(tradingBoxFees);
 				} else {
 					tradingBoxFees.setUpdateUser(AuthUtil.getUserId());
@@ -215,7 +213,7 @@ public class TransferServiceImpl implements ITransferService {
 			tradingBox.setTradingBoxFeesList(tradingBoxFeesList);
 		}
 		//主表附件
-		List<TradingBoxFiles> tradingBoxFilesList = tradingBox.getTradingBoxFilesList();
+		/*List<TradingBoxFiles> tradingBoxFilesList = tradingBox.getTradingBoxFilesList();
 		if (ObjectUtils.isNotNull(tradingBoxFilesList) && tradingBoxFilesList.size() > 0) {
 			for (TradingBoxFiles tradingBoxFiles : tradingBoxFilesList) {
 				if (tradingBoxFiles.getId() == null) {
@@ -291,6 +289,7 @@ public class TransferServiceImpl implements ITransferService {
 			tradingBoxFees.setCreateTime(new Date());
 			tradingBoxFees.setTenantId(AuthUtil.getTenantId());
 			tradingBoxFees.setSubmitPay(0);
+			tradingBoxFees.setIdentifier(0);
 			tradingBoxFeesMapper.insert(tradingBoxFees);
 			tradingBoxFeesList.add(tradingBoxFees);
 			tradingBoxItem.setAmount(tradingBoxItem.getPrice().multiply(BigDecimal.valueOf(days)));
@@ -391,6 +390,7 @@ public class TransferServiceImpl implements ITransferService {
 			tradingBoxFeesLambdaQueryWrapper.eq(TradingBoxFees::getTenantId, AuthUtil.getTenantId());
 //			tradingBoxFeesLambdaQueryWrapper.eq(TradingBoxFees::getSubmitPay, 0);
 			tradingBoxFeesLambdaQueryWrapper.eq(TradingBoxFees::getCode, tradingBoxItem.getCode());
+			tradingBoxFeesLambdaQueryWrapper.eq(TradingBoxFees::getIdentifier, 0);
 			tradingBoxFeesLambdaQueryWrapper.orderByDesc(TradingBoxFees::getCreateTime);
 			List<TradingBoxFees> tradingBoxFeesList = tradingBoxFeesMapper.selectList(tradingBoxFeesLambdaQueryWrapper);
 			if (tradingBoxFeesList.size() > 0) {

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

@@ -2729,6 +2729,22 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 						items.setTradeType(acc.getTradeType());
 						itemsMapper.insert(items);
 
+						/** 确认收款增加回填销售单未收款和已收款 */
+						BigDecimal amount = BigDecimal.ZERO;
+						amount = acc.getAmount();
+						BigDecimal receivedAmount = new BigDecimal("0.00");
+						receivedAmount = acc.getSettlementAmount();
+						amount = amount.subtract(receivedAmount);
+						Order order1 = new Order();
+						order1.setId(acc.getSrcId());
+						order1.setSettlmentAmount(receivedAmount);
+						order1.setBalanceAmount(amount);
+						order1.setActualPaymentStatus(2);
+						order1.setStatus(3);
+						orderDescClient.updateOrder(order1);
+						acc.setSettlementAmount(receivedAmount);
+						accMapper.updateById(acc);
+						/** 确认收款增加回填销售单未收款和已收款 */
 					}
 					acc.setSettlementAmount(s);
 					acc.setId(id);