*

lsh

8 小时以前 f0a7fa09eeef7fd9dc97173b5ef8e319d17c7f28

*

 src/main/java/com/zy/asrs/controller/OrderDetlPakoutController.java

@@ -10,15 +10,14 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.OrderDetlPakout;
import com.zy.asrs.entity.result.OrderPakoutDetailVo;
import com.zy.asrs.service.OrderDetlPakoutService;
import com.zy.asrs.service.impl.OrderDetlPakoutServiceImpl;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;

@RestController
@RequestMapping("order/pakout")
@@ -26,6 +25,8 @@

    @Autowired
    private OrderDetlPakoutService orderDetlService;
    @Autowired
    private OrderDetlPakoutServiceImpl orderDetlPakoutService;

    @RequestMapping(value = "/orderDetl/{id}/auth")
    @ManagerAuth
@@ -142,15 +143,30 @@
                                    @RequestParam(required = false)String orderByField,
                                    @RequestParam(required = false)String orderByType,
                                    @RequestParam Map<String, Object> param){
        EntityWrapper<OrderDetlPakout> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
            wrapper.orderBy("create_time", false);
        try{
            String itemName = null;
            Date modiTimeStart = null, modiTimeEnd = null;
            for (Map.Entry<String, Object> entry : param.entrySet()) {
                String val = String.valueOf(entry.getValue());
                if (Cools.isEmpty(val)) {
                    continue;
                }
                if (val.contains(RANGE_TIME_LINK)) {
                    String[] dates = val.split(RANGE_TIME_LINK);
                    modiTimeStart = DateUtils.convert(dates[0]);
                    modiTimeEnd = DateUtils.convert(dates[1]);
                } else if (entry.getKey().equals("item_name")) {
                    itemName = val;
                }
            }
            List<OrderPakoutDetailVo> OrderPakoutDetailVoList = orderDetlPakoutService.selectOrderPakoutDetailVoList(itemName,modiTimeStart,modiTimeEnd, curr, limit);
            Page<OrderPakoutDetailVo> page = new Page<OrderPakoutDetailVo>(curr, limit).setRecords(OrderPakoutDetailVoList);
            page.setTotal(orderDetlPakoutService.selectOrderPakoutDetailVoListTotal(itemName,modiTimeStart,modiTimeEnd));
            return R.ok(page);

        } catch (Exception e) {
            return R.error("查询失败,请检查参数:"+e.getMessage());
        }
//        wrapper.eq("status", 1);
        Page<OrderDetlPakout> orderDetlPage = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
        return R.ok(orderDetlPage);
    }



 src/main/java/com/zy/asrs/mapper/OrderDetlPakoutMapper.java

@@ -2,10 +2,12 @@

import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.OrderDetlPakout;
import com.zy.asrs.entity.result.OrderPakoutDetailVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;

import java.util.Date;
import java.util.List;
import java.util.Map;

@@ -34,4 +36,15 @@
    int increaseQtyByOrderNo(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty);

    int increaseWorkQty(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("workQty")Double workQty);


    List<OrderPakoutDetailVo> selectOrderPakoutDetailVoList(@Param("itemName") String itemName,
                                                @Param("modiTimeStart") Date modiTimeStart,
                                                @Param("modiTimeEnd") Date modiTimeEnd,
                                                @Param("pageNumber") Integer curr,
                                                @Param("pageSize") Integer limit);

    Long selectOrderPakoutDetailVoListTotal(@Param("itemName") String itemName,
                                @Param("modiTimeStart") Date modiTimeStart,
                                @Param("modiTimeEnd") Date modiTimeEnd);
}

 src/main/java/com/zy/asrs/service/OrderDetlPakoutService.java

@@ -3,7 +3,9 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.IService;
import com.zy.asrs.entity.OrderDetlPakout;
import com.zy.asrs.entity.result.OrderPakoutDetailVo;

