#

18516761980

2021-08-18 000d8ff50a38cd3464ae81f6e7cabd11753a441d

#

 pom.xml

@@ -116,7 +116,7 @@
    </dependencies>

    <build>
        <finalName>gdwms</finalName>
        <finalName>whthwms</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>

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

@@ -22,7 +22,7 @@
    /**
     * 产品代号
     */
    @ApiModelProperty(value= "产品代号")
    @ApiModelProperty(value= "产品编码")
    @TableId(value = "mat_no", type = IdType.INPUT)
    @TableField("mat_no")
    private String matNo;
@@ -41,18 +41,45 @@
    private String matName;

    /**
     * 基本单位
     * 规格
     */
    @ApiModelProperty(value= "基本单位")
    @ApiModelProperty(value= "规格")
    private String specs;

    /**
     * 单位
     */
    @ApiModelProperty(value= "单位")
    private String unit;

    /**
     * 尺寸
     */
    @ApiModelProperty(value= "尺寸")
    private String size;

    /**
     * 颜色
     */
    @ApiModelProperty(value= "颜色")
    private String color;

    /**
     * 单重
     */
    @ApiModelProperty(value= "单重")
    private Double weight;

    @ApiModelProperty(value= "")
    private String str1;

    @ApiModelProperty(value= "规格型号")
    @ApiModelProperty(value= "")
    private String str2;

    @ApiModelProperty(value= "颜色")
    @ApiModelProperty(value= "")
    private String str3;

    @ApiModelProperty(value= "库位名称")
    @ApiModelProperty(value= "")
    private String str4;

    @ApiModelProperty(value= "")
@@ -74,45 +101,6 @@
    private String str10;

    @ApiModelProperty(value= "")
    private String str11;

    @ApiModelProperty(value= "")
    private String str12;

    @ApiModelProperty(value= "")
    private String str13;

    @ApiModelProperty(value= "")
    private String str14;

    @ApiModelProperty(value= "")
    private String str15;

    @ApiModelProperty(value= "")
    private String str16;

    @ApiModelProperty(value= "")
    private String str17;

    @ApiModelProperty(value= "")
    private String str18;

    @ApiModelProperty(value= "")
    private String str19;

    @ApiModelProperty(value= "")
    private String str20;

    @ApiModelProperty(value= "")
    private String str21;

    @ApiModelProperty(value= "")
    private String str22;

    @ApiModelProperty(value= "")
    private String str23;

    @ApiModelProperty(value= "")
    private Double num1;

    @ApiModelProperty(value= "")
@@ -126,9 +114,6 @@

    @ApiModelProperty(value= "")
    private Double num5;

    @ApiModelProperty(value= "")
    private Double num6;

    @ApiModelProperty(value= "")
    private Date date1;
