Merge remote-tracking branch 'origin/dev' into dev

blade-service/blade-los/src/main/java/org/springblade/los/basic/cur/service/impl/BCurrencyServiceImpl.java

@@ -102,13 +102,15 @@ public class BCurrencyServiceImpl extends ServiceImpl<CurrencyMapper, BCurrency>
 			List<BCurExrate> bCurExrateListAdd = new ArrayList<>();
 			List<BCurExrate> bCurExrateListUpdate = new ArrayList<>();
 			for (BCurExrate item : bCurrency.getCurExrateList()) {
-				item.setType(bCurrency.getParitiesType());
+				if (item.getId() == null){
+					item.setType(bCurrency.getParitiesType());
+				}
 				item.setCode(bCurrency.getCode());
 				BCurExrate bCurExrate = bCurExrateService.getOne(new LambdaQueryWrapper<BCurExrate>()
 					.eq(BCurExrate::getExrateYear, item.getExrateYear())
 					.eq(ObjectUtils.isNotNull(item.getExrateMonth()), BCurExrate::getExrateMonth, item.getExrateMonth())
 					.eq(ObjectUtils.isNotNull(item.getExrateDay()), BCurExrate::getExrateDay, item.getExrateDay())
-					.eq(BCurExrate::getType, bCurrency.getParitiesType())
+					.eq(BCurExrate::getType, item.getType())
 					.eq(BCurExrate::getCode, item.getCode())
 				);
 				if (bCurExrate != null) {

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/mapper/OrderItemsMapper.xml

@@ -522,7 +522,7 @@
             and not FIND_IN_SET(po.`status`,'退款请核,已取消,已退款,售后中')
         </if>
         <if test='isContain !=null and isContain !="" and isContain == "1"'>
-          and ( (FIND_IN_SET(po.bs_type,'XS,CG,RZCG') and FIND_IN_SET(po.`status`,'待确认,待发货,已发货,退款请核,已取消,已退款,售后中,已收货'))
+          and ( (FIND_IN_SET(po.bs_type,'XS,CG,RZCG') and FIND_IN_SET(po.`status`,'待确认,待发货,已发货,退款请核,已取消,已退款,售后中,已收货,待收货'))
               or (FIND_IN_SET(po.bs_type,'TKXS,TKCG') and FIND_IN_SET(po.`status`,'已完成')) )
         </if>
         <if test='isContain !=null and isContain !="" and isContain == "0"'>

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/ship/service/impl/ShipServiceImpl.java

@@ -986,7 +986,7 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 						.eq(PjOrder::getWhetherFinancing, "1")
 						.eq(PjOrder::getBsType, "RZCG")
 						.ge(PjOrder::getBusinesDate, dateTime)
-						.apply("goods_total_ship_num > out_goods_total_ship_num")
+						.apply("goods_total_ship_num >= out_goods_total_ship_num")
 						.orderByAsc(PjOrder::getBusinesDate)
 					);
 					List<Long> ordIds = orderList.stream().map(PjOrder::getId).collect(Collectors.toList());
@@ -998,7 +998,7 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 						.eq(PjOrderItems::getBizType, "RZCG")
 						.in(PjOrderItems::getGoodsId, goodsList)
 						.in(PjOrderItems::getPid, ordIds)
-						.apply("send_num > out_goods_total_ship_num")
+						.apply("send_num >= out_goods_total_ship_num")
 						.orderByAsc(PjOrderItems::getCreateTime)
 					);
 					BigDecimal amountSum = new BigDecimal("0.00");