import java.util.Date;
import java.util.List;

public interface OrderDetlPakoutService extends IService<OrderDetlPakout> {
@@ -37,4 +39,7 @@
     * @return
     */
    boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty);

    List<OrderPakoutDetailVo> selectOrderPakoutDetailVoList(String itemName, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit);
    Long selectOrderPakoutDetailVoListTotal(String itemName,Date modiTimeStart,Date modiTimeEnd);
}

 src/main/java/com/zy/asrs/service/impl/OrderDetlPakoutServiceImpl.java

@@ -5,10 +5,12 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.zy.asrs.entity.OrderDetlPakout;
import com.zy.asrs.entity.result.OrderPakoutDetailVo;
import com.zy.asrs.mapper.OrderDetlPakoutMapper;
import com.zy.asrs.service.OrderDetlPakoutService;
import org.springframework.stereotype.Service;

import java.util.Date;
import java.util.List;

@Service("orderDetlPakoutService")
@@ -90,4 +92,14 @@
    public boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty) {
        return this.baseMapper.increaseWorkQty(orderId, matnr, batch, workQty) > 0;
    }

    @Override
    public List<OrderPakoutDetailVo> selectOrderPakoutDetailVoList(String itemName, Date modiTimeStart, Date modiTimeEnd, Integer curr, Integer limit) {
        return this.baseMapper.selectOrderPakoutDetailVoList(itemName,modiTimeStart,modiTimeEnd,curr,limit);
    }

    @Override
    public Long selectOrderPakoutDetailVoListTotal(String itemName,Date modiTimeStart,Date modiTimeEnd) {
        return this.baseMapper.selectOrderPakoutDetailVoListTotal(itemName,modiTimeStart,modiTimeEnd);
    }
}

 src/main/resources/mapper/OrderDetlPakoutMapper.xml

@@ -255,4 +255,21 @@
        </choose>
    </update>

    <select id="selectOrderPakoutDetailVoList" resultMap="PakoutDetailResultMap">
        SELECT * FROM v_pakout_detail
        WHERE 1 = 1
        <if test="itemName != null and itemName != ''">
            AND item_name LIKE CONCAT('%', #{itemName}, '%')
        </if>
        ORDER BY create_time DESC
    </select>

    <select id="selectOrderPakoutDetailVoListTotal" resultType="Long">
        SELECT count(1) FROM v_pakout_detail
        WHERE 1 = 1
        <if test="itemName != null and itemName != ''">
            AND item_name LIKE CONCAT('%', #{itemName}, '%')
        </if>
    </select>

</mapper>

 src/main/webapp/views/orderCargoGrouping/orderCargoGroupingOperate.html

@@ -372,13 +372,13 @@
            },

            // 获取子表B数据（根据实际业务调整）
            getTableDataB(orderNo) {
            getTableDataB(itemName) {
                let that = this;
                that.detailLoading = true;

                // 构建请求参数
                let params = {
                    order_no: orderNo,
                    item_name: itemName,
                    curr: that.detailCurrentPage,
                    limit: that.detailPageSize
                };
@@ -539,7 +539,7 @@
                this.currentRow = row;
                this.detailDialogVisible = true;
                this.detailCurrentPage = 1;
                this.getTableDataB(row.orderNo);
                this.getTableDataB(row.itemName);
            },

            // 关闭详情弹窗
@@ -568,7 +568,7 @@
                this.detailPageSize = val;
                this.detailCurrentPage = 1;
                if (this.currentRow) {
                    this.getTableDataB(this.currentRow.orderNo);
                    this.getTableDataB(this.currentRow.itemName);
                }
            },

@@ -576,7 +576,7 @@
            handleDetailCurrentChange(val) {
                this.detailCurrentPage = val;
                if (this.currentRow) {
                    this.getTableDataB(this.currentRow.orderNo);
                    this.getTableDataB(this.currentRow.itemName);
                }
            },