#

luxiaotao1123

2022-04-01 1b13c69e4e2bb00bea4e90232a78715d49f1e24f

#

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

File was deleted

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

@@ -288,7 +288,7 @@
    /*************************************** xm-select ***********************************************/

    // xm-select 搜索商品列表
    @RequestMapping("/mat/all/get/kv0") // todo:luxiaotao
    @RequestMapping("/mat/all/get/kv")
    @ManagerAuth
    public R getMatDataKV(@RequestParam(required = false) String condition) {
        Wrapper<Mat> wrapper = new EntityWrapper<Mat>()

 src/main/java/com/zy/asrs/entity/AdjDetl.java

@@ -7,7 +7,7 @@
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.MatCodeService;
import com.zy.asrs.service.MatService;
import com.zy.system.service.UserService;
import com.zy.system.entity.User;
import io.swagger.annotations.ApiModelProperty;
@@ -183,10 +183,10 @@
    }

    public String getMatNo$(){
        MatCodeService service = SpringUtils.getBean(MatCodeService.class);
        MatCode matCode = service.selectById(this.matNo);
        if (!Cools.isEmpty(matCode)){
            return String.valueOf(matCode.getMatNo());
        MatService service = SpringUtils.getBean(MatService.class);
        Mat mat = service.selectByMatnr(this.matNo);
        if (!Cools.isEmpty(mat)){
            return String.valueOf(mat.getMatnr());
        }
        return null;
    }

 src/main/java/com/zy/asrs/entity/LocDetl.java

@@ -136,7 +136,7 @@
    private Integer source;

    @ApiModelProperty(value= "要求检验 1: 是  0: 否  ")
    private Integer check;
    private Integer inspect;

    @ApiModelProperty(value= "危险品 1: 是  0: 否  ")
    private Integer danger;
@@ -195,15 +195,15 @@
        }
    }

    public String getCheck$(){
        if (null == this.check){ return null; }
        switch (this.check){
    public String getInspect$(){
        if (null == this.inspect){ return null; }
        switch (this.inspect){
            case 1:
                return "是";
            case 0:
                return "否";
            default:
                return String.valueOf(this.check);
                return String.valueOf(this.inspect);
        }
    }


 src/main/java/com/zy/asrs/entity/Mat.java

@@ -255,7 +255,7 @@
     * 要求检验 1: 是  0: 否
     */
    @ApiModelProperty(value= "要求检验 1: 是  0: 否  ")
    private Integer check;
    private Integer inspect;

    /**
     * 危险品 1: 是  0: 否
@@ -308,7 +308,7 @@

    public Mat() {}

    public Mat(String uuid,Long tagId,String matnr,String maktx,String name,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer check,Integer danger,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
    public Mat(String uuid,Long tagId,String matnr,String maktx,String name,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
        this.uuid = uuid;
        this.tagId = tagId;
        this.matnr = matnr;
@@ -338,7 +338,7 @@
        this.deadTime = deadTime;
        this.deadWarn = deadWarn;
        this.source = source;
        this.check = check;
        this.inspect = inspect;
        this.danger = danger;
        this.status = status;
        this.createBy = createBy;
@@ -423,15 +423,15 @@
        }
    }

    public String getCheck$(){
        if (null == this.check){ return null; }
        switch (this.check){
    public String getInspect$(){
        if (null == this.inspect){ return null; }
        switch (this.inspect){
            case 1:
                return "是";
            case 0:
                return "否";
            default:
                return String.valueOf(this.check);
                return String.valueOf(this.inspect);
        }
    }


 src/main/java/com/zy/asrs/entity/MatCode.java

File was deleted

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

@@ -238,7 +238,7 @@
     * 要求检验 1: 是  0: 否
     */
    @ApiModelProperty(value= "要求检验 1: 是  0: 否  ")
    private Integer check;
    private Integer inspect;

    /**
     * 危险品 1: 是  0: 否
@@ -290,7 +290,7 @@

    public OrderDetl() {}

    public OrderDetl(Long orderId, String orderNo, Double anfme, Double qty, String matnr, String maktx, String batch, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double length, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer check, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
    public OrderDetl(Long orderId, String orderNo, Double anfme, Double qty, String matnr, String maktx, String batch, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double length, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
        this.orderId = orderId;
        this.orderNo = orderNo;
        this.anfme = anfme;
@@ -322,7 +322,7 @@
        this.deadTime = deadTime;
        this.deadWarn = deadWarn;
        this.source = source;
        this.check = check;
        this.inspect = inspect;
        this.danger = danger;
        this.status = status;
        this.createBy = createBy;
@@ -367,15 +367,15 @@
        }
    }

    public String getCheck$(){
        if (null == this.check){ return null; }
        switch (this.check){
    public String getInspect$(){
        if (null == this.inspect){ return null; }
        switch (this.inspect){
            case 1:
                return "是";
            case 0:
                return "否";
            default:
                return String.valueOf(this.check);
                return String.valueOf(this.inspect);
        }
    }


 src/main/java/com/zy/asrs/entity/WaitPakin.java

@@ -124,7 +124,7 @@
    private Integer source;

    @ApiModelProperty(value= "要求检验 1: 是  0: 否  ")
    private Integer check;
    private Integer inspect;

    @ApiModelProperty(value= "危险品 1: 是  0: 否  ")
    private Integer danger;
@@ -181,15 +181,15 @@
        }
    }

    public String getCheck$(){
        if (null == this.check){ return null; }
        switch (this.check){
    public String getInspect$(){
        if (null == this.inspect){ return null; }
        switch (this.inspect){
            case 1:
                return "是";
            case 0:
                return "否";
            default:
                return String.valueOf(this.check);
                return String.valueOf(this.inspect);
        }
    }


 src/main/java/com/zy/asrs/entity/WaitPakinLog.java

@@ -120,7 +120,7 @@
    private Integer source;

    @ApiModelProperty(value= "要求检验 1: 是  0: 否  ")
    private Integer check;
    private Integer inspect;

    @ApiModelProperty(value= "危险品 1: 是  0: 否  ")
    private Integer danger;
@@ -177,15 +177,15 @@
        }
    }

    public String getCheck$(){
        if (null == this.check){ return null; }
        switch (this.check){
    public String getInspect$(){
        if (null == this.inspect){ return null; }
        switch (this.inspect){
            case 1:
                return "是";
            case 0:
                return "否";
            default:
                return String.valueOf(this.check);
                return String.valueOf(this.inspect);
        }
    }


 src/main/java/com/zy/asrs/entity/WrkDetl.java

@@ -230,7 +230,7 @@
     * 要求检验 1: 是  0: 否
     */
    @ApiModelProperty(value= "要求检验 1: 是  0: 否  ")
    private Integer check;
    private Integer inspect;

    /**
     * 危险品 1: 是  0: 否
@@ -305,15 +305,15 @@
        }
    }

    public String getCheck$(){
        if (null == this.check){ return null; }
        switch (this.check){
    public String getInspect$(){
        if (null == this.inspect){ return null; }
        switch (this.inspect){
            case 1:
                return "是";
            case 0:
                return "否";
            default:
                return String.valueOf(this.check);
                return String.valueOf(this.inspect);
        }
    }


 src/main/java/com/zy/asrs/entity/WrkDetlLog.java

@@ -226,7 +226,7 @@
     * 要求检验 1: 是  0: 否
     */
    @ApiModelProperty(value= "要求检验 1: 是  0: 否  ")
    private Integer check;
    private Integer inspect;

    /**
     * 危险品 1: 是  0: 否
@@ -301,15 +301,15 @@
        }
    }

    public String getCheck$(){
        if (null == this.check){ return null; }
        switch (this.check){
    public String getInspect$(){
        if (null == this.inspect){ return null; }
        switch (this.inspect){
            case 1:
                return "是";
            case 0:
                return "否";
            default:
                return String.valueOf(this.check);
                return String.valueOf(this.inspect);
        }
    }


 src/main/java/com/zy/asrs/entity/param/FullStoreParam.java

@@ -23,7 +23,7 @@
    public static class MatCodeStore {

        // 物料编号
        private String matNo;
        private String matnr;

        // 批号
        private String batch;

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

File was deleted

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

File was deleted

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

File was deleted

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

@@ -13,7 +13,6 @@
import com.zy.asrs.entity.param.LocDetlAdjustParam;
import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.VersionUtils;
import com.zy.common.model.*;
import com.zy.common.model.enums.WorkNoType;
import com.zy.common.service.CommonService;
@@ -79,8 +78,8 @@
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getDevpNo(), true);
        // 检索库位
        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
        List<String> matNos = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatNo).distinct().collect(Collectors.toList());
        StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), matNos, locTypeDto, 0);
        List<String> matnrs = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatnr).distinct().collect(Collectors.toList());
        StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), matnrs, locTypeDto, 0);
        // 生成工作号
        int workNo = dto.getWorkNo();
        // 生成工作档
@@ -111,7 +110,7 @@
        // 生成工作档明细
        List<DetlDto> detlDtos = new ArrayList<>();
        param.getList().forEach(elem -> {
            DetlDto detlDto = new DetlDto(elem.getMatNo(), elem.getBatch(), elem.getAnfme());
            DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
            if (DetlDto.has(detlDtos, detlDto)) {
                DetlDto detlDto1 = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
                assert detlDto1 != null;

 src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java

@@ -9,7 +9,6 @@
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.common.service.ErpService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -35,8 +34,6 @@
    private WaitPakinService waitPakinService;
    @Autowired
    private WaitPakinLogService waitPakinLogService;
    @Autowired
    private ErpService erpService;
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;
    @Autowired

 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java

@@ -7,7 +7,6 @@
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.utils.VersionUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

 src/main/java/com/zy/asrs/utils/VersionUtils.java

@@ -1,9 +1,7 @@
package com.zy.asrs.utils;

import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.MatCode;
import com.zy.common.model.LocTypeDto;
import com.zy.common.utils.excel.matcode.MatCodeExcel;

/**
 * Created by vincent on 2020/7/14
@@ -113,80 +111,6 @@
//        wrkDetl.setAltme(orderDetl.getUnit()); // 单位
//    }


    // excel ----------------------------------------------------------------------

    public static MatCodeExcel getExcel(MatCode matCode) {
        return new MatCodeExcel(
                matCode.getMatNo(),
                matCode.getBarcode(),
                matCode.getMatName(),
                matCode.getStr1(),
                matCode.getStr2(),
                matCode.getStr3(),
                matCode.getStr4(),
                matCode.getStr5(),
                matCode.getStr6(),
                matCode.getStr7(),
                matCode.getStr8(),
                matCode.getStr9(),
                matCode.getStr10(),
                matCode.getStr11(),
                matCode.getStr12(),
                matCode.getStr13(),
                matCode.getStr14(),
                matCode.getStr15(),
                matCode.getStr16(),
                matCode.getStr17(),
                matCode.getStr18(),
                matCode.getStr19(),
                matCode.getStr20(),
                matCode.getStr21(),
                matCode.getStr22(),
                matCode.getStr23(),
                matCode.getNum1(),
                matCode.getNum2(),
                matCode.getNum3(),
                matCode.getNum4(),
                matCode.getNum5(),
                matCode.getNum6()
        );
    }

    public static void setMatCode(MatCode matCode, MatCodeExcel excel) {
        matCode.setMatNo(excel.getMatNo());
        matCode.setMatName(excel.getMatName());
        matCode.setBarcode(excel.getBarcode());
        matCode.setStr1(excel.getStr1());
        matCode.setStr2(excel.getStr2());
        matCode.setStr3(excel.getStr3());
        matCode.setStr4(excel.getStr4());
        matCode.setStr5(excel.getStr5());
        matCode.setStr6(excel.getStr6());
        matCode.setStr7(excel.getStr7());
        matCode.setStr8(excel.getStr8());
        matCode.setStr9(excel.getStr9());
        matCode.setStr10(excel.getStr10());
        matCode.setStr11(excel.getStr11());
        matCode.setStr12(excel.getStr12());
        matCode.setStr13(excel.getStr13());
        matCode.setStr14(excel.getStr14());
        matCode.setStr15(excel.getStr15());
        matCode.setStr16(excel.getStr16());
        matCode.setStr17(excel.getStr17());
        matCode.setStr18(excel.getStr18());
        matCode.setStr19(excel.getStr19());
        matCode.setStr20(excel.getStr20());
        matCode.setStr21(excel.getStr21());
        matCode.setStr22(excel.getStr22());
        matCode.setStr23(excel.getStr23());
        matCode.setNum1(excel.getNum1());
        matCode.setNum2(excel.getNum2());
        matCode.setNum3(excel.getNum3());
        matCode.setNum4(excel.getNum4());
        matCode.setNum5(excel.getNum5());
        matCode.setNum6(excel.getNum6());
    }

    /**
     *  库位移转时类型检测

 src/main/java/com/zy/common/service/ErpService.java

File was deleted

 src/main/java/com/zy/common/utils/Synchro.java

New file
@@ -0,0 +1,7 @@
package com.zy.common.utils;

public interface Synchro {

    void sync(String matnr,String maktx,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer check,Integer danger);

}

 src/main/java/com/zy/common/utils/excel/ExcelUtils.java

File was deleted

 src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java

File was deleted

 src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java

File was deleted

 src/main/java/com/zy/common/web/FileController.java

@@ -1,28 +1,19 @@
package com.zy.common.web;

import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.zy.asrs.entity.MatCode;
import com.zy.asrs.service.MatCodeService;
import com.zy.common.config.AdminInterceptor;
import com.zy.common.utils.BarcodeUtils;
import com.zy.common.utils.QrCode;
import com.zy.common.utils.excel.matcode.MatCodeExcel;
import com.zy.common.utils.excel.matcode.MatCodeExcelListener;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletResponse;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.List;

/**
 * todo
@@ -32,43 +23,7 @@
@RequestMapping("file/")
public class FileController {

    @Autowired
    private MatCodeService matCodeService;
    /**
     * 文件上传
     */
    @PostMapping("upload")
    @ResponseBody
    public R upload(MultipartFile file) throws IOException {
        EasyExcel.read(file.getInputStream(), MatCodeExcel.class, new MatCodeExcelListener()).sheet().doRead();
        return R.ok();
    }

    /**
     * 文件下载（失败了会返回一个有部分数据的Excel）
     */
    @GetMapping("download")
    public void download(HttpServletResponse response) throws IOException {
        List<MatCode> list = matCodeService.selectList(new EntityWrapper<>());

        List<MatCodeExcel> excels = new ArrayList<>();
        for (MatCode matCode : list) {
            MatCodeExcel excel = new MatCodeExcel();
            excel.setMatNo(matCode.getMatNo());
            excel.setBarcode(matCode.getBarcode());
            excel.setMatName(matCode.getMatName());
            excel.setStr1(matCode.getStr1());
            excels.add(excel);
        }
        // 这里注意 有同学反应使用swagger 会导致各种问题，请直接用浏览器或者用postman
        response.setContentType("application/vnd.ms-excel");
        response.setCharacterEncoding("utf-8");
        // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系
        String fileName = URLEncoder.encode("测试", "UTF-8");
        response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
        EasyExcel.write(response.getOutputStream(), MatCodeExcel.class).sheet("模板").doWrite(excels);
    }

  
    @RequestMapping(value = "/barcode/qrcode/auth")
//    @ManagerAuth(memo = "商品编号条形码获取(type:1(条形码);2(二维码)")
    public R matCodeBarcode(@RequestParam(defaultValue = "1") Integer type

 src/main/resources/mapper/LocDetlMapper.xml

@@ -36,7 +36,7 @@
        <result column="dead_time" property="deadTime" />
        <result column="dead_warn" property="deadWarn" />
        <result column="source" property="source" />
        <result column="check" property="check" />
        <result column="inspect" property="inspect" />
        <result column="danger" property="danger" />

        <result column="modi_user" property="modiUser" />

 src/main/resources/mapper/MatCodeMapper.xml

File was deleted

 src/main/resources/mapper/MatMapper.xml

@@ -34,7 +34,7 @@
        <result column="dead_time" property="deadTime" />
        <result column="dead_warn" property="deadWarn" />
        <result column="source" property="source" />
        <result column="check" property="check" />
        <result column="inspect" property="inspect" />
        <result column="danger" property="danger" />
        <result column="status" property="status" />
        <result column="create_by" property="createBy" />

 src/main/resources/mapper/OrderDetlMapper.xml

@@ -37,7 +37,7 @@
        <result column="dead_time" property="deadTime" />
        <result column="dead_warn" property="deadWarn" />
        <result column="source" property="source" />
        <result column="check" property="check" />
        <result column="inspect" property="inspect" />
        <result column="danger" property="danger" />

        <result column="status" property="status" />

 src/main/resources/mapper/WaitPakinLogMapper.xml

@@ -36,7 +36,7 @@
        <result column="dead_time" property="deadTime" />
        <result column="dead_warn" property="deadWarn" />
        <result column="source" property="source" />
        <result column="check" property="check" />
        <result column="inspect" property="inspect" />
        <result column="danger" property="danger" />

        <result column="status" property="status" />

 src/main/resources/mapper/WaitPakinMapper.xml

@@ -36,7 +36,7 @@
        <result column="dead_time" property="deadTime" />
        <result column="dead_warn" property="deadWarn" />
        <result column="source" property="source" />
        <result column="check" property="check" />
        <result column="inspect" property="inspect" />
        <result column="danger" property="danger" />

        <result column="status" property="status" />

 src/main/resources/mapper/WrkDetlLogMapper.xml

@@ -37,7 +37,7 @@
        <result column="dead_time" property="deadTime" />
        <result column="dead_warn" property="deadWarn" />
        <result column="source" property="source" />
        <result column="check" property="check" />
        <result column="inspect" property="inspect" />
        <result column="danger" property="danger" />

        <result column="modi_user" property="modiUser" />

 src/main/resources/mapper/WrkDetlMapper.xml

@@ -37,7 +37,7 @@
        <result column="dead_time" property="deadTime" />
        <result column="dead_warn" property="deadWarn" />
        <result column="source" property="source" />
        <result column="check" property="check" />
        <result column="inspect" property="inspect" />
        <result column="danger" property="danger" />

        <result column="modi_user" property="modiUser" />

 src/main/webapp/static/js/matCode/matCode.js

File was deleted

 src/main/webapp/static/js/pakStore/pakStore.js

@@ -173,7 +173,7 @@
        return
    }
    $.ajax({
        url: baseUrl + "/matCode/" + el.value + "/auth",
        url: baseUrl + "/mat/" + el.value + "/auth",
        headers: {'token': localStorage.getItem('token')},
        method: 'GET',
        success: function (res) {

 src/main/webapp/views/matCode/matCode.html

File was deleted

 src/main/webapp/views/matCode/matCode_detail.html

File was deleted

 src/main/webapp/views/pakStore/matQuery.html

@@ -52,7 +52,7 @@
    </fieldset>

    <div class="layui-form">
        <table class="layui-hide" id="matCode" lay-filter="matCode"></table>
        <table class="layui-hide" id="mat" lay-filter="mat"></table>
    </div>
</div>

@@ -94,9 +94,9 @@

        // 物料查询数据表
        matQueryTable = table.render({
            elem: '#matCode',
            elem: '#mat',
            headers: {token: localStorage.getItem('token')},
            url: baseUrl + '/matCode/list/auth',
            url: baseUrl + '/mat/list/auth',
            page: true,
            limit: 7,
            limits: [7, 10, 30,50,100],
@@ -127,7 +127,7 @@
        });

        // 监听头工具栏事件
        table.on('toolbar(matCode)', function (obj) {
        table.on('toolbar(mat)', function (obj) {
            let checkStatus = table.checkStatus(obj.config.id);
            let data = checkStatus.data;
            switch(obj.event) {