#问题修复 # 3.生成任务档作业中数量没变 4.合并订单生成任务，只生成了其中一个 5.103任务完成后，订单状态未修改 6.库位订数量未减少

skyouc

2024-12-27 b899d2388df844378ff6f2c495febf09447d954d

#问题修复
#
3.生成任务档作业中数量没变
4.合并订单生成任务，只生成了其中一个
5.103任务完成后，订单状态未修改
6.库位订数量未减少

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

@@ -50,7 +50,7 @@
  {

    title: formatMessage('db.man_order.order_no', '订单编号'),

    dataIndex: 'orderNo',

    width: 200,

    width: 230,

    ellipsis: true,

    ...getColumnSearchProps('orderNo'),

  },


 zy-asrs-admin/src/components/orderDetl/edit.vue

@@ -39,7 +39,7 @@
    {

        title: formatMessage('db.man_loc_detl.matnr', '商品编号'),

        dataIndex: 'matnr',

        width: 140,

        width: 200,

        ellipsis: true,

    },

    {


 zy-asrs-admin/src/components/orderDetl/show.vue

@@ -50,7 +50,7 @@
    {

        title: formatMessage('db.man_loc_detl.matnr', '商品编号'),

        dataIndex: 'matnr',

        width: 140,

        width: 200,

        ellipsis: true,

    },

    {


 zy-asrs-admin/src/components/orderDetlLog/show.vue

@@ -44,7 +44,7 @@
    {

        title: formatMessage('db.man_loc_detl.matnr', '商品编号'),

        dataIndex: 'matnr',

        width: 140,

        width: 180,

        ellipsis: true,

    },

    {


 zy-asrs-admin/src/components/orderLog/index.vue

@@ -45,14 +45,14 @@
  {

    title: formatMessage('db.man_order.order_no', '订单编号'),

    dataIndex: 'orderNo',

    width: 140,

    width: 230,

    ellipsis: true,

    ...getColumnSearchProps('orderNo'),

  },

  {

    title: formatMessage('db.man_order.order_time', '单据日期'),

    dataIndex: 'orderTime',

    width: 140,

    width: 180,

    ellipsis: true,

    ...getColumnSearchProps('orderTime'),

  },


 zy-asrs-admin/src/components/orderOut/orderOutWavePreview/index.vue

@@ -44,7 +44,7 @@
    {

        title: formatMessage('db.man_order_detl.matnr', '商品编号'),

        dataIndex: 'matnr',

        width: 140,

        width: 180,

        ellipsis: true,

        ...getColumnSearchProps('matnr'),

        customCell: (_, index) => {

@@ -54,7 +54,7 @@
    {

        title: formatMessage('db.man_order_detl.batch', '批号'),

        dataIndex: 'batch',

        width: 140,

        width: 110,

        ellipsis: true,

        ...getColumnSearchProps('batch'),

        customCell: (_, index) => {


 zy-asrs-admin/src/components/task/showTaskDetl/index.vue

@@ -53,8 +53,22 @@
    {

        title: formatMessage('db.man_task_detl.matnr', '商品编号'),

        dataIndex: ['mat$', 'matnr'],

        width: 140,

        width: 200,

        ellipsis: true,

    },

    {

        title: formatMessage('db.man_task_detl.order_no', '订单编号'),

        dataIndex: 'orderNo',

        width: 230,

        ellipsis: true,

        ...getColumnSearchProps('orderNo'),

    },

    {

        title: formatMessage('db.man_task_detl.wave_no', '波次编号'),

        dataIndex: ['wave$', 'waveNo'],

        width: 180,

        ellipsis: true,

        ...getColumnSearchProps('waveNo'),

    },

    {

        title: formatMessage('db.man_task_detl.maktx', '商品名称'),

@@ -90,20 +104,7 @@
        ellipsis: true,

        ...getColumnSearchProps('barcode'),

    },

    {

        title: formatMessage('db.man_task_detl.order_no', '订单编号'),

        dataIndex: 'orderNo',

        width: 140,

        ellipsis: true,

        ...getColumnSearchProps('orderNo'),

    },

    {

        title: formatMessage('db.man_task_detl.wave_no', '波次编号'),

        dataIndex: ['wave$', 'waveNo'],

        width: 140,

        ellipsis: true,

        ...getColumnSearchProps('waveNo'),

    },



];



const fieldList = [];


 zy-asrs-admin/src/views/in/waitPakin/index.vue

@@ -49,14 +49,14 @@
  {

    title: formatMessage('db.man_wait_pakin.order_id', '订单ID'),

    dataIndex: 'orderId$',

    width: 140,

    width: 100,

    ellipsis: true,

    ...getColumnSearchProps('orderId$'),

  },

  {

    title: formatMessage('db.man_wait_pakin.order_no', '订单编号'),

    dataIndex: 'orderNo',

    width: 140,

    width: 230,

    ellipsis: true,

    ...getColumnSearchProps('orderNo'),

  },


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

New file
@@ -0,0 +1,26 @@
package com.zy.asrs.wms.apis.wcs.controller;

import com.zy.asrs.framework.common.R;
import com.zy.asrs.wms.apis.wcs.services.WaveManagentService;
import com.zy.asrs.wms.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@RestController
@RequestMapping("/wave")
public class WaveManagentController extends BaseController {

    @Autowired
    private WaveManagentService waveManagentService;

    /***
     * 获取处于播种状态的任务单据
     * @return
     */
    @GetMapping("/sow/seeds")
    public R sowSeeds() {
      return  waveManagentService.getSowSeeds();
    }
}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/response/SowSeeds.java

New file
@@ -0,0 +1,32 @@
package com.zy.asrs.wms.apis.wcs.entity.response;

import lombok.Data;
import lombok.experimental.Accessors;

import java.io.Serializable;

@Data
@Accessors(chain = true)
public class SowSeeds implements Serializable {

//    private String siteId;

    private String siteNo;

    private String orderNo;

    private String matnr;

    private Long workQty;

    private Long anfme;

    private String batch;

    private String createTime;

    private String createBy;

    private String memo;

}

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

New file
@@ -0,0 +1,22 @@
package com.zy.asrs.wms.apis.wcs.services.Impl;

import com.zy.asrs.framework.common.R;
import com.zy.asrs.wms.apis.wcs.entity.response.SowSeeds;
import com.zy.asrs.wms.apis.wcs.services.WaveManagentService;
import com.zy.asrs.wms.asrs.service.WaveSeedService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

@Service
public class WaveManagentServiceImpl implements WaveManagentService {
    @Autowired
    private WaveSeedService waveSeedService;

    @Override
    public R getSowSeeds() {
        List<SowSeeds> waveSeeds = waveSeedService.selectSeedsList();
        return R.ok(waveSeeds);
    }
}

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

New file
@@ -0,0 +1,8 @@
package com.zy.asrs.wms.apis.wcs.services;


import com.zy.asrs.framework.common.R;

public interface WaveManagentService {
    R getSowSeeds();
}

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

@@ -66,9 +66,9 @@
        if (!(order.getOrderType() == 1)) {

            return R.error("非入库订单， 不可操作！！");

        }

        if (order.getOrderSettle() > 2) {

            return R.error("单据当前状态不可做入库操作！！");

        }

//        if (order.getOrderSettle() > 2) {

//            return R.error("单据当前状态不可做入库操作！！");

//        }

        List<OrderInfoDto> orders = orderService.getDetlForOrderId(order.getId());



        return R.ok(orders);

@@ -140,4 +140,5 @@
            return R.ok("组托失败！！");

        }

    }



}


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

@@ -184,7 +184,7 @@
    public Double getWaitQty(){

        Double qty = 0D;

        WaitPakinService service = SpringUtils.getBean(WaitPakinService.class);

        List<WaitPakin> waitPakins = service.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getDetlId, id));

        List<WaitPakin> waitPakins = service.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getDetlId, id).eq(WaitPakin::getIoStatus, 0));

        for (WaitPakin waitPakin : waitPakins) {

            qty += waitPakin.getAnfme();

        }


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

@@ -1,12 +1,19 @@
package com.zy.asrs.wms.asrs.mapper;



import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

import com.baomidou.mybatisplus.core.toolkit.Constants;

import com.zy.asrs.wms.apis.wcs.entity.response.SowSeeds;

import com.zy.asrs.wms.asrs.entity.WaveSeed;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;

import org.apache.ibatis.annotations.Mapper;

import org.apache.ibatis.annotations.Param;

import org.springframework.stereotype.Repository;



import java.util.List;



@Mapper

@Repository

public interface WaveSeedMapper extends BaseMapper<WaveSeed> {



    List<SowSeeds> getSeedsList(@Param(Constants.WRAPPER) LambdaQueryWrapper<WaveSeed> ew);

}


 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaveSeedService.java

@@ -1,11 +1,15 @@
package com.zy.asrs.wms.asrs.service;



import com.baomidou.mybatisplus.extension.service.IService;

import com.zy.asrs.wms.apis.wcs.entity.response.SowSeeds;

import com.zy.asrs.wms.asrs.entity.WaveSeed;

import com.zy.asrs.wms.asrs.entity.param.WaveSeedReviewParam;



import java.util.List;



public interface WaveSeedService extends IService<WaveSeed> {



    void waveSeedReview(WaveSeedReviewParam param);



    List<SowSeeds> selectSeedsList();

}


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

@@ -1,6 +1,8 @@
package com.zy.asrs.wms.asrs.service.impl;



import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

import com.zy.asrs.framework.exception.CoolException;

import com.zy.asrs.wms.apis.wcs.entity.response.SowSeeds;

import com.zy.asrs.wms.asrs.entity.param.WaveSeedReviewParam;

import com.zy.asrs.wms.asrs.mapper.WaveSeedMapper;

import com.zy.asrs.wms.asrs.entity.WaveSeed;

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



import java.util.Date;

import java.util.List;

import java.util.Optional;



@Service("waveSeedService")

@@ -48,4 +51,9 @@
            throw new CoolException("播种复核更新失败");

        }

    }



    @Override

    public List<SowSeeds> selectSeedsList() {

       return this.baseMapper.getSeedsList(new LambdaQueryWrapper<WaveSeed>().eq(WaveSeed::getStatus, 1));

    }

}


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

@@ -2,4 +2,13 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

<mapper namespace="com.zy.asrs.wms.asrs.mapper.WaveSeedMapper">



<!--    waveLabels: {siteId: '站点标识', siteNo: '站点编号', orderNo: '订单编号', matnr: '商品编号', workQty: '复核数量', anfme: '数量' ,batch: '批号', createTime$: '添加时间', createBy$: '添加人员', memo: '备注' },-->



    <select id="getSeedsList" resultType="com.zy.asrs.wms.apis.wcs.entity.response.SowSeeds">

        SELECT

        *

        FROM

        ( SELECT site_id, site_no, order_no, anfme, work_qty, matnr, batch, create_time, `status`, create_by, memo FROM man_wave_seed ) t

        ${ew.customSqlSegment}

    </select>

</mapper>