65c13f7dafe0945ccd9b657cc31c4d4bc3a94359..6ea3d5caa30f460f1eb9c3880d90f41275c3c274
2025-07-03 yangyang
Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master int...
6ea3d5 对比 | 目录
2025-07-03 yangyang
no message
5408d4 对比 | 目录
2025-07-03 skyouc
no message
6e2d8d 对比 | 目录
2025-07-03 skyouc
no message
a0b120 对比 | 目录
1个文件已添加
7个文件已删除
3个文件已修改
829 ■■■■■ 已修改文件
zy-asrs-admin/src/components/print/locsPrint/locTemplate.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-admin/src/components/print/zpalletBarcodePrint/template/template1.vue 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-admin/src/views/base/container/edit.vue 309 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-admin/src/views/base/container/index.vue 292 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ContainerController.java 106 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Container.java 45 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/ContainerParams.java 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/ContainerMapper.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/ContainerService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/ContainerServiceImpl.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/resources/mapper/asrs/ContainerMapper.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-admin/src/components/print/locsPrint/locTemplate.vue
@@ -29,7 +29,7 @@
                    <td class="barcode" colspan="9" align="center" scope="col">
                        <img :src="globalState.url + '/api/code/auth?type=1&param=' + item.locNo" width="90%;" height="180px"/>
                        <div style="letter-spacing: 2px;margin-top: 10px; text-align: center;">
                            <span>{{ item.locNo }} </span>
                            <span style="font-size: 55px;">{{ item.locNo }} </span>
                        </div>
                    </td>
                </tr>
zy-asrs-admin/src/components/print/zpalletBarcodePrint/template/template1.vue
@@ -17,13 +17,13 @@
</script>
<template>
    <div id="printMe">
    <div id="printMe" style="width: 700px;">
        <div v-for="(item, index) in list" :key="index">
            <div v-for="count in repeatNum" style="font-size: 16px;margin-top: 20px;">
                <div style="text-align: center;">
                    <img :src="globalState.url + '/api/code/auth?type=1&param=' + item.barcode" />
            <div v-for="count in repeatNum" style="font-size: 16px;margin-top: 40px;height: 300px;">
                <div style="text-align: center; ">
                    <img :src="globalState.url + '/api/code/auth?type=1&param=' + item.barcode" style="width: 600px; height: 180px;" />
                </div>
                <div style="text-align: center;">
                <div style="text-align: center; font-size: 55px; font-weight: 600;">
                    {{ item.barcode }}
                </div>
            </div>
@@ -32,6 +32,11 @@
</template>
<style>
.ant-modal-content {
    width: 700px;
}
@media print {
    body {
        margin: 0;
zy-asrs-admin/src/views/base/container/edit.vue
File was deleted
zy-asrs-admin/src/views/base/container/index.vue
File was deleted
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/ContainerController.java
File was deleted
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Container.java
@@ -3,6 +3,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.zy.asrs.wms.system.entity.User;
import org.springframework.format.annotation.DateTimeFormat;
import com.baomidou.mybatisplus.annotation.TableLogic;
@@ -118,7 +119,7 @@
     * 租户
     */
    @ApiModelProperty(value= "租户")
    private Integer tenantId;
    private Integer hostId;
    /**
     * 添加人员
@@ -131,6 +132,7 @@
     */
    @ApiModelProperty(value= "添加时间")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date createTime;
    /**
@@ -144,6 +146,7 @@
     */
    @ApiModelProperty(value= "修改时间")
    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date updateTime;
    /**
@@ -167,7 +170,7 @@
        this.flagLogic = flagLogic;
        this.status = status;
        this.deleted = deleted;
        this.tenantId = tenantId;
        this.hostId = tenantId;
        this.createBy = createBy;
        this.createTime = createTime;
        this.updateBy = updateBy;
@@ -175,27 +178,23 @@
        this.memo = memo;
    }
//    Container container = new Container(
//            null,    // 名称
//            null,    // 容器编码[非空]
//            null,    // 容器类型[非空]
//            null,    // 使用次数[非空]
//            null,    // 长度
//            null,    // 宽度
//            null,    // 高度
//            null,    // 有效期
//            null,    // 是否回收[非空]
//            null,    // 是否虚拟[非空]
//            null,    // 状态[非空]
//            null,    // 是否删除[非空]
//            null,    // 租户
//            null,    // 添加人员
//            null,    // 添加时间[非空]
//            null,    // 修改人员
//            null,    // 修改时间[非空]
//            null    // 备注
//    );
    public String getType$(){
        if (null == this.type){ return null; }
        switch (this.type){
            case "1":
                return " 钢托盘";
            case  "2":
                return " 木托盘";
            case  "3":
                return " 塑料料框";
            case  "4":
                return "托盘笼箱";
            case  "5":
                return "钢料架";
            default:
                return String.valueOf(this.type);
        }
    }
    public String getVaildTime$(){
        if (Cools.isEmpty(this.vaildTime)){
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/ContainerParams.java
New file
@@ -0,0 +1,23 @@
package com.zy.asrs.wms.asrs.entity.param;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
@Data
@Accessors(chain = true)
@ApiModel(value = "ContainerParams", description = "容器初始化参数")
public class ContainerParams implements Serializable {
    private static final long serialVersionUID = 1L;
    @ApiModelProperty("起始数值")
    private Integer startNum;
    @ApiModelProperty("终止数值")
    private Integer endNum;
}
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/ContainerMapper.java
File was deleted
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/ContainerService.java
File was deleted
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/ContainerServiceImpl.java
File was deleted
zy-asrs-wms/src/main/resources/mapper/asrs/ContainerMapper.xml
File was deleted