From c1d66ef17e3538c056db1df1d023e7153e7594e5 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期三, 28 一月 2026 16:15:58 +0800
Subject: [PATCH] #
---
src/main/webapp/views/basDualCrnp/basDualCrnp.html | 12 ++++++++++++
src/main/resources/mapper/BasDualCrnpMapper.xml | 2 ++
src/main/java/com/zy/asrs/entity/BasDualCrnp.java | 16 +++++++++++++++-
src/main/webapp/static/js/basDualCrnp/basDualCrnp.js | 2 ++
4 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasDualCrnp.java b/src/main/java/com/zy/asrs/entity/BasDualCrnp.java
index c4feaf8..bd37acd 100644
--- a/src/main/java/com/zy/asrs/entity/BasDualCrnp.java
+++ b/src/main/java/com/zy/asrs/entity/BasDualCrnp.java
@@ -138,9 +138,23 @@
@TableField("max_out_task")
private Integer maxOutTask;
+ /**
+ * 宸ヤ綅1绂佹鎵ц鍒�
+ */
+ @ApiModelProperty(value= "宸ヤ綅1绂佹鎵ц鍒�")
+ @TableField("disable_station_one_bays")
+ private String disableStationOneBays;
+
+ /**
+ * 宸ヤ綅2绂佹鎵ц鍒�
+ */
+ @ApiModelProperty(value= "宸ヤ綅2绂佹鎵ц鍒�")
+ @TableField("disable_station_two_bays")
+ private String disableStationTwoBays;
+
public BasDualCrnp() {}
- public BasDualCrnp(Integer status,Integer wrkNo,String inEnable,String outEnable,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,String controlRows,String deepRows,String inStationList,String outStationList,Integer maxInTask,Integer maxOutTask) {
+ public BasDualCrnp(Integer status,Integer wrkNo,String inEnable,String outEnable,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,String controlRows,String deepRows,String inStationList,String outStationList,Integer maxInTask,Integer maxOutTask,String disableStationOneBays,String disableStationTwoBays) {
this.status = status;
this.wrkNo = wrkNo;
this.inEnable = inEnable;
diff --git a/src/main/resources/mapper/BasDualCrnpMapper.xml b/src/main/resources/mapper/BasDualCrnpMapper.xml
index c94c105..9f53e4e 100644
--- a/src/main/resources/mapper/BasDualCrnpMapper.xml
+++ b/src/main/resources/mapper/BasDualCrnpMapper.xml
@@ -20,6 +20,8 @@
<result column="out_station_list" property="outStationList" />
<result column="max_in_task" property="maxInTask" />
<result column="max_out_task" property="maxOutTask" />
+ <result column="disable_station_one_bays" property="disableStationOneBays" />
+ <result column="disable_station_two_bays" property="disableStationTwoBays" />
</resultMap>
diff --git a/src/main/webapp/static/js/basDualCrnp/basDualCrnp.js b/src/main/webapp/static/js/basDualCrnp/basDualCrnp.js
index 83a6dd9..9202558 100644
--- a/src/main/webapp/static/js/basDualCrnp/basDualCrnp.js
+++ b/src/main/webapp/static/js/basDualCrnp/basDualCrnp.js
@@ -38,6 +38,8 @@
,{field: 'outStationList', align: 'center',title: '鍑哄簱绔欑偣'}
,{field: 'maxInTask', align: 'center',title: '鏈�澶у叆搴撲换鍔℃暟'}
,{field: 'maxOutTask', align: 'center',title: '鏈�澶у嚭搴撲换鍔℃暟'}
+ ,{field: 'disableStationOneBays', align: 'center',title: '宸ヤ綅1绂佹鎵ц鍒�'}
+ ,{field: 'disableStationTwoBays', align: 'center',title: '宸ヤ綅2绂佹鎵ц鍒�'}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
]],
diff --git a/src/main/webapp/views/basDualCrnp/basDualCrnp.html b/src/main/webapp/views/basDualCrnp/basDualCrnp.html
index eb24329..64f703a 100644
--- a/src/main/webapp/views/basDualCrnp/basDualCrnp.html
+++ b/src/main/webapp/views/basDualCrnp/basDualCrnp.html
@@ -166,6 +166,18 @@
<input class="layui-input" name="maxOutTask" placeholder="璇疯緭鍏ユ渶澶у嚭搴撲换鍔℃暟">
</div>
</div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">宸ヤ綅1绂佹鎵ц鍒�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="disableStationOneBays" placeholder="璇疯緭鍏ュ伐浣�1绂佹鎵ц鍒�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">宸ヤ綅2绂佹鎵ц鍒�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="disableStationTwoBays" placeholder="璇疯緭鍏ュ伐浣�2绂佹鎵ц鍒�">
+ </div>
+ </div>
</div>
</div>
--
Gitblit v1.9.1