#

lsh

2024-12-17 3fe0c50ee53135a685e69d5476832b720937ab47

#

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

@@ -110,12 +110,6 @@
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        if (Cools.isEmpty(param.getLgort())) {
            return R.error("单据编号[lgort]不能为空");
        }
        if (!param.getLgort().equals("5006")) {
            return R.ok();
        }
        if (Cools.isEmpty(param.getOrderNo())) {
            return R.error("单据编号[orderNo]不能为空");
        }

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

@@ -103,7 +103,7 @@
    private Double weight;

    @ApiModelProperty(value= "长度")
    private Double length;
    private Double man_length;

    @ApiModelProperty(value= "体积")
    private Double volume;

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

@@ -190,8 +190,8 @@
     * 长度
     */
    @ApiModelProperty(value= "长度")
    @ExcelProperty(value = "长度")
    private Double length;
    @TableField("man_length")
    private Double manLength;

    /**
     * 体积
@@ -327,7 +327,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 inspect,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 manLength,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;
@@ -348,7 +348,7 @@
        this.itemNum = itemNum;
        this.safeQty = safeQty;
        this.weight = weight;
        this.length = length;
        this.manLength = manLength;
        this.volume = volume;
        this.threeCode = threeCode;
        this.supp = supp;

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

@@ -186,7 +186,8 @@
     * 长度
     */
    @ApiModelProperty(value= "长度")
    private Double length;
    @TableField("man_length")
    private Double manLength;

    /**
     * 体积
@@ -311,7 +312,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 inspect, 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 manLength, 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;
@@ -334,7 +335,7 @@
        this.itemNum = itemNum;
        this.safeQty = safeQty;
        this.weight = weight;
        this.length = length;
        this.manLength = manLength;
        this.volume = volume;
        this.threeCode = threeCode;
        this.supp = supp;

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

@@ -186,7 +186,8 @@
     * 长度
     */
    @ApiModelProperty(value= "长度")
    private Double length;
    @TableField("man_length")
    private Double manLength;

    /**
     * 体积
@@ -311,7 +312,7 @@

    public OrderDetlPakin() {}

    public OrderDetlPakin(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) {
    public OrderDetlPakin(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 manLength, 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;
@@ -334,7 +335,7 @@
        this.itemNum = itemNum;
        this.safeQty = safeQty;
        this.weight = weight;
        this.length = length;
        this.manLength = manLength;
        this.volume = volume;
        this.threeCode = threeCode;
        this.supp = supp;

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

@@ -186,7 +186,8 @@
     * 长度
     */
    @ApiModelProperty(value= "长度")
    private Double length;
    @TableField("man_length")
    private Double manLength;

    /**
     * 体积
@@ -311,7 +312,7 @@

    public OrderDetlPakout() {}

    public OrderDetlPakout(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) {
    public OrderDetlPakout(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 manLength, 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;
@@ -334,7 +335,7 @@
        this.itemNum = itemNum;
        this.safeQty = safeQty;
        this.weight = weight;
        this.length = length;
        this.manLength = manLength;
        this.volume = volume;
        this.threeCode = threeCode;
        this.supp = supp;

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

@@ -97,7 +97,7 @@
    private Double weight;

    @ApiModelProperty(value= "长度")
    private Double length;
    private Double man_length;

    @ApiModelProperty(value= "体积")
    private Double volume;

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

@@ -108,7 +108,7 @@
    private Double weight;

    @ApiModelProperty(value= "长度")
    private Double length;
    private Double man_length;

    @ApiModelProperty(value= "体积")
    private Double volume;

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

@@ -89,7 +89,7 @@
    private Double weight;

    @ApiModelProperty(value= "长度")
    private Double length;
    private Double man_length;

    @ApiModelProperty(value= "体积")
    private Double volume;

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

@@ -88,7 +88,7 @@
    private Double weight;

    @ApiModelProperty(value= "长度")
    private Double length;
    private Double man_length;

    @ApiModelProperty(value= "体积")
    private Double volume;

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

@@ -168,7 +168,8 @@
     * 长度
     */
    @ApiModelProperty(value= "长度")
    private Double length;
    @TableField("man_length")
    private Double manLength;

    /**
     * 体积

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

@@ -167,7 +167,8 @@
     * 长度
     */
    @ApiModelProperty(value= "长度")
    private Double length;
    @TableField("man_length")
    private Double manLength;

    /**
     * 体积

 src/main/resources/mapper/LocDetlMapper.xml

@@ -27,7 +27,7 @@
        <result column="item_num" property="itemNum" />
        <result column="safe_qty" property="safeQty" />
        <result column="weight" property="weight" />
        <result column="length" property="length" />
        <result column="man_length" property="manLength" />
        <result column="volume" property="volume" />
        <result column="three_code" property="threeCode" />
        <result column="supp" property="supp" />

 src/main/resources/mapper/MatMapper.xml

@@ -25,7 +25,7 @@
        <result column="item_num" property="itemNum" />
        <result column="safe_qty" property="safeQty" />
        <result column="weight" property="weight" />
        <result column="length" property="length" />
        <result column="man_length" property="manLength" />
        <result column="volume" property="volume" />
        <result column="three_code" property="threeCode" />
        <result column="supp" property="supp" />

 src/main/resources/mapper/OrderDetlMapper.xml

@@ -28,7 +28,7 @@
        <result column="item_num" property="itemNum" />
        <result column="safe_qty" property="safeQty" />
        <result column="weight" property="weight" />
        <result column="length" property="length" />
        <result column="man_length" property="manLength" />
        <result column="volume" property="volume" />
        <result column="three_code" property="threeCode" />
        <result column="supp" property="supp" />

 src/main/resources/mapper/OrderDetlPakinMapper.xml

@@ -28,7 +28,7 @@
        <result column="item_num" property="itemNum" />
        <result column="safe_qty" property="safeQty" />
        <result column="weight" property="weight" />
        <result column="length" property="length" />
        <result column="man_length" property="manLength" />
        <result column="volume" property="volume" />
        <result column="three_code" property="threeCode" />
        <result column="supp" property="supp" />

 src/main/resources/mapper/OrderDetlPakoutMapper.xml

@@ -28,7 +28,7 @@
        <result column="item_num" property="itemNum" />
        <result column="safe_qty" property="safeQty" />
        <result column="weight" property="weight" />
        <result column="length" property="length" />
        <result column="man_length" property="manLength" />
        <result column="volume" property="volume" />
        <result column="three_code" property="threeCode" />
        <result column="supp" property="supp" />

 src/main/resources/mapper/WaitPakinLogMapper.xml

@@ -27,7 +27,7 @@
        <result column="item_num" property="itemNum" />
        <result column="safe_qty" property="safeQty" />
        <result column="weight" property="weight" />
        <result column="length" property="length" />
        <result column="man_length" property="manLength" />
        <result column="volume" property="volume" />
        <result column="three_code" property="threeCode" />
        <result column="supp" property="supp" />

 src/main/resources/mapper/WaitPakinMapper.xml

@@ -27,7 +27,7 @@
        <result column="item_num" property="itemNum" />
        <result column="safe_qty" property="safeQty" />
        <result column="weight" property="weight" />
        <result column="length" property="length" />
        <result column="man_length" property="manLength" />
        <result column="volume" property="volume" />
        <result column="three_code" property="threeCode" />
        <result column="supp" property="supp" />

 src/main/resources/mapper/WrkDetlMapper.xml

@@ -28,7 +28,7 @@
        <result column="item_num" property="itemNum" />
        <result column="safe_qty" property="safeQty" />
        <result column="weight" property="weight" />
        <result column="length" property="length" />
        <result column="man_length" property="manLength" />
        <result column="volume" property="volume" />
        <result column="three_code" property="threeCode" />
        <result column="supp" property="supp" />

 src/main/webapp/views/mat/mat.html

@@ -246,7 +246,7 @@
                <div class="layui-form-item">
                    <label class="layui-form-label">单箱毛重</label>
                    <div class="layui-input-block">
                        <input name="length" placeholder="请输入单箱毛重" class="layui-input">
                        <input name="manLength" placeholder="请输入单箱毛重" class="layui-input">
                    </div>
                </div>