diff --git a/acs/hd/nladmin-system/src/main/resources/config/application-dev.yml b/acs/hd/nladmin-system/src/main/resources/config/application-dev.yml index b9e4f39..0b53034 100644 --- a/acs/hd/nladmin-system/src/main/resources/config/application-dev.yml +++ b/acs/hd/nladmin-system/src/main/resources/config/application-dev.yml @@ -8,11 +8,12 @@ spring: druid: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:jmtest_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true - #url: jdbc:log4jdbc:mysql://${DB_HOST:47.97.157.227}:${DB_PORT:3306}/${DB_NAME:jm_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true + #url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:jmtest_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true + url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:jm_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true username: ${DB_USER:root} #password: ${DB_PWD:P@ssw0rd} - password: ${DB_PWD:123456} + password: ${DB_PWD:Root.123456} + #password: ${DB_PWD:123456} # 初始连接数 initial-size: 5 # 最小连接数 diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/dis/rest/GroupInfoController.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/dis/rest/GroupInfoController.java index 7ff79ab..a69b31a 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/dis/rest/GroupInfoController.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/dis/rest/GroupInfoController.java @@ -57,5 +57,11 @@ public class GroupInfoController { public ResponseEntity queryInfoByCode() { return new ResponseEntity<>(groupInfoService.queryInfoByCode(), HttpStatus.OK); } + @PostMapping("/queryMaterial") + @Log("查询仓位物料") + @ApiOperation("查询仓位状态") + public ResponseEntity queryMaterial() { + return new ResponseEntity<>(groupInfoService.queryMaterial(), HttpStatus.OK); + } } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/dis/service/GroupInfoService.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/dis/service/GroupInfoService.java index 424ae39..df8fed1 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/dis/service/GroupInfoService.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/dis/service/GroupInfoService.java @@ -33,5 +33,9 @@ public interface GroupInfoService { * 根据仓位查询仓位信息 */ JSONObject queryInfoByCode(); + /** + * 查询仓位物料 + */ + JSONObject queryMaterial(); } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/dis/service/impl/GroupInfoServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/dis/service/impl/GroupInfoServiceImpl.java index e567a1c..348e3d2 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/dis/service/impl/GroupInfoServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/dis/service/impl/GroupInfoServiceImpl.java @@ -2,6 +2,7 @@ package org.nl.wms.dis.service.impl; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -49,11 +50,26 @@ public class GroupInfoServiceImpl implements GroupInfoService { for (int i = 0; i < Arr.size(); i++) { JSONObject structObj = Arr.getJSONObject(i); String struct_code = structObj.getString("struct_code"); - JSONObject jo = WQL.getWO("QST_OUTSTBYVEHICLE_01").addParam("flag", "4").addParam("struct_code",struct_code).process().uniqueResult(0); + JSONObject jo = WQL.getWO("QST_OUTSTBYVEHICLE_01").addParam("flag", "4").addParam("struct_code", struct_code).process().uniqueResult(0); returnArr.put(structObj.getString("point_code"), jo); } return returnArr; } + @Override + public JSONObject queryMaterial() { + JSONArray Arr = WQL.getWO("QST_OUTSTBYVEHICLE_01").addParam("flag", "5").process().getResultJSONArray(0); + JSONObject returnArr = new JSONObject(); + for (int i = 0; i < Arr.size(); i++) { + JSONObject structObj = Arr.getJSONObject(i); + String material_spec = structObj.getString("material_spec"); + if (StrUtil.isEmpty(material_spec)) { + material_spec = "空" ; + } + returnArr.put(structObj.getString("point_code"), material_spec); + } + return returnArr; + } + } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/rest/PointController.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/rest/PointController.java index b32f307..056426e 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/rest/PointController.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/rest/PointController.java @@ -2,6 +2,7 @@ package org.nl.wms.sch.rest; +import com.alibaba.fastjson.JSON; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -102,4 +103,12 @@ public class PointController { return new ResponseEntity<>(HttpStatus.NO_CONTENT); } + @PostMapping("lock") + @Log("批量锁定") + @ApiOperation("批量锁定") + //@PreAuthorize("@el.check('point:add')") + public ResponseEntity lock(@RequestBody Map whereJson) { + pointService.lock(whereJson); + return new ResponseEntity<>(HttpStatus.CREATED); + } } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/PointService.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/PointService.java index a8f8b69..913ce52 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/PointService.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/PointService.java @@ -102,4 +102,11 @@ public interface PointService { */ void changeActive(JSONObject json); + /** + * 批量锁定 + * + * @return Map + */ + Map lock(Map jsonObject); + } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java index b254bb0..fa319e9 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java @@ -183,5 +183,20 @@ public class PointServiceImpl implements PointService { WQLObject.getWQLObject("sch_base_point").update(json); } + @Override + public Map lock(Map map) { + JSONObject.toJSONString(map); + JSONObject jsonObject = JSONObject.parseObject(JSON.toJSONString(map)); + JSONArray ja = jsonObject.getJSONArray("data"); + WQLObject point_table = WQLObject.getWQLObject("sch_base_point"); + for (int i = 0; i < ja.size(); i++) { + String point_code = ja.getJSONObject(i).getString("point_code"); + JSONObject jsonObject1 = point_table.query("point_code = '" + point_code + "'").uniqueResult(0); + jsonObject1.put("lock_type", "01"); + point_table.update(jsonObject1); + } + return null; + } + } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/DumpTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/DumpTask.java index 84dcf39..de2e47d 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/DumpTask.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/DumpTask.java @@ -50,6 +50,9 @@ public class DumpTask extends AbstractAcsTask { } if (TaskStatusEnum.FINISHED.getCode().equals(status)) { + if (TaskStatusEnum.FINISHED.getCode().equals(taskObj.getString("task_status"))) { + return; + } //更新转储单的状态 JSONObject dumpObj = WQLObject.getWQLObject("st_buss_dumpinv").query("task_uuid='" + task_uuid + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(dumpObj)) { diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java index ed7a28a..088ef4c 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/InTask.java @@ -44,6 +44,10 @@ public class InTask extends AbstractAcsTask { } if (TaskStatusEnum.FINISHED.getCode().equals(status)) { + //防止更新两次 导致库存信息不对 + if (TaskStatusEnum.FINISHED.getCode().equals(taskObj.getString("task_status"))) { + return; + } // 更新任务状态为完成 jsonTask.put("task_status", TaskStatusEnum.FINISHED.getCode()); jsonTask.put("taskfinish_mode", taskObj.getString("taskfinish_mode")); diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutStByVehicleTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutStByVehicleTask.java index 4e70e95..d040f67 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutStByVehicleTask.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutStByVehicleTask.java @@ -36,6 +36,9 @@ public class OutStByVehicleTask extends AbstractAcsTask { //修改完成 if (TaskStatusEnum.FINISHED.getCode().equals(status)) { //修改任务表状态 + if (TaskStatusEnum.FINISHED.getCode().equals(taskObj.getString("task_status"))) { + return; + } taskObj.put("update_by", SecurityUtils.getCurrentUsername()); taskObj.put("update_time", DateUtil.now()); taskObj.put("task_status", TaskStatusEnum.FINISHED.getCode()); @@ -46,7 +49,7 @@ public class OutStByVehicleTask extends AbstractAcsTask { WQLObject st_buss_outStByVehicleTable = WQLObject.getWQLObject("st_buss_OutStByVehicle"); JSONObject billJo = st_buss_outStByVehicleTable.query("task_uuid='" + task_uuid + "'").uniqueResult(0); billJo.put("bill_status", "03"); - billJo.put("is_can_back","1"); + billJo.put("is_can_back", "1"); st_buss_outStByVehicleTable.update(billJo); //减少库存 JSONObject paramIvt = new JSONObject(); diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java index 37e5170..b9e0096 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/tasks/OutTask.java @@ -42,7 +42,9 @@ public class OutTask extends AbstractAcsTask { } if (TaskStatusEnum.FINISHED.getCode().equals(status)) { - + if (TaskStatusEnum.FINISHED.getCode().equals(taskObj.getString("task_status"))) { + return; + } WQLObject dtltable = WQLObject.getWQLObject("st_buss_IOStoreDtl"); // 更新任务状态为完成 taskjo.put("task_status", TaskStatusEnum.FINISHED.getCode()); diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/wql/QST_OUTSTBYVEHICLE_01.wql b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/wql/QST_OUTSTBYVEHICLE_01.wql index 6a29064..72e40b9 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/wql/QST_OUTSTBYVEHICLE_01.wql +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/st/wql/QST_OUTSTBYVEHICLE_01.wql @@ -155,4 +155,24 @@ ENDOPTION ENDSELECT ENDQUERY - ENDIF \ No newline at end of file + ENDIF + + IF 输入.flag = "5" + QUERY + SELECT + point_code, + point_code AS struct_code, + point_name, + point_status, + material.material_uuid, + material.material_code, + material.material_spec + FROM + sch_base_point point + LEFT JOIN st_ivt_structivt ivt ON ivt.struct_uuid = point.point_uuid + LEFT JOIN md_base_material material ON material.material_uuid = ivt.material_uuid + WHERE + point.area_type IN ( '01', '02' ) + ENDSELECT + ENDQUERY + ENDIF \ No newline at end of file diff --git a/wms/hd/nladmin-system/src/main/resources/config/application.yml b/wms/hd/nladmin-system/src/main/resources/config/application.yml index 16e66f0..f625d67 100644 --- a/wms/hd/nladmin-system/src/main/resources/config/application.yml +++ b/wms/hd/nladmin-system/src/main/resources/config/application.yml @@ -2,7 +2,7 @@ spring: freemarker: check-template-location: false profiles: - active: dev + active: prod jackson: time-zone: GMT+8 data: diff --git a/wms/qd/package.json b/wms/qd/package.json index 32b3473..513dff7 100644 --- a/wms/qd/package.json +++ b/wms/qd/package.json @@ -102,7 +102,7 @@ "lint-staged": "8.1.5", "plop": "2.3.0", "runjs": "^4.3.2", - "sass": "^1.26.10", + "sass": "~1.26.5", "sass-loader": "^7.1.0", "script-ext-html-webpack-plugin": "2.1.3", "script-loader": "0.7.2", diff --git a/wms/qd/src/api/wms/sch/point.js b/wms/qd/src/api/wms/sch/point.js index be7899f..41e1af0 100644 --- a/wms/qd/src/api/wms/sch/point.js +++ b/wms/qd/src/api/wms/sch/point.js @@ -45,4 +45,12 @@ export function changeIs_active(data) { }) } -export default { add, edit, del, syncStruct, changeIs_active, findPoints } +export function lock(data) { + return request({ + url: 'api/point/lock', + method: 'post', + data + }) +} + +export default { add, edit, del, syncStruct, changeIs_active, findPoints, lock} diff --git a/wms/qd/src/api/wms/st/dis.js b/wms/qd/src/api/wms/st/dis.js index 807bb0b..48d0225 100644 --- a/wms/qd/src/api/wms/st/dis.js +++ b/wms/qd/src/api/wms/st/dis.js @@ -45,6 +45,13 @@ export function queryStructStatus(data) { data }) } +export function queryMaterial(data) { + return request({ + url: 'api/dis/queryMaterial', + method: 'post', + data + }) +} export function queryInfoByCode(data) { return request({ @@ -54,4 +61,4 @@ export function queryInfoByCode(data) { }) } -export default { add, edit, del, getStatus, getBackStatus, queryInfoByCode, queryStructStatus } +export default { add, edit, del, getStatus, getBackStatus, queryInfoByCode, queryStructStatus, queryMaterial } diff --git a/wms/qd/src/views/wms/sch/point/index.vue b/wms/qd/src/views/wms/sch/point/index.vue index fae4a88..1b43a53 100644 --- a/wms/qd/src/views/wms/sch/point/index.vue +++ b/wms/qd/src/views/wms/sch/point/index.vue @@ -123,6 +123,17 @@ > 仓位同步 + + 批量锁定 + { this.crud.toQuery() @@ -392,6 +406,24 @@ export default { }).catch(err => { console.log(err.response.data.message) }) + }, + + + lockpoint() { + const _selectData = this.$refs.table.selection + if (!_selectData) { + this.crud.notify('请选择一条记录', CRUD.NOTIFICATION_TYPE.INFO) + return + } + const param1 ={ + data:_selectData + } + crudPoint.lock(param1).then(res => { + this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS) + this.crud.toQuery() + }).catch(err => { + console.log(err.response.data.message) + }) } } diff --git a/wms/qd/src/views/wms/st/visable/index2.vue b/wms/qd/src/views/wms/st/visable/index2.vue index 0ebda3c..788b310 100644 --- a/wms/qd/src/views/wms/st/visable/index2.vue +++ b/wms/qd/src/views/wms/st/visable/index2.vue @@ -21,10 +21,10 @@
- 1排
{{ count }}列
2层 + 1排
{{ count }}列
2层
{{arr3['0101-0'+count+'-02']}}
@@ -43,10 +43,10 @@
- 1排
{{ count }}列
1层 + 1排
{{ count }}列
1层
{{arr3['0101-0'+count+'-01']}}
@@ -74,10 +74,10 @@
- 2排
{{ count }}列
2层 + 2排
{{ count }}列
2层
{{arr3['0101-0'+count+'-02']}}
@@ -96,10 +96,10 @@
- 2排
{{ count }}列
1层 + 2排
{{ count }}列
1层
{{arr3['0102-0'+count+'-01']}}
@@ -127,10 +127,10 @@
- 3排
{{ count }}列
2层 + 3排
{{ count }}列
2层
{{arr3['0103-0'+count+'-02']}}
@@ -147,10 +147,10 @@
- 3排
{{ (count + 6) }}列
2层 + 3排
{{ (count + 6) }}列
2层
{{arr3['0103-'+((count+6) >= 10 ? (count+6) : '0'+(count+6)) +'-02']}}
@@ -169,10 +169,10 @@
- 3排
{{ count }}列
1层 + 3排
{{ count }}列
1层
{{arr3['0103-0'+count+'-01']}}
@@ -196,10 +196,10 @@
- 3排
{{ (count + 6) }}列
1层 + 3排
{{ (count + 6) }}列
1层
{{arr3['0103-'+((count+6) >= 10 ? (count+6) : '0'+(count+6)) +'-01']}}
@@ -220,10 +220,10 @@
- 4排
{{ count }}列
2层 + 4排
{{ count }}列
2层
{{arr3['0104-0'+count+'-02']}}
@@ -240,10 +240,10 @@
- 4排
{{ (count + 6) }}列
2层 + 4排
{{ (count + 6) }}列
2层
{{arr['0104-'+((count+6) >= 10 ? (count+6) : '0'+(count+6)) +'-02']}}
@@ -262,10 +262,10 @@
- 4排
{{ count }}列
1层 + 4排
{{ count }}列
1层
{{arr3['0104-'+((count+6) >= 10 ? (count+6) : '0'+(count+6)) +'-01']}}
@@ -289,10 +289,10 @@
- 4排
{{ (count + 6) }}列
1层 + 4排
{{ (count + 6) }}列
1层
{{arr3['0104-'+((count+6) >= 10 ? (count+6) : '0'+(count+6)) +'-01']}}
@@ -313,10 +313,10 @@
- 5排
{{ count }}列
2层 + 5排
{{ count }}列
2层
{{arr3['0105-'+((count) >= 10 ? (count) : '0'+(count)) +'-02']}}
@@ -333,10 +333,10 @@
- 5排
{{ (count + 12) }}列
2层 + 5排
{{ (count + 12) }}列
2层
{{arr3['0105-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-02']}}
@@ -355,10 +355,10 @@
- 5排
{{ count }}列
1层 + 5排
{{ count }}列
1层
{{arr3['0105-'+((count) >= 10 ? (count) : '0'+(count)) +'-01']}}
@@ -382,10 +382,10 @@
- 5排
{{ (count + 12) }}列
1层 + 5排
{{ (count + 12) }}列
1层
{{arr3['0105-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-01']}}
@@ -406,10 +406,10 @@
- 6排
{{ count }}列
2层 + 6排
{{ count }}列
2层
{{arr3['0106-'+((count) >= 10 ? (count) : '0'+(count)) +'-02']}}
@@ -426,10 +426,10 @@
- 6排
{{ (count + 12) }}列
2层 + 6排
{{ (count + 12) }}列
2层
{{arr3['0106-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-02']}}
@@ -448,10 +448,10 @@
- 6排
{{ count }}列
1层 + 6排
{{ count }}列
1层
{{arr3['0106-'+((count) >= 10 ? (count) : '0'+(count)) +'-01']}}
@@ -475,10 +475,10 @@
- 6排
{{ (count + 12) }}列
1层 + 6排
{{ (count + 12) }}列
1层
{{arr3['0106-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-01']}}
@@ -499,10 +499,10 @@
- 7排
{{ count }}列
2层 + 7排
{{ count }}列
2层
{{arr3['0107-'+((count) >= 10 ? (count) : '0'+(count)) +'-02']}}
@@ -519,10 +519,10 @@
- 7排
{{ (count + 12) }}列
2层 + 7排
{{ (count + 12) }}列
2层
{{arr3['0107-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-02']}}
@@ -541,10 +541,10 @@
- 7排
{{ count }}列
1层 + 7排
{{ count }}列
1层
{{arr3['0107-'+((count) >= 10 ? (count) : '0'+(count)) +'-01']}}
@@ -568,10 +568,10 @@
- 7排
{{ (count + 12) }}列
1层 + 7排
{{ (count + 12) }}列
1层
{{arr3['0107-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-01']}}
@@ -592,10 +592,10 @@
- 8排
{{ count }}列
2层 + 8排
{{ count }}列
2层
{{arr3['0108-'+((count) >= 10 ? (count) : '0'+(count)) +'-02']}}
@@ -612,10 +612,10 @@
- 8排
{{ (count + 12) }}列
2层 + 8排
{{ (count + 12) }}列
2层
{{arr3['0108-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-02']}}
@@ -634,10 +634,10 @@
- 8排
{{ count }}列
1层 + 8排
{{ count }}列
1层
{{arr3['0108-'+((count) >= 10 ? (count) : '0'+(count)) +'-01']}}
@@ -661,10 +661,10 @@
- 8排
{{ (count + 12) }}列
1层 + 8排
{{ (count + 12) }}列
1层
{{arr3['0108-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-01']}}
@@ -685,16 +685,16 @@
- 9排
{{ count }}列
2层 + 9排
{{ count }}列
2层
{{arr3['0109-'+((count) >= 10 ? (count) : '0'+(count)) +'-02']}}
- 9排
{{ (count + 12) }}列
2层 + 9排
{{ (count + 12) }}列
2层
{{arr3['0109-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-02']}} @@ -727,10 +727,10 @@
- 9排
{{ count }}列
1层 + 9排
{{ count }}列
1层
{{arr3['0109-'+((count) >= 10 ? (count) : '0'+(count)) +'-01']}}
@@ -743,7 +743,7 @@ - 9排
{{ (count + 12) }}列
1层 + 9排
{{ (count + 12) }}列
1层
{{arr3['0109-'+((count+12) >= 10 ? (count+12) : '0'+(count+12)) +'-01']}} @@ -767,16 +767,17 @@