Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 12:52:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

分堆打包翻页缺少参数增加

Browse Source
This commit is contained in:
liuzhaotian
2025-04-02 14:42:15 +08:00
parent dd95b1d028
commit 62f5cfe303
3 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java
+1 -13
View File
@@ -241,18 +241,6 @@ public interface OrderMapper extends BaseMapperX<OrderDO> {
List<OrderGoodsResp> selectGoodsListByGoodsId(@Param(Constants.WRAPPER) QueryWrapperX<OrderDO> queryWrapperX);
default List<OrderDO> selectOrderList(List<Long> orderIds, Long organId) {
return selectList(new LambdaQueryWrapperX<OrderDO>()
.eqIfPresent(OrderDO::getOrganId, organId)
.eq(OrderDO::getDeleted, false)
.inIfPresent(OrderDO::getId,orderIds)
.eq(OrderDO::getStatus, OrderStatusEnum.FINISH_PRODUCTION.getStatus()));
}
default List<OrderDO> selectOrderPackList(List<Long> orderIds, Long organId) {
return selectList(new LambdaQueryWrapperX<OrderDO>()
.eq(OrderDO::getOrganId, organId)
@@ -296,7 +284,7 @@ public interface OrderMapper extends BaseMapperX<OrderDO> {
List<PackRespVO> selectOrderIds(@Param("createTime") String createTime, @Param("organId") Long organId, @Param("orderId") Long orderId);
List<PackRespVO> selectOrderIdsTrue(@Param("createTime") String createTime, @Param("organId") Long organId, @Param("orderId") Long orderId);
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/pack/PackServiceImpl.java
+1 -1
View File
@@ -904,7 +904,7 @@ public class PackServiceImpl implements PackService {
AssertUtils.notEmpty(order, ORDER_DATE_ERROR);
List<PackRespVO> packRespVOList = Boolean.TRUE.equals(isUp) ?
ordersMapper.selectOrderIds(order.getCreateTime().toString(), getUserOrganId(), order.getId()) :
ordersMapper.selectOrderIdsTrue(order.getCreateTime().toString(), getUserOrganId(), order.getId()) :
ordersMapper.selectOrderIdsFalse(order.getCreateTime().toString(), getUserOrganId(), order.getId());
if (packRespVOList.isEmpty()) {
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml
+28
View File
@@ -438,6 +438,34 @@
<select id="selectOrderIdsTrue" resultMap="PackMap">
SELECT
id as orderNo,
custom_order_no as customOrderNo,
dealer as dealer,
dealer_phone_number as dealerPhoneNumber,
order_date as orderDate,
create_time as createTime,
delivery_date as deliveryDate,
customer as customer,
phone_number as phoneNumber,
address as address,
salesman as salesman,
splitter as splitter,
packaged as packaged
FROM orders
WHERE organ_id = #{organId} and deleted = false and status in (1,2,3,4) and create_time &gt;= #{createTime} and id != #{orderId}
ORDER BY create_time
LIMIT 1 ;
</select>
<select id="selectOrderIdsFalse" resultMap="PackMap">