@@ -166,9 +151,14 @@

    public MatCode() {}

    public MatCode(String barcode,String matName,String str1,String str2,String str3,String str4,String str5,String str6,String str7,String str8,String str9,String str10,String str11,String str12,String str13,String str14,String str15,String str16,String str17,String str18,String str19,String str20,String str21,String str22,String str23,Double num1,Double num2,Double num3,Double num4,Double num5,Double num6,Date date1,Long appeUser,Date appeTime,Long modiUser,Date modiTime,Short status) {
    public MatCode(String barcode,String matName,String specs,String unit,String size,String color,Double weight,String str1,String str2,String str3,String str4,String str5,String str6,String str7,String str8,String str9,String str10,Double num1,Double num2,Double num3,Double num4,Double num5,Date date1,Long appeUser,Date appeTime,Long modiUser,Date modiTime,Short status) {
        this.barcode = barcode;
        this.matName = matName;
        this.specs = specs;
        this.unit = unit;
        this.size = size;
        this.color = color;
        this.weight = weight;
        this.str1 = str1;
        this.str2 = str2;
        this.str3 = str3;
@@ -179,25 +169,11 @@
        this.str8 = str8;
        this.str9 = str9;
        this.str10 = str10;
        this.str11 = str11;
        this.str12 = str12;
        this.str13 = str13;
        this.str14 = str14;
        this.str15 = str15;
        this.str16 = str16;
        this.str17 = str17;
        this.str18 = str18;
        this.str19 = str19;
        this.str20 = str20;
        this.str21 = str21;
        this.str22 = str22;
        this.str23 = str23;
        this.num1 = num1;
        this.num2 = num2;
        this.num3 = num3;
        this.num4 = num4;
        this.num5 = num5;
        this.num6 = num6;
        this.date1 = date1;
        this.appeUser = appeUser;
        this.appeTime = appeTime;
@@ -261,6 +237,26 @@
    public void setBarcode(String barcode) {
        this.barcode = barcode;
    }

    public String getSpecs() { return specs; }

    public void setSpecs(String specs) { this.specs = specs; }

    public String getUnit() { return unit; }

    public void setUnit(String unit) { this.unit = unit; }

    public String getSize() { return size; }

    public void setSize(String size) { this.size = size; }

    public String getColor() { return color; }

    public void setColor(String color) { this.color = color; }

    public Double getWeight() { return weight; }

    public void setWeight(Double weight) { this.weight = weight; }

    public String getMatName() {
        return matName;
@@ -350,110 +346,6 @@
        this.str10 = str10;
    }

    public String getStr11() {
        return str11;
    }

    public void setStr11(String str11) {
        this.str11 = str11;
    }

    public String getStr12() {
        return str12;
    }

    public void setStr12(String str12) {
        this.str12 = str12;
    }

    public String getStr13() {
        return str13;
    }

    public void setStr13(String str13) {
        this.str13 = str13;
    }

    public String getStr14() {
        return str14;
    }

    public void setStr14(String str14) {
        this.str14 = str14;
    }

    public String getStr15() {
        return str15;
    }

    public void setStr15(String str15) {
        this.str15 = str15;
    }

    public String getStr16() {
        return str16;
    }

    public void setStr16(String str16) {
        this.str16 = str16;
    }

    public String getStr17() {
        return str17;
    }

    public void setStr17(String str17) {
        this.str17 = str17;
    }

    public String getStr18() {
        return str18;
    }

    public void setStr18(String str18) {
        this.str18 = str18;
    }

    public String getStr19() {
        return str19;
    }

    public void setStr19(String str19) {
        this.str19 = str19;
    }

    public String getStr20() {
        return str20;
    }

    public void setStr20(String str20) {
        this.str20 = str20;
    }

    public String getStr21() {
        return str21;
    }

    public void setStr21(String str21) {
        this.str21 = str21;
    }

    public String getStr22() {
        return str22;
    }

    public void setStr22(String str22) {
        this.str22 = str22;
    }

    public String getStr23() {
        return str23;
    }

    public void setStr23(String str23) {
        this.str23 = str23;
    }

    public Double getNum1() {
        return num1;
    }
@@ -492,14 +384,6 @@

    public void setNum5(Double num5) {
        this.num5 = num5;
    }

    public Double getNum6() {
        return num6;
    }

    public void setNum6(Double num6) {
        this.num6 = num6;
    }

    public Date getDate1() {

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

@@ -68,6 +68,11 @@
                matCode.getMatNo(),
                matCode.getBarcode(),
                matCode.getMatName(),
                matCode.getSpecs(),
                matCode.getUnit(),
                matCode.getSize(),
                matCode.getColor(),
                matCode.getWeight(),
                matCode.getStr1(),
                matCode.getStr2(),
                matCode.getStr3(),
@@ -78,25 +83,11 @@
                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()
                matCode.getNum5()
        );
    }

@@ -104,6 +95,11 @@
        matCode.setMatNo(excel.getMatNo());
        matCode.setMatName(excel.getMatName());
        matCode.setBarcode(excel.getBarcode());
        matCode.setSpecs(excel.getSpecs());
        matCode.setUnit(excel.getUnit());
        matCode.setSize(excel.getSize());
        matCode.setColor(excel.getColor());
        matCode.setWeight(excel.getWeight());
        matCode.setStr1(excel.getStr1());
        matCode.setStr2(excel.getStr2());
        matCode.setStr3(excel.getStr3());
@@ -114,25 +110,11 @@
        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/utils/excel/matcode/MatCodeExcel.java

@@ -19,19 +19,34 @@
//    @ExcelProperty(value= "条形码", index = 4)
    private String barcode;

    @ExcelProperty(value= "产品名称", index = 3)
    @ExcelProperty(value= "产品名称", index = 1)
    private String matName;

    @ExcelProperty(value= "基本单位", index = 12)
    @ExcelProperty(value= "规格", index = 2)
    private String specs;

    @ExcelProperty(value= "单位", index = 3)
    private String unit;

    @ExcelProperty(value= "尺寸", index = 4)
    private String size;

    @ExcelProperty(value= "颜色", index = 5)
    private String color;

    @ExcelProperty(value= "单重", index = 6)
    private Double weight;

//    @ExcelProperty(value= "", index = 12)
    private String str1;

    @ExcelProperty(value= "规格型号", index = 5)
//    @ExcelProperty(value= "", index = 5)
    private String str2;

    @ExcelProperty(value= "颜色名称", index = 28)
//    @ExcelProperty(value= "", index = 28)
    private String str3;

    @ExcelProperty(value= "库位名称", index = 14)
//    @ExcelProperty(value= "", index = 14)
    private String str4;

//    @ExcelProperty(value= "助记码", index = 7)
@@ -52,45 +67,6 @@
//    @ExcelProperty(value= "产地", index = 12)
    private String str10;

//    @ExcelProperty(value= "序列号管理")
    private String str11;

//    @ExcelProperty(value= "批次管理")
    private String str12;

//    @ExcelProperty(value= "保质期单位")
    private String str13;

//    @ExcelProperty(value= "保质期管理")
    private String str14;

//    @ExcelProperty(value= "保质期")
    private String str15;

//    @ExcelProperty(value= "可销售", index = 20)
    private String str16;

//    @ExcelProperty(value= "可采购", index = 21)
    private String str17;

//    @ExcelProperty(value= "可为子件", index = 22)
    private String str18;

//    @ExcelProperty(value= "可为组件", index = 23)
    private String str19;

//    @ExcelProperty(value= "辅助属性管理")
    private String str20;

//    @ExcelProperty(value= "成本计算方法", index = 29)
    private String str21;

//    @ExcelProperty(value= "采购单位", index = 30)
    private String str22;

//    @ExcelProperty(value= "销售单位", index = 31)
    private String str23;

//    @ExcelProperty(value= "重量", index = 7)
    private Double num1;

@@ -106,15 +82,18 @@
//    @ExcelProperty(value= "税率")
    private Double num5;

    private Double num6;

    public MatCodeExcel() {
    }

    public MatCodeExcel(String matNo, String barcode, String matName, String str1, String str2, String str3, String str4, String str5, String str6, String str7, String str8, String str9, String str10, String str11, String str12, String str13, String str14, String str15, String str16, String str17, String str18, String str19, String str20, String str21, String str22, String str23, Double num1, Double num2, Double num3, Double num4, Double num5, Double num6) {
    public MatCodeExcel(String matNo, String barcode, String matName,String specs,String unit,String size,String color,Double weight, String str1, String str2, String str3, String str4, String str5, String str6, String str7, String str8, String str9, String str10,Double num1, Double num2, Double num3, Double num4, Double num5) {
        this.matNo = matNo;
        this.barcode = barcode;
        this.matName = matName;
        this.specs = specs;
        this.unit = unit;
        this.size = size;
        this.color = color;
        this.weight = weight;
        this.str1 = str1;
        this.str2 = str2;
        this.str3 = str3;
@@ -125,25 +104,11 @@
        this.str8 = str8;
        this.str9 = str9;
        this.str10 = str10;
        this.str11 = str11;
        this.str12 = str12;
        this.str13 = str13;
        this.str14 = str14;
        this.str15 = str15;
        this.str16 = str16;
        this.str17 = str17;
        this.str18 = str18;
        this.str19 = str19;
        this.str20 = str20;
        this.str21 = str21;
        this.str22 = str22;
        this.str23 = str23;
        this.num1 = num1;
        this.num2 = num2;
        this.num3 = num3;
        this.num4 = num4;
        this.num5 = num5;
        this.num6 = num6;
    }

}

 src/main/java/com/zy/common/webservice/mock/DemoMock.java

@@ -11,7 +11,7 @@

    public static void main(String[] args) {
        JaxWsDynamicClientFactory dcf = JaxWsDynamicClientFactory.newInstance();
        Client client = dcf.createClient("http://localhost:8081/gdwms/webservice/webservice?wsdl");
        Client client = dcf.createClient("http://localhost:8081/whthwms/webservice/webservice?wsdl");
        Object[] objects = new Object[0];
        ObjectMapper mapper = new ObjectMapper();
        try {

 src/main/resources/application.yml

@@ -19,7 +19,7 @@
    #url: jdbc:sqlserver://192.168.3.99:1433;databasename=gdasrs
    #username: sa
    #password: eisoft
    url: jdbc:sqlserver://localhost:1433;databasename=gdasrs
    url: jdbc:sqlserver://localhost:1433;databasename=whthasrs
    username: sa
    password: sa@123
  mvc:

 src/main/resources/mapper/MatCodeMapper.xml

@@ -7,6 +7,11 @@
        <result column="mat_no" property="matNo" />
        <result column="barcode" property="barcode" />
        <result column="mat_name" property="matName" />
        <result column="specs" property="specs" />
        <result column="unit" property="unit" />
        <result column="size" property="size" />
        <result column="color" property="color" />
        <result column="weight" property="weight" />
        <result column="str1" property="str1" />
        <result column="str2" property="str2" />
        <result column="str3" property="str3" />
@@ -17,25 +22,11 @@
        <result column="str8" property="str8" />
        <result column="str9" property="str9" />
        <result column="str10" property="str10" />
        <result column="str11" property="str11" />
        <result column="str12" property="str12" />
        <result column="str13" property="str13" />
        <result column="str14" property="str14" />
        <result column="str15" property="str15" />
        <result column="str16" property="str16" />
        <result column="str17" property="str17" />
        <result column="str18" property="str18" />
        <result column="str19" property="str19" />
        <result column="str20" property="str20" />
        <result column="str21" property="str21" />
        <result column="str22" property="str22" />
        <result column="str23" property="str23" />
        <result column="num1" property="num1" />
        <result column="num2" property="num2" />
        <result column="num3" property="num3" />
        <result column="num4" property="num4" />
        <result column="num5" property="num5" />
        <result column="num6" property="num6" />
        <result column="date1" property="date1" />
        <result column="appe_user" property="appeUser" />
        <result column="appe_time" property="appeTime" />

 src/main/webapp/static/js/common.js

@@ -1,4 +1,4 @@
var baseUrl = "/gdwms";
var baseUrl = "/whthwms";

// 详情窗口-高度
var detailHeight = '80%';
@@ -167,24 +167,25 @@
}

var matCols = [
    {field: 'matNo', align: 'center',title: '产品代号'}
    {field: 'matNo', align: 'center',title: '产品编码'}
    ,{field: 'matName', align: 'center',title: '产品名称'}
    ,{field: 'str2', align: 'center',title: '规格型号'}
    ,{field: 'str3', align: 'center',title: '颜色'}
    ,{field: 'specs', align: 'center',title: '规格型号'}
    ,{field: 'unit', align: 'center',title: '单位'}
    // ,{field: 'num1', align: 'center',title: '数量'}
    ,{field: 'str1', align: 'center',title: '基本单位'}
    ,{field: 'str4', align: 'center',title: '库位名称'}
    ,{field: 'size', align: 'center',title: '尺寸'}
    ,{field: 'color', align: 'center',title: '颜色'}
]

var detlCols = [
    {field: 'matnr', align: 'center',title: '产品号'}
    ,{field: 'maktx', align: 'center',title: '产品名称'}
    ,{field: 'lgnum', align: 'center',title: '规格'}
    {field: 'matNo', align: 'center',title: '产品编码'}
    ,{field: 'matName', align: 'center',title: '产品名称'}
    ,{field: 'specs', align: 'center',title: '规格'}
    ,{field: 'qty', align: 'center',title: '数量'}
    ,{field: 'unit', align: 'center',title: '单位'}
    ,{field: 'size', align: 'center',title: '尺寸'}
    ,{field: 'color', align: 'center',title: '颜色'}
    ,{field: 'anfme', align: 'center',title: '数量'}
    ,{field: 'altme', align: 'center',title: '单位'}
    ,{field: 'zpallet', align: 'center',title: '托盘条码'}
    ,{field: 'bname', align: 'center',title: '库位名称'}
    // ,{field: 'bname', align: 'center',title: '库位名称'}
    ,{field: 'memo', align: 'center',title: '备注'}
]


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

@@ -334,12 +334,18 @@

    function method(name){
        var index = layer.load(1, {
            shade: [0.5,'#000']
            shade: [0.5,'#000000']
        });
        var data = {
            matNo: $('#matNo').val(),
            barcode: $('#barcode').val(),
            matName: $('#matName').val(),
            specs: $('#specs').val(),
            unit: $('#unit').val(),
            size: $('#size').val(),
            color: $('#color').val(),
            weight: $('#weight').val(),

            str1: $('#str1').val(),
            str2: $('#str2').val(),
            str3: $('#str3').val(),
@@ -350,25 +356,11 @@
            str8: $('#str8').val(),
            str9: $('#str9').val(),
            str10: $('#str10').val(),
            str11: $('#str11').val(),
            str12: $('#str12').val(),
            str13: $('#str13').val(),
            str14: $('#str14').val(),
            str15: $('#str15').val(),
            str16: $('#str16').val(),
            str17: $('#str17').val(),
            str18: $('#str18').val(),
            str19: $('#str19').val(),
            str20: $('#str20').val(),
            str21: $('#str21').val(),
            str22: $('#str22').val(),
            str23: $('#str23').val(),
            num1: $('#num1').val(),
            num2: $('#num2').val(),
            num3: $('#num3').val(),
            num4: $('#num4').val(),
            num5: $('#num5').val(),
            num6: $('#num6').val(),
            date1: top.strToDate($('#date1\\$').val()),
            appeUser: $('#appeUser').val(),
            appeTime: top.strToDate($('#appeTime\\$').val()),

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

@@ -42,7 +42,38 @@
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">基本单位：</label>
            <label class="layui-form-label">规格：</label>
            <div class="layui-input-inline">
                <input id="specs" class="layui-input" type="text">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">单位：</label>
            <div class="layui-input-inline">
                <input id="unit" class="layui-input" type="text">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">尺寸：</label>
            <div class="layui-input-inline">
                <input id="size" class="layui-input" type="text">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;">
            <label class="layui-form-label">颜色：</label>
            <div class="layui-input-inline">
                <input id="color" class="layui-input" type="text">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%">
            <label class="layui-form-label">：</label>
            <div class="layui-input-inline">
                <input id="weight" class="layui-input" type="text" lay-verify="number" >
            </div>
        </div>

        <div class="layui-inline"  style="width:31%;display: none">
            <label class="layui-form-label">：</label>
            <div class="layui-input-inline">
                <input id="str1" class="layui-input" type="text">
            </div>
@@ -104,84 +135,6 @@
        <div class="layui-inline"  style="width:31%;display: none">
            <label class="layui-form-label">：</label>
            <div class="layui-input-inline">
                <input id="str11" class="layui-input" type="text">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;display: none">
            <label class="layui-form-label">：</label>
            <div class="layui-input-inline">
                <input id="str12" class="layui-input" type="text">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;display: none">
            <label class="layui-form-label">：</label>
            <div class="layui-input-inline">
                <input id="str13" class="layui-input" type="text">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;display: none">
            <label class="layui-form-label">：</label>
            <div class="layui-input-inline">
                <input id="str14" class="layui-input" type="text">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;display: none">
            <label class="layui-form-label">：</label>
            <div class="layui-input-inline">
                <input id="str15" class="layui-input" type="text">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;display: none">
            <label class="layui-form-label">：</label>
            <div class="layui-input-inline">
                <input id="str16" class="layui-input" type="text">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;display: none">
            <label class="layui-form-label">：</label>
            <div class="layui-input-inline">
                <input id="str17" class="layui-input" type="text">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;display: none">
            <label class="layui-form-label">：</label>
            <div class="layui-input-inline">
                <input id="str18" class="layui-input" type="text">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;display: none">
            <label class="layui-form-label">：</label>
            <div class="layui-input-inline">
                <input id="str19" class="layui-input" type="text">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;display: none">
            <label class="layui-form-label">：</label>
            <div class="layui-input-inline">
                <input id="str20" class="layui-input" type="text">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;display: none">
            <label class="layui-form-label">：</label>
            <div class="layui-input-inline">
                <input id="str21" class="layui-input" type="text">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;display: none">
            <label class="layui-form-label">：</label>
            <div class="layui-input-inline">
                <input id="str22" class="layui-input" type="text">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;display: none">
            <label class="layui-form-label">：</label>
            <div class="layui-input-inline">
                <input id="str23" class="layui-input" type="text">
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;display: none">
            <label class="layui-form-label">：</label>
            <div class="layui-input-inline">
                <input id="num1" class="layui-input" type="text" lay-verify="number" >
            </div>
        </div>
@@ -207,12 +160,6 @@
            <label class="layui-form-label">：</label>
            <div class="layui-input-inline">
                <input id="num5" class="layui-input" type="text" lay-verify="number" >
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;display: none">
            <label class="layui-form-label">：</label>
            <div class="layui-input-inline">
                <input id="num6" class="layui-input" type="text" lay-verify="number" >
            </div>
        </div>
        <div class="layui-inline"  style="width:31%;display: none">