优化

blade-service/blade-land/src/main/java/org/springblade/land/util/MessageUtil.java

@@ -2,6 +2,7 @@ package org.springblade.land.util;
 
 import org.springblade.client.entity.Message;
 import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.land.entity.OrderItem;
 
 import java.util.Date;
@@ -72,7 +73,7 @@ public class MessageUtil {
 		}
 		if ("DC".equals(mold)) {
 			msg = "已到场，提单号：" + item.getBillNo() + "，箱型箱量：" + item.getCtnType() + "×" + item.getCtnQuantity() + "，"
-				+ "车号：" + item.getPlateNo() + "，司机：" + item.getDriverName() + "，到场时间：" + item.getRealArrivalTime() + "。";
+				+ "车号：" + item.getPlateNo() + "，司机：" + item.getDriverName() + "，到场时间：" + DateUtil.formatDateTime(item.getRealArrivalTime()) + "。";
 		}
 		if ("WG".equals(mold)) {
 			msg = "已完工，提单号：" + item.getBillNo() + "，箱型箱量：" + item.getCtnType() + "×" + item.getCtnQuantity() + "。";
@@ -92,7 +93,7 @@ public class MessageUtil {
 		}
 		if ("DC".equals(mold)) {
 			msg = "已到场，提单号：" + item.getBillNo() + "，箱型箱量：" + item.getCtnType() + "×" + item.getCtnQuantity() + "，"
-				+ "车号：" + item.getPlateNo() + "，司机：" + item.getDriverName() + "，到场时间：" + item.getRealArrivalTime() + "。";
+				+ "车号：" + item.getPlateNo() + "，司机：" + item.getDriverName() + "，到场时间：" + DateUtil.formatDateTime(item.getRealArrivalTime()) + "。";
 		}
 		if ("WG".equals(mold)) {
 			msg = "已完工，提单号：" + item.getBillNo() + "，箱型箱量：" + item.getCtnType() + "×" + item.getCtnQuantity() + "。";
@@ -102,7 +103,7 @@ public class MessageUtil {
 
 	public static Message toDriver(OrderItem item) {
 		String msg = "您有新的订单需受理，提单号：" + item.getBillNo() + "，箱型箱量：" + item.getCtnType() + "×" + item.getCtnQuantity() + "，"
-			+ "到场时间：" + item.getArrivalTime() + "，场站：" + item.getStation() + "。";
+			+ "到场时间：" + DateUtil.formatDateTime(item.getArrivalTime()) + "，场站：" + item.getStation() + "。";
 		return send(item.getOrderId(), item.getSendUserId(), LAND_GS_URL, msg);
 	}
 

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

@@ -66,7 +66,23 @@ public class RegionController extends BladeController {
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入region")
 	public R<RegionVO> detail(Region region) {
-		Region detail = regionService.getOne(Condition.getQueryWrapper(region).last("limit 1"));
+		Region detail = regionService.getOne(Condition.getQueryWrapper(region));
+		return R.data(RegionWrapper.build().entityVO(detail));
+	}
+
+	/**
+	 * 匹配
+	 */
+	@GetMapping("/match")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "匹配", notes = "传入address")
+	public R<RegionVO> match(String address) {
+		String[] addresses = address.split("/");
+		Region region = new Region();
+		region.setProvinceName(addresses[0]);
+		region.setCityName(addresses[1]);
+		region.setDistrictName(addresses[2]);
+		Region detail = regionService.getOne(Condition.getQueryWrapper(region));
 		return R.data(RegionWrapper.build().entityVO(detail));
 	}
 

blade-service/trade-purchase/src/main/java/com/trade/purchase/office/mapper/StockMapper.xml

@@ -65,7 +65,7 @@
             and trade_type = 'BGYP'
             <if test="stockVO.goodsId != null">and goods_id = #{stockVO.goodsId}</if>
             <if test="stockVO.storageId != null">and storage_id = #{stockVO.storageId}</if>
-            <if test="stockVO.endInDate != null and stockVO.endInDate != ''">and in_date &lt; #{stockVO.inDate}</if>
+            <if test="stockVO.endInDate != null and stockVO.endInDate != ''">and in_date &lt; #{stockVO.endInDate}</if>
         group by storage_id, goods_id
     </select>
 

blade-service/trade-purchase/src/main/java/com/trade/purchase/office/service/impl/OfficeOrderServiceImpl.java

@@ -99,6 +99,7 @@ public class OfficeOrderServiceImpl extends ServiceImpl<OrderMapper, Order> impl
 
 	@Override
 	public IPage<OrderVO> getList(OrderVO orderVO, Query query) {
+		IPage<OrderVO> pages = Condition.getPage(query);
 		LambdaQueryWrapper<Order> orderQueryWrapper = new LambdaQueryWrapper<>();
 		orderQueryWrapper.eq(StringUtil.isNotBlank(orderVO.getTradeType()), Order::getTradeType, orderVO.getTradeType())
 			.eq(ObjectUtil.isNotEmpty(orderVO.getApplyUser()), Order::getApplyUser, orderVO.getApplyUser())
@@ -112,7 +113,6 @@ public class OfficeOrderServiceImpl extends ServiceImpl<OrderMapper, Order> impl
 			.eq(Order::getIsDeleted, 0);
 
 		IPage<Order> orderPages = baseMapper.selectPage(Condition.getPage(query), orderQueryWrapper);
-		IPage<OrderVO> pages = Condition.getPage(query);
 		List<OrderVO> records = BeanUtil.copy(orderPages.getRecords(), OrderVO.class);
 		records.forEach(record -> {
 			if (ObjectUtil.isNotEmpty(record.getApplyUser())) {
@@ -129,6 +129,7 @@ public class OfficeOrderServiceImpl extends ServiceImpl<OrderMapper, Order> impl
 				record.setStockDeptName(getDeptName(record.getStockDept()));
 			}
 		});
+		pages.setTotal(orderPages.getTotal());
 		pages.setRecords(records);
 		return pages;
 	}

blade-service/trade-purchase/src/main/java/com/trade/purchase/office/service/impl/StockServiceImpl.java

@@ -32,6 +32,7 @@ import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -56,8 +57,10 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
 
 	@Override
 	public IPage<StockVO> getList(IPage<StockVO> page, StockVO stockVO) {
-		stockVO.setBeginInDate(getFirstTimeOfMonth(stockVO.getBeginInDate()));
-		stockVO.setEndInDate(getLastTimeOfMonth(stockVO.getEndInDate()));
+		String beginInDate = stockVO.getBeginInDate();
+		String endInDate = stockVO.getEndInDate();
+		stockVO.setBeginInDate(getFirstTimeOfMonth(beginInDate));
+		stockVO.setEndInDate(getLastTimeOfMonth(endInDate));
 		stockVO.setTenantId(AuthUtil.getTenantId());
 		List<StockVO> records = baseMapper.selectList(page, stockVO);
 		records.forEach(record -> {
@@ -66,10 +69,14 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
 			StockVO tempVO = new StockVO();
 			tempVO.setStorageId(record.getStorageId());
 			tempVO.setGoodsId(record.getGoodsId());
-			tempVO.setEndInDate(getFirstTimeOfMonth(stockVO.getBeginInDate()));
+			tempVO.setEndInDate(getFirstTimeOfMonth(beginInDate));
 			tempVO.setTenantId(AuthUtil.getTenantId());
 			tempVO = baseMapper.selectStock(tempVO);
-			record.setOpening(tempVO.getBalanceQuantity());
+			if (ObjectUtil.isNotEmpty(tempVO)) {
+				record.setOpening(tempVO.getBalanceQuantity());
+			} else {
+				record.setOpening(new BigDecimal("0.00"));
+			}
 
 			Stock stock = baseMapper.selectOne(new LambdaQueryWrapper<Stock>()
 				.select(Stock::getInDate)