自动化立体仓库 - WMS系统
#
LSH
2023-11-12 211ae7e060b36da7c1bc790c12ccd2159aaec011
#
5个文件已修改
145 ■■■■ 已修改文件
src/main/java/com/zy/asrs/entity/result/OutLocBoxVo.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java 62 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/common/entity/OutLocBoxExcel.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/layuiadmin/json/forum/replys.js 70 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/entity/result/OutLocBoxVo.java
@@ -13,6 +13,8 @@
    @ExcelProperty(value = "箱号")
    private String batch;
    @ExcelProperty(value = "订单号")
    private String orderNo;
    public OutLocBoxVo() {
    }
@@ -21,4 +23,9 @@
        this.batch = batch;
    }
    public OutLocBoxVo(String batch,String orderNo) {
        this.batch = batch;
        this.orderNo = orderNo;
    }
}
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -185,9 +185,12 @@
    @Override
    @Transactional
    public void startupFullTakeStoreOrder(StockOutParam param, Long userId) {
        if (Cools.isEmpty(param) || Cools.isEmpty(param.getOrderNo()) || Cools.isEmpty(param.getLocDetls())){
        if (Cools.isEmpty(param) || Cools.isEmpty(param.getLocDetls())){
            throw new CoolException("参数为空");
        }
        if (Cools.isEmpty(param.getOrderNo())){
            throw new CoolException("订单号参数为空");
        }
        DocType docType = docTypeService.selectOrAdd("手动出库单", Boolean.FALSE);
        Order order = orderService.selectByNo(param.getOrderNo());
        if (Cools.isEmpty(order)){
src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
@@ -2,10 +2,21 @@
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.TagService;
import com.zy.asrs.service.WorkService;
import com.zy.common.entity.OutLocBoxExcel;
import com.zy.common.model.LocDto;
import lombok.extern.slf4j.Slf4j;
import java.util.ArrayList;
@@ -21,7 +32,7 @@
    private int total = 0;
    private Long userId;
    List<String> batchs = new ArrayList<>();
    List<String[]> OutLocBoxCs = new ArrayList<>();
    public OutLocBoxExcelListener() {
    }
@@ -50,7 +61,11 @@
    @Override
    public void invoke(OutLocBoxExcel excel, AnalysisContext ctx) {
        String batch = excel.getBatch();
        batchs.add(batch);
        String orderNo = excel.getOrderNo();
        String[] s=new String[2];
        s[0] = batch;
        s[1] = orderNo;
        OutLocBoxCs.add(s);
        total++;
    }
@@ -60,7 +75,48 @@
     */
    @Override
    public void doAfterAllAnalysed(AnalysisContext ctx) {
        log.info("生成{}条出库任务!", total);
        if (!Cools.isEmpty(OutLocBoxCs) && OutLocBoxCs.size() != 0) {
            LocDetlService locDetlService = SpringUtils.getBean(LocDetlService.class);
            WorkService workService = SpringUtils.getBean(WorkService.class);
            List<LocDto> locDtos = new ArrayList<>();
            for (String[] outLocBoxC:OutLocBoxCs){
                LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("batch", outLocBoxC[0]));
                if (Cools.isEmpty(locDetl)){
                    total--;
                    continue;
                }
                LocDto locDto = new LocDto(locDetl.getManu(), locDetl.getMatnr(), locDetl.getMaktx(),locDetl.getModel(),locDetl.getSpecs(),
                        locDetl.getBatch(),locDetl.getBrand(),locDetl.getBarcode(), outLocBoxC[1],locDetl.getAnfme());
                locDtos.add(locDto);
            }
            StockOutParam param = new StockOutParam();
            ArrayList<StockOutParam.LocDetl> locDetls = new ArrayList<>();
            for (LocDto locDto:locDtos){
                StockOutParam.LocDetl locDetl = new StockOutParam.LocDetl();
                locDetl.setBrand(locDto.getBrand());
                locDetl.setLocNo(locDto.getLocNo());
                locDetl.setAnfme(locDto.getAnfme());
                locDetl.setMatnr(locDto.getMatnr());
                locDetl.setBatch(locDto.getBatch());
                locDetl.setModel(locDto.getModel());
                locDetl.setSpecs(locDto.getSpecs());
                locDetl.setZpallet(locDto.getZpallet());
                param.setOrderNo(locDto.getOrderNo());
                locDetls.add(locDetl);
            }
            param.setLocDetls(locDetls);
            if (total>0){
                workService.startupFullTakeStoreOrder(param,9999L);
            }
        }
        log.info("导入{}条箱号!", total);
    }
    public int getTotal() {
src/main/java/com/zy/common/entity/OutLocBoxExcel.java
@@ -18,5 +18,6 @@
public class OutLocBoxExcel extends OutLocBoxVo {
    private String batch;
    private String orderNo;
}
src/main/webapp/static/layuiadmin/json/forum/replys.js
@@ -1,69 +1 @@
{
  "code": 0
  ,"msg": ""
  ,"count": "100"
  ,"data": [{
    "id": "001"
    ,"replyer": "吴"
    ,"cardid": "1002"
    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
    ,"content": "有眼光,我也喜欢胡歌!"
    ,"replytime": 20161205
  },{
    "id": "002"
    ,"replyer": "郑"
    ,"cardid": "1002"
    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
    ,"content": "同上同上。"
    ,"replytime": 20161205
  },{
    "id": "003"
    ,"replyer": "王"
    ,"cardid": "1003"
    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
    ,"content": "能过一定过,不能过紧张也没用"
    ,"replytime": 20170405
  },{
    "id": "004"
    ,"replyer": "冯"
    ,"cardid": "1001"
    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
    ,"content": "可能因为你流鼻血了。"
    ,"replytime": 20170405
  },{
    "id": "005"
    ,"replyer": "陈"
    ,"cardid": "1003"
    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
    ,"content": "加油加油,看好你"
    ,"replytime": 20170405
  },{
    "id": "006"
    ,"replyer": "褚"
    ,"cardid": "1005"
    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
    ,"content": "纯属放屁"
    ,"replytime": 20180207
  },{
    "id": "007"
    ,"replyer": "卫"
    ,"cardid": "1005"
    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
    ,"content": "可以试试"
    ,"replytime": 20180207
  },{
    "id": "006"
    ,"replyer": "蒋"
    ,"cardid": "1006"
    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
    ,"content": "是啊是啊,太恐怖了。"
    ,"replytime": 20180512
  },{
    "id": "007"
    ,"replyer": "沈"
    ,"cardid": "1008"
    ,"avatar": "https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg"
    ,"content": "魏家凉皮的凉皮就很不错奥。"
    ,"replytime": 20180515
  }]
}
{"code":0,"msg":"","count":"100","data":[{"id":"001","replyer":"吴","cardid":"1002","avatar":"https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg","content":"有眼光,我也喜欢胡歌!","replytime":20161205},{"id":"002","replyer":"郑","cardid":"1002","avatar":"https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg","content":"同上同上。","replytime":20161205},{"id":"003","replyer":"王","cardid":"1003","avatar":"https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg","content":"能过一定过,不能过紧张也没用","replytime":20170405},{"id":"004","replyer":"冯","cardid":"1001","avatar":"https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg","content":"可能因为你流鼻血了。","replytime":20170405},{"id":"005","replyer":"陈","cardid":"1003","avatar":"https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg","content":"加油加油,看好你","replytime":20170405},{"id":"006","replyer":"褚","cardid":"1005","avatar":"https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg","content":"纯属放屁","replytime":20180207},{"id":"007","replyer":"卫","cardid":"1005","avatar":"https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg","content":"可以试试","replytime":20180207},{"id":"006","replyer":"蒋","cardid":"1006","avatar":"https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg","content":"是啊是啊,太恐怖了。","replytime":20180512},{"id":"007","replyer":"沈","cardid":"1008","avatar":"https://wx2.sinaimg.cn/mw690/5db11ff4gy1fmx4kec5bvj20eb0h3mxh.jpg","content":"魏家凉皮的凉皮就很不错奥。","replytime":20180515}]}