#

Junjie

2026-01-14 b77d09f258ef7d5458f61ff1a90d1a686cb2f181

#

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

@@ -175,6 +175,20 @@
    @TableField(value = "system_msg")
    private String systemMsg;

    /**
     * 批次号
     */
    @ApiModelProperty(value= "批次号")
    @TableField(value = "batch")
    private String batch;

    /**
     * 顺序号
     */
    @ApiModelProperty(value= "顺序号")
    @TableField(value = "batch_seq")
    private Integer batchSeq;

    public String getWrkSts$(){
        BasWrkStatusMapper mapper = SpringUtils.getBean(BasWrkStatusMapper.class);
        BasWrkStatus entity = mapper.selectById(this.wrkSts);

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

@@ -180,6 +180,20 @@
    @TableField(value = "system_msg")
    private String systemMsg;

    /**
     * 批次号
     */
    @ApiModelProperty(value= "批次号")
    @TableField(value = "batch")
    private String batch;

    /**
     * 顺序号
     */
    @ApiModelProperty(value= "顺序号")
    @TableField(value = "batch_seq")
    private Integer batchSeq;

    public WrkMastLog() {}

    public String getWrkSts$(){

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

@@ -343,6 +343,14 @@
        wrkMast.setAppeTime(now);
        wrkMast.setModiTime(now);

        if (!Cools.isEmpty(param.getBatch())) {
            wrkMast.setBatch(param.getBatch());
        }

        if (!Cools.isEmpty(param.getBatchSeq())) {
            wrkMast.setBatchSeq(param.getBatchSeq());
        }

        if (findCrnResult.getCrnType().equals(SlaveType.Crn)) {
            BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", crnNo));
            if(basCrnp == null) {

 src/main/resources/mapper/WrkMastLogMapper.xml

@@ -28,6 +28,8 @@
        <result column="rgv_no" property="rgvNo" />
        <result column="wms_wrk_no" property="wmsWrkNo" />
        <result column="system_msg" property="systemMsg" />
        <result column="batch" property="batch" />
        <result column="batch_seq" property="batchSeq" />
    </resultMap>

</mapper>

 src/main/resources/mapper/WrkMastMapper.xml

@@ -27,6 +27,8 @@
        <result column="rgv_no" property="rgvNo" />
        <result column="wms_wrk_no" property="wmsWrkNo" />
        <result column="system_msg" property="systemMsg" />
        <result column="batch" property="batch" />
        <result column="batch_seq" property="batchSeq" />

    </resultMap>


 src/main/webapp/static/js/wrkMastLog/wrkMastLog.js

@@ -32,6 +32,8 @@
            ,{field: 'locNo', align: 'center',title: '目标库位'}
            ,{field: 'crnNo', align: 'center',title: '堆垛机'}
            ,{field: 'dualCrnNo', align: 'center',title: '双工位堆垛机'}
            ,{field: 'batch', align: 'center',title: '批次'}
            ,{field: 'batchSeq', align: 'center',title: '批次序列'}
            ,{field: 'modiUser$', align: 'center',title: '修改人员', hide:true}
            ,{field: 'modiTime$', align: 'center',title: '修改时间', hide:true}
            // ,{field: 'appeUser$', align: 'center',title: '创建者',event: 'appeUser', style: 'cursor:pointer'}

 src/main/webapp/views/wrkMast/wrkMast.html

@@ -72,6 +72,10 @@
                        </el-table-column>
                        <el-table-column property="dualCrnNo" label="双工位堆垛机">
                        </el-table-column>
                        <el-table-column property="batch" label="批次">
                        </el-table-column>
                        <el-table-column property="batchSeq" label="批次序列">
                        </el-table-column>
                        <el-table-column property="systemMsg" label="系统消息">
                        </el-table-column>
                        <el-table-column label="操作" width="100">