From b1ab4be395a104f6e1bb25249e0b93c520080053 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 01 十二月 2025 13:51:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/param/bindCtnrAndBinParam.java | 1
src/main/java/com/zy/asrs/controller/OpenController.java | 7 +
src/main/java/com/zy/asrs/entity/param/AgvBindCtnrAndBinTwoParam.java | 15 +++
src/main/resources/mapper/BasAgvMastLogMapper.xml | 1
src/main/java/com/zy/common/constant/AgvConstant.java | 23 +++++
src/main/java/com/zy/asrs/entity/param/AgvGoTheArnParam.java | 8 +-
src/main/java/com/zy/asrs/task/WorkLogScheduler.java | 2
src/main/webapp/static/js/common.js | 4
src/main/java/com/zy/asrs/entity/BasAgvMast.java | 8 +
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 165 +++++++++++++++++++++++++++-------------
src/main/java/com/zy/asrs/entity/BasAgvMastLog.java | 6 +
11 files changed, 175 insertions(+), 65 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index e5847dc..f830bdc 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -374,6 +374,9 @@
} catch (Exception e){
return R.error("鍗曟嵁缂栧彿[order_id]浠� "+sign_arm_sku+" 涓� "+sign_arm_order+" 浣滀负鎷嗗垎鏍囪鎷嗗垎澶辫触锛侊紒锛�");
}
+ if (param.getArm_no()>4){
+ return R.ok();
+ }
openService.taskArmWorkOrderStatus(param);
return R.ok();
@@ -451,7 +454,7 @@
boolean taskAgvReport = openService.TaskAgvReport(param);
if (taskAgvReport){
agvBindAndBin(String.valueOf(param.getTaskNo()));
- return R.ok();
+ return new R(0,"鎴愬姛");
}
return R.error("浠诲姟鍙蜂笉瀛樺湪");
}
@@ -551,7 +554,7 @@
Thread.sleep(500);
openService.agvBindAndBin(taskNo);
} catch (Exception e) {
- log.error("寮傛澶勭悊AGV鍏夋爡鍚庣画閫昏緫澶辫触", e);
+ log.error("寮傛澶勭悊AGV鎼繍鍚庣画閫昏緫澶辫触", e);
}
}
diff --git a/src/main/java/com/zy/asrs/entity/BasAgvMast.java b/src/main/java/com/zy/asrs/entity/BasAgvMast.java
index 7690e8e..22524b2 100644
--- a/src/main/java/com/zy/asrs/entity/BasAgvMast.java
+++ b/src/main/java/com/zy/asrs/entity/BasAgvMast.java
@@ -136,9 +136,15 @@
@TableField("devp_id")
private Integer devpId;
+ /**
+ * barcode
+ */
+ @ApiModelProperty(value= "barcode")
+ private String barcode;
+
@ApiModelProperty(value= "浠诲姟绫诲瀷")
@TableField("io_type")
- private Integer ioType;
+ private Integer ioType;//AGV搴撲綅==銆嬭緭閫佺嚎绔欑偣 0 AGV搴撲綅==銆婣GV搴撲綅 1 杈撻�佺嚎绔欑偣==銆婣GV搴撲綅 2 杈撻�佺嚎绔欑偣==銆嬭緭閫佺嚎绔欑偣 3
public BasAgvMast() {
SnowflakeIdWorker snowflakeIdWorker = SpringUtils.getBean(SnowflakeIdWorker.class);
diff --git a/src/main/java/com/zy/asrs/entity/BasAgvMastLog.java b/src/main/java/com/zy/asrs/entity/BasAgvMastLog.java
index 14fe4e5..18ab894 100644
--- a/src/main/java/com/zy/asrs/entity/BasAgvMastLog.java
+++ b/src/main/java/com/zy/asrs/entity/BasAgvMastLog.java
@@ -87,6 +87,12 @@
private Integer floorNo;
/**
+ * barcode
+ */
+ @ApiModelProperty(value= "barcode")
+ private String barcode;
+
+ /**
* 鐘舵�� 0: 鍒濆 1: 浣滀笟涓� 2: 瀹屾垚
*/
@ApiModelProperty(value= "鐘舵�� 0: 鍒濆 1: 浣滀笟涓� 2: 瀹屾垚 ")
diff --git a/src/main/java/com/zy/asrs/entity/param/AgvBindCtnrAndBinTwoParam.java b/src/main/java/com/zy/asrs/entity/param/AgvBindCtnrAndBinTwoParam.java
new file mode 100644
index 0000000..679e60e
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/AgvBindCtnrAndBinTwoParam.java
@@ -0,0 +1,15 @@
+package com.zy.asrs.entity.param;
+import lombok.Data;
+
+/*
+ * Created by Monkey D. Luffy on 2025.09.09
+ * */
+@Data
+public class AgvBindCtnrAndBinTwoParam {
+
+ private String reqCode;
+ private String podCode;//鎵樼洏鐮�
+ private String positionCode = "2034";//绔欑偣
+ private String indBind;
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/param/AgvGoTheArnParam.java b/src/main/java/com/zy/asrs/entity/param/AgvGoTheArnParam.java
index b382c8c..91170d9 100644
--- a/src/main/java/com/zy/asrs/entity/param/AgvGoTheArnParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/AgvGoTheArnParam.java
@@ -23,7 +23,7 @@
case "3100101":
case "3100201":
ArmAgvGratingParam armAgvGratingParam1 = new ArmAgvGratingParam();
- armAgvGratingParam1.setArmNo(5);
+ armAgvGratingParam1.setArmNo(6);
armAgvGratingParam1.setChannel("A1");
armList.add(armAgvGratingParam1);
return armList;
@@ -34,11 +34,11 @@
case "2900101":
case "2900201":
ArmAgvGratingParam armAgvGratingParam2 = new ArmAgvGratingParam();
- armAgvGratingParam2.setArmNo(5);
+ armAgvGratingParam2.setArmNo(6);
armAgvGratingParam2.setChannel("A2");
armList.add(armAgvGratingParam2);
ArmAgvGratingParam armAgvGratingParam3 = new ArmAgvGratingParam();
- armAgvGratingParam3.setArmNo(6);
+ armAgvGratingParam3.setArmNo(5);
armAgvGratingParam3.setChannel("A1");
armList.add(armAgvGratingParam3);
return armList;
@@ -47,7 +47,7 @@
case "2800101":
case "2800201":
ArmAgvGratingParam armAgvGratingParam4 = new ArmAgvGratingParam();
- armAgvGratingParam4.setArmNo(6);
+ armAgvGratingParam4.setArmNo(5);
armAgvGratingParam4.setChannel("A2");
armList.add(armAgvGratingParam4);
return armList;
diff --git a/src/main/java/com/zy/asrs/entity/param/bindCtnrAndBinParam.java b/src/main/java/com/zy/asrs/entity/param/bindCtnrAndBinParam.java
index 52a9786..3252360 100644
--- a/src/main/java/com/zy/asrs/entity/param/bindCtnrAndBinParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/bindCtnrAndBinParam.java
@@ -7,5 +7,6 @@
String barcode; //鎵樼洏鏉＄爜
String staNo; // 鐩爣绔欑偣
String locNo; // 鐩爣搴撲綅
+ Integer floorNo = 1; // 鐩爣妤煎眰
String indBind; // 0:瑙ｇ粦 1锛氱粦瀹�
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index d402788..a8300f7 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -18,6 +18,7 @@
import com.zy.asrs.utils.MatUtils;
import com.zy.asrs.utils.OrderInAndOutUtil;
import com.zy.asrs.utils.Utils;
+import com.zy.common.constant.AgvConstant;
import com.zy.common.constant.ArmConstant;
import com.zy.common.model.DetlDto;
import com.zy.common.service.CommonService;
@@ -807,6 +808,8 @@
basAgvMast.setStaNo(param.getStaNo());
basAgvMast.setSourceLocNo(param.getSourceLocNo());
basAgvMast.setLocNo(param.getLocNo());
+ String locNo = null;
+ String staNo = null;
// 榛樿鍊�
basAgvMast.setPriority(1L); // 榛樿浼樺厛绾�
basAgvMast.setStatus(0); // 鍒濆鐘舵��
@@ -814,11 +817,33 @@
basAgvMast.setModiTime(new Date()); // 淇敼鏃堕棿
basAgvMast.setIoType(param.getIoType());// 浠诲姟绫诲瀷
basAgvMast.setFloorNo(param.getFloorNo()); //妤煎眰
-
+ switch (basAgvMast.getIoType()){
+ // AGV搴撲綅==銆嬭緭閫佺嚎绔欑偣 0
+ // AGV搴撲綅==銆婣GV搴撲綅 1
+ // 杈撻�佺嚎绔欑偣==銆婣GV搴撲綅 2
+ // 杈撻�佺嚎绔欑偣==銆嬭緭閫佺嚎绔欑偣 3
+ case 0:
+ case 1:
+ locNo = param.getSourceLocNo();
+ break;
+ case 2:
+ case 3:
+ staNo = param.getSourceStaNo().toString();
+ break;
+ }
// 鎻掑叆鏁版嵁搴�
basAgvMastService.insert(basAgvMast);
-
- return true;
+ bindCtnrAndBinParam bindParam = new bindCtnrAndBinParam();
+ bindParam.setBarcode(basAgvMast.getTimestamp().toString());
+ bindParam.setIndBind("1");
+ bindParam.setFloorNo(basAgvMast.getFloorNo());
+ bindParam.setLocNo(locNo);
+ bindParam.setStaNo(staNo);
+ if(bindCtnrAndBin(bindParam)){
+ return true;
+ }else{
+ throw new CoolException("鏈兘缁戝畾");
+ }
}
@Override
@@ -865,51 +890,53 @@
if (param == null) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖");
}
- AgvBindCtnrAndBinParam agvBindCtnrAndBinParam = new AgvBindCtnrAndBinParam();
- BasAgvLocNoService basAgvLocNoService = SpringUtils.getBean(BasAgvLocNoService.class);
- BasAgvLocNo basAgvLocNoSou = basAgvLocNoService.selectOne(new EntityWrapper<BasAgvLocNo>().eq("loc_no", param.getLocNo()));
- BasAgvLocNo basAgvLocNoEnd = basAgvLocNoService.selectOne(new EntityWrapper<BasAgvLocNo>().eq("sta_no", param.getStaNo()));
- agvBindCtnrAndBinParam.setReqCode(String.valueOf(System.currentTimeMillis()));
- agvBindCtnrAndBinParam.setCtnrCode(param.getBarcode());
- agvBindCtnrAndBinParam.setCtnrTyp("1");
- if(basAgvLocNoEnd != null && basAgvLocNoEnd.getAgvLocNo() != null){
- agvBindCtnrAndBinParam.setStgBinCode(basAgvLocNoEnd.getAgvLocNo());
- }
- if(basAgvLocNoSou != null && basAgvLocNoSou.getAgvLocNo() != null){
- agvBindCtnrAndBinParam.setStgBinCode(basAgvLocNoSou.getAgvLocNo());
- }
- agvBindCtnrAndBinParam.setIndBind(param.getIndBind());
- try {
- String URL = "http://10.10.10.200:8181/rcms/services/rest/hikRpcService"; // AGV鎺ュ彛鍦板潃
- String mesPath = "bindCtnrAndBin"; // 鎺ュ彛璺緞
- String response = "";
- boolean success = false;
+ if (param.getFloorNo()==1){
+ AgvBindCtnrAndBinParam agvBindCtnrAndBinParam = new AgvBindCtnrAndBinParam();
+ BasAgvLocNoService basAgvLocNoService = SpringUtils.getBean(BasAgvLocNoService.class);
+ BasAgvLocNo basAgvLocNoSou = basAgvLocNoService.selectOne(new EntityWrapper<BasAgvLocNo>().eq("loc_no", param.getLocNo()));
+ BasAgvLocNo basAgvLocNoEnd = basAgvLocNoService.selectOne(new EntityWrapper<BasAgvLocNo>().eq("sta_no", param.getStaNo()));
+ agvBindCtnrAndBinParam.setReqCode(String.valueOf(System.currentTimeMillis()));
+ agvBindCtnrAndBinParam.setCtnrCode(param.getBarcode());
+ agvBindCtnrAndBinParam.setCtnrTyp("1");
+ if(basAgvLocNoEnd != null && basAgvLocNoEnd.getAgvLocNo() != null){
+ agvBindCtnrAndBinParam.setStgBinCode(basAgvLocNoEnd.getAgvLocNo());
+ }
+ if(basAgvLocNoSou != null && basAgvLocNoSou.getAgvLocNo() != null){
+ agvBindCtnrAndBinParam.setStgBinCode(basAgvLocNoSou.getAgvLocNo());
+ }
+ agvBindCtnrAndBinParam.setIndBind(param.getIndBind());
try {
- log.info("AGV缁戝畾瀹瑰櫒鎺ュ彛璇锋眰鍙傛暟: {}", JSON.toJSONString(agvBindCtnrAndBinParam));
+ String URL = AgvConstant.AGV_URL+"/"+AgvConstant.AGV_hikRpcService; // AGV鎺ュ彛鍦板潃
+ String mesPath = AgvConstant.getAGVADAPTOR(param.getFloorNo()); // 鎺ュ彛璺緞
+ String response = "";
+ boolean success = false;
+ try {
+ log.info("AGV缁戝畾瀹瑰櫒鎺ュ彛璇锋眰鍙傛暟: {}", JSON.toJSONString(agvBindCtnrAndBinParam));
- response = new HttpHandler.Builder()
- .setUri(URL)
- .setPath(mesPath)
- .setJson(JSON.toJSONString(agvBindCtnrAndBinParam))
- .build()
- .doPost();
+ response = new HttpHandler.Builder()
+ .setUri(URL)
+ .setPath(mesPath)
+ .setJson(JSON.toJSONString(agvBindCtnrAndBinParam))
+ .build()
+ .doPost();
- log.info("AGV缁戝畾瀹瑰櫒鎺ュ彛鍝嶅簲: {}", response);
- JSONObject jsonObject = JSON.parseObject(response);
+ log.info("AGV缁戝畾瀹瑰櫒鎺ュ彛鍝嶅簲: {}", response);
+ JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code") != null && jsonObject.getInteger("code").equals(0)) {
- success = true;
- } else {
- log.error("AGV缁戝畾瀹瑰櫒澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL + "/" + mesPath, JSON.toJSONString(agvBindCtnrAndBinParam), response);
- throw new CoolException("AGV缁戝畾瀹瑰櫒澶辫触: " + jsonObject.getString("msg"));
+ if (jsonObject.getInteger("code") != null && jsonObject.getInteger("code").equals(0)) {
+ success = true;
+ } else {
+ log.error("AGV缁戝畾瀹瑰櫒澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL + "/" + mesPath, JSON.toJSONString(agvBindCtnrAndBinParam), response);
+ throw new CoolException("AGV缁戝畾瀹瑰櫒澶辫触: " + jsonObject.getString("msg"));
+ }
+ } catch (Exception e) {
+ log.error("AGV缁戝畾瀹瑰櫒鎺ュ彛璋冪敤寮傚父锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL + "/" + mesPath, JSON.toJSONString(agvBindCtnrAndBinParam), response, e);
+ throw new CoolException("AGV缁戝畾瀹瑰櫒鎺ュ彛璋冪敤寮傚父: " + e.getMessage());
}
} catch (Exception e) {
- log.error("AGV缁戝畾瀹瑰櫒鎺ュ彛璋冪敤寮傚父锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL + "/" + mesPath, JSON.toJSONString(agvBindCtnrAndBinParam), response, e);
- throw new CoolException("AGV缁戝畾瀹瑰櫒鎺ュ彛璋冪敤寮傚父: " + e.getMessage());
+ throw new CoolException(e.getMessage());
}
- } catch (Exception e) {
- throw new CoolException(e.getMessage());
- }
+ } else {}
return true;
}
@@ -933,7 +960,7 @@
agvGoParam.setCode("0");
agvGoParam.setMessage("缁х画鎵ц");
agvGoParam.setReqCode(param.getReqCode());
- ReturnT<String> result = new PostMesDataUtils().postMesDataArmGrating("鍏夋爡涓嬪彂鍚庣户缁换鍔★細", URL, AGVPath, param);
+ ReturnT<String> result = new PostMesDataUtils().postMesDataArmGrating("鍏夋爡涓嬪彂鍚庣户缁换鍔★細", URL, AGVPath, agvGoParam);
if (result.getCode()==200){
return true;
}
@@ -946,21 +973,49 @@
String URL = "http://10.10.10.200:8181/"; // AGV鎺ュ彛鍦板潃
String AGVPath = "rcms/services/rest/hikRpcService/bindCtnrAndBin"; // 鎺ュ彛璺緞
BasAgvMast basAgvMast = basAgvMastService.selectOne(new EntityWrapper<BasAgvMast>().eq("task_no",taskNo));
- BasAgvLocNoService basAgvLocNoService = SpringUtils.getBean(BasAgvLocNoService.class);
- BasAgvLocNo basAgvLocNoEnd = basAgvLocNoService.selectOne(
- new EntityWrapper<BasAgvLocNo>().eq("sta_no", basAgvMast.getStaNo())
- );
- AgvBindCtnrAndBinParam agvBindCtnrAndBinParam = new AgvBindCtnrAndBinParam();
- agvBindCtnrAndBinParam.setReqCode(basAgvMast.getTaskNo() + "-" + basAgvMast.getTimestamp());
- agvBindCtnrAndBinParam.setCtnrCode(basAgvMast.getTimestamp().toString());
- agvBindCtnrAndBinParam.setCtnrTyp("1");
- agvBindCtnrAndBinParam.setStgBinCode(basAgvLocNoEnd.getAgvLocNo());
- agvBindCtnrAndBinParam.setIndBind("0");
- ReturnT<String> resultBind = new PostMesDataUtils().postMesDataArmGrating("AGV瀹瑰櫒缁戝畾瑙ｇ粦", URL,AGVPath, agvBindCtnrAndBinParam);
- if (resultBind.getCode()!=200){
- return true;
+ if (Cools.isEmpty(basAgvMast)){
+ return false;
}
+ if (basAgvMast.getFloorNo()==1){
+ BasAgvLocNoService basAgvLocNoService = SpringUtils.getBean(BasAgvLocNoService.class);
+ BasAgvLocNo basAgvLocNoEnd = basAgvLocNoService.selectOne(
+ new EntityWrapper<BasAgvLocNo>().eq("sta_no", basAgvMast.getStaNo())
+ );
+ if (Cools.isEmpty(basAgvMast)){
+ return false;
+ }
+ AgvBindCtnrAndBinParam agvBindCtnrAndBinParam = new AgvBindCtnrAndBinParam();
+ agvBindCtnrAndBinParam.setReqCode(basAgvMast.getTaskNo() + "-" + basAgvMast.getTimestamp());
+ agvBindCtnrAndBinParam.setCtnrCode(basAgvMast.getTimestamp().toString());
+ agvBindCtnrAndBinParam.setCtnrTyp("1");
+ agvBindCtnrAndBinParam.setStgBinCode(basAgvLocNoEnd.getAgvLocNo());
+ agvBindCtnrAndBinParam.setIndBind("0");
+ ReturnT<String> resultBind = new PostMesDataUtils().postMesDataArmGrating("AGV瀹瑰櫒缁戝畾瑙ｇ粦", URL,AGVPath, agvBindCtnrAndBinParam);
+ if (resultBind.getCode()!=200){
+ basAgvMast.setStatus(4);
+ basAgvMastService.updateById(basAgvMast);
+ return true;
+ }
+ return false;
+ }else {
+ if (basAgvMast.getIoType()==0 && basAgvMast.getStaNo()==2034){
+ AgvBindCtnrAndBinTwoParam agvBindCtnrAndBinTwoParam = new AgvBindCtnrAndBinTwoParam();
+ agvBindCtnrAndBinTwoParam.setReqCode(basAgvMast.getTaskNo() + "-" + basAgvMast.getTimestamp());
+ agvBindCtnrAndBinTwoParam.setPodCode(basAgvMast.getBarcode());
+ agvBindCtnrAndBinTwoParam.setPositionCode(basAgvMast.getStaNo().toString());
+ agvBindCtnrAndBinTwoParam.setIndBind("0");;
+ ReturnT<String> resultBind = new PostMesDataUtils().postMesDataArmGrating("AGV瀹瑰櫒缁戝畾瑙ｇ粦",
+ AgvConstant.AGV_URL+"/"+AgvConstant.AGV_hikRpcService,AgvConstant.getAGVADAPTOR(2), agvBindCtnrAndBinTwoParam);
+ if (resultBind.getCode()!=200){
+ basAgvMast.setStatus(4);
+ basAgvMastService.updateById(basAgvMast);
+ return true;
+ }
+ }
+ }
+
return false;
+
}
diff --git a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
index 23ae220..7cec24c 100644
--- a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
@@ -72,7 +72,7 @@
@Scheduled(cron = "0/10 * * * * ? ")
private void executeAgv(){
- List<BasAgvMast> basAgvstList = basAgvMastService.selectList(new EntityWrapper<BasAgvMast>().eq("status", 3));
+ List<BasAgvMast> basAgvstList = basAgvMastService.selectList(new EntityWrapper<BasAgvMast>().eq("status", 4));
if (basAgvstList.isEmpty()) {
return;
}
diff --git a/src/main/java/com/zy/common/constant/AgvConstant.java b/src/main/java/com/zy/common/constant/AgvConstant.java
new file mode 100644
index 0000000..66d4b01
--- /dev/null
+++ b/src/main/java/com/zy/common/constant/AgvConstant.java
@@ -0,0 +1,23 @@
+package com.zy.common.constant;
+
+/*
+ * Created by Monkey D. Luffy on 2025.09.09
+ * */
+public class AgvConstant {
+
+ public static final String AGV_URL = "http://10.10.10.200:8181";
+
+ public static final String AGV_hikRpcService = "rcms/services/rest/hikRpcService";
+ public static final String AGV_bindPodAndBerth = "bindPodAndBerth";//bangding 2
+ public static final String AGV_bindCtnrAndBin = "bindCtnrAndBin";//bangding 1
+
+ public static String getAGVADAPTOR(int f) {
+ switch (f) {
+ case 1:
+ return AGV_bindCtnrAndBin;
+ default:
+ return AGV_bindPodAndBerth;
+ }
+ }
+
+}
diff --git a/src/main/resources/mapper/BasAgvMastLogMapper.xml b/src/main/resources/mapper/BasAgvMastLogMapper.xml
index 2e30b0b..b897bd2 100644
--- a/src/main/resources/mapper/BasAgvMastLogMapper.xml
+++ b/src/main/resources/mapper/BasAgvMastLogMapper.xml
@@ -13,6 +13,7 @@
<result column="loc_no" property="locNo" />
<result column="priority" property="priority" />
<result column="floor_no" property="floorNo" />
+ <result column="barcode" property="barcode" />
<result column="status" property="status" />
<result column="error_time" property="errorTime" />
<result column="error_memo" property="errorMemo" />
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 2644c45..8f6a571 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -203,8 +203,8 @@
,{field: 'safeQty', align: 'center',title: '鎬讳欢鏁�', hide: true}
,{field: 'weight', align: 'center',title: '鍗曠鍑�閲峩g', hide: false}
,{field: 'manLength', align: 'center',title: '闀匡紙姣背锛�', hide: false}
- ,{field: 'height', align: 'center',title: '瀹斤紙姣背锛�', hide: false}
- ,{field: 'width', align: 'center',title: '楂橈紙姣背锛�', hide: false}
+ ,{field: 'width', align: 'center',title: '瀹斤紙姣背锛�', hide: false}
+ ,{field: 'height', align: 'center',title: '楂橈紙姣背锛�', hide: false}
// ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
--
Gitblit v1.9.1