Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master int...

pjb

2025-07-08 c0b871d491731e4b32f3c9249770c1d4aee4f7f5

Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev

 construction-data/src/components/datav/index.vue

@@ -406,7 +406,7 @@
    getTaskDetl (data) {
      let that = this
      // eslint-disable-next-line no-undef
      $ajax.post('wave/task/detl/qutify/', { taskNo: data.taskNo, matnr: data.matnr }).then(response => {
      $ajax.post('wave/task/detl/qutify/', { taskNo: data.taskNo, matnr: data.matnr, waveNo: data.waveNo }).then(response => {
        if (response.code === 200) {
          that.taskDetls = []
          // this.show = false

 zy-asrs-admin/src/components/order/order/order.vue

@@ -32,6 +32,7 @@
const state = reactive({

  selectedRowKeys: [],

  loading: false,

  orderSettle: 1,

});



let tableData = ref([]);

@@ -160,13 +161,13 @@
    pageSize: pageSize,

    condition: searchInput.value,

    orderType: orderType.value,

    orderSettle: state.orderSettle,



  }).then((resp) => {

    let result = resp.data;

    if (result.code == 200) {

      console.log('--------->')

      let data = result.data;

      tableData.value = data;



      state.loading = false;

    } else if (result.code === 401) {

      message.error(result.msg);

@@ -292,9 +293,17 @@
    <EditView ref="editChild" @tableReload="handleTableReload"

      :ioModel="ioModel == 'in' ? 1 : ioModel == 'out' ? 2 : null" />

    <div class="table-header">

      <div style="margin-left : 10px;"> 
        <a-select v-model:value="orderType" :placeholder="formatMessage('page.locDetl.orderNo.input', '请选择单据类型')" :options="[

          { label: '手动入库单', value: 1 }, { label: '手动出库单', value: 2 }, ]" style="width: 160px;margin-right: 10px;">

      <div style="margin-left : 10px;">

        <a-select v-model:value="orderType" :placeholder="formatMessage('page.locDetl.orderNo.input', '请选择单据类型')"

          :options="[

            { label: '全部', value: null },{ label: '手动入库单', value: 1 }, { label: '手动出库单', value: 2 },]" style="width: 160px;margin-right: 10px;">

        </a-select>

        <a-select v-model:value="state.orderSettle" :placeholder="formatMessage('page.locDetl.orderNo.input', '订单状态')"

          :options="[

            { label: '全部', value: null },

            { label: '初始化', value: 1 }, { label: '待处理', value: 2 },{ label: '生成波次', value: 3 }, { label: '作业中', value: 4 },

            { label: '已取消', value: 5 }, { label: '已完成', value: 6 },{ label: '准备取消', value: 7 }, { label: '上报完成', value: 8 },

            ]" style="width: 160px;margin-right: 10px;">

        </a-select>

        <a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '请输入')"

          style="width: 200px;" @search="onSearch" />

@@ -312,7 +321,6 @@
                  {{ formatMessage('page.order.import', '单据导入') }}

                </a-upload>

              </a-menu-item>



              <a-menu-item key="export">

                <DownloadOutlined />

                {{ formatMessage('page.order.export.template', '导出模板') }}


 zy-asrs-admin/src/views/loc/locDetl/index.vue

@@ -8,7 +8,6 @@
import { formatMessage } from '@/utils/localeUtils.js';

import useTableSearch from '@/utils/tableUtils.jsx';

const context = getCurrentInstance()?.appContext.config.globalProperties;



const router = useRouter();



const TABLE_KEY = 'table-locDetl';

@@ -21,9 +20,9 @@
  orderNo: null,

  batch: null,

  tagId: null,

  orderType: null,

})

const editChild = ref(null)



const state = reactive({

  selectedRowKeys: [],

  loading: false,

@@ -372,6 +371,10 @@
          style="width: 140px;margin-right: 10px;" />

        <a-input v-model:value="searchParam.batch" :placeholder="formatMessage('page.locDetl.batch.input', '请输入批号')"

          style="width: 140px;margin-right: 10px;" />

        <a-select v-model:value="searchParam.orderType" :placeholder="formatMessage('page.locDetl.orderNo.input', '仓库类型')"

          :options="[

           { label: '全部', value: null },  { label: '立库', value: 1 }, { label: '平库', value: 2 }]" style="width: 140px;margin-right: 10px;">

        </a-select>

        <a-select v-model:value="searchParam.tagId" :placeholder="formatMessage('page.locDetl.orderNo.input', '请选择品类')"

          :options="[

            { label: '默认分类', value: 10 }, { label: '机油', value: 11 }, { label: '变速箱油', value: 17 }, { label: '火花塞', value: 18 },


 zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java

@@ -70,9 +70,10 @@
            throw new CoolException("请求参数：任务编码不能为空！！");
        }
        String taskNoStr = (String) param.get("taskNo");
        String waveNo = param.get("waveNo").toString();
//        Long matnr = Long.valueOf(taskNo.get("matnr").toString());

        return waveManagentService.getTaskDetlQutify(taskNoStr);
        return waveManagentService.getTaskDetlQutify(taskNoStr, waveNo);
    }

    /**

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java

@@ -21,7 +21,6 @@
import org.springframework.stereotype.Service;

import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;

import static com.zy.asrs.wms.utils.HttpUtils.getClientIpAddress;
@@ -94,12 +93,14 @@

    /**
     * 获取非汇总明细数据
     *
     * @param taskNo
     * @param waveNo
     * @return
     */
    @Override
    public R getTaskDetlQutify(String taskNo) {
        List<WaveTaskDetl> taskDetls = taskMapper.getTaskDetlQutify(taskNo);
    public R getTaskDetlQutify(String taskNo, String waveNo) {
        List<WaveTaskDetl> taskDetls = taskMapper.getTaskDetlQutify(taskNo, waveNo);
        return R.ok(taskDetls);
    }


 zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/WaveManagentService.java

@@ -17,7 +17,7 @@

    R getTaskDetl(String taskNo);

    R getTaskDetlQutify(String taskNo);
    R getTaskDetlQutify(String taskNo, String waveNo);

    R getAllOrders(String waveNo);


 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocDetlController.java

@@ -22,6 +22,7 @@
import com.zy.asrs.wms.asrs.service.LocDetlService;

import com.zy.asrs.wms.system.controller.BaseController;

import com.zy.asrs.wms.utils.ExcelUtil;

import org.springframework.beans.BeanUtils;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.security.access.prepost.PreAuthorize;

import org.springframework.web.bind.annotation.*;

@@ -46,10 +47,16 @@
    @PostMapping("/locDetl/page")

    @CacheData(tableName = {"man_loc_detl"})

    public R page(@RequestBody Map<String, Object> map) {

//        String orderType = null;

//        if (Objects.isNull(map.get("orderType"))) {

//             orderType = map.get("orderType").toString();

//             map.remove("orderType");

//        }

        BaseParam baseParam = buildParam(map, BaseParam.class);

        PageParam<ViewLocDetl, BaseParam> pageParam = new PageParam<>(baseParam, ViewLocDetl.class);

        PageParam<ViewLocDetl, BaseParam> data = locDetlService.getPage(pageParam, pageParam.buildWrapper(true));

        return R.ok().add(data);



        return R.ok(data);

    }



    @PreAuthorize("hasAuthority('asrs:locDetl:list')")


 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/ViewLocDetl.java

@@ -56,6 +56,9 @@
    @ApiModelProperty(value= "商品")

    private Long matId;



    @ApiModelProperty("仓库类型")

    private Integer orderType;



    /**

     * 商品编号

     */


 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/TaskMapper.java

@@ -20,7 +20,7 @@


    List<WaveTaskDetl> getTaskDetlByTaskNo(@Param("taskNo") String taskNo);



    List<WaveTaskDetl> getTaskDetlQutify(@Param("taskNo") String taskNo);

    List<WaveTaskDetl> getTaskDetlQutify(@Param("taskNo") String taskNo, @Param("waveNo") String waveNo);



    List<LargeScreenTaskDto> getTaskIntegrateByTaskNo(@Param(Constants.WRAPPER) LambdaQueryWrapper<Task> ew);

}


 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/LocDetlServiceImpl.java

@@ -42,7 +42,6 @@
    @Override

    public PageParam<ViewLocDetl, BaseParam> getPage(PageParam<ViewLocDetl, BaseParam> pageParam, QueryWrapper<ViewLocDetl> buildWrapper) {

        PageParam<ViewLocDetl, BaseParam> result = viewLocDetlMapper.selectPage(pageParam, buildWrapper);



        //解析动态字段

//        JSONObject data = JSON.parseObject(JSON.toJSONString(result));

//        List<ViewLocDetl> records = result.getRecords();


 zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml

@@ -43,7 +43,10 @@
                <if test="taskNo != null and taskNo != ''">

                    AND mt.task_no = #{taskNo}

                </if>

            )

                )

                <if test="waveNo != null and waveNo != ''">

                    AND mws.wave_no = #{waveNo}

                </if>

            GROUP BY

                order_no, matnr

        ) t