From c003a346617235b50463fad3e9f9f95298a167c5 Mon Sep 17 00:00:00 2001
From: Administrator <zc857179121@qq.com>
Date: 星期二, 14 四月 2026 17:55:29 +0800
Subject: [PATCH] 1
---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/vo/SiteTableVo.java | 3 +
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/model/StaProtocol.java | 2
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/service/Snap7Service.java | 14 ++--
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/SiteController.java | 4 +
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/CtuMainServiceImpl.java | 2
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/JobServiceImpl.java | 2
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java | 22 ++++---
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/model/SafeSignal.java | 4
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/CtuController.java | 4
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/ClearSingleOperationHandler.java | 2
zy-asc-conveyor/src/main/webapp/views/pipeline.html | 4 +
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/OutOperationHandler.java | 7 +
zy-asc-conveyor/src/main/resources/application.yml | 2
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/StartUpOperationHandler.java | 57 +++++++++++++-----
zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/scheduler/JobLogScheduler.java | 2
15 files changed, 85 insertions(+), 46 deletions(-)
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/CtuController.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/CtuController.java
index 4727f24..81c7e23 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/CtuController.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/CtuController.java
@@ -56,8 +56,8 @@
stationResponseParam = new StationResponseParam();
stationResponseParam.setStaNo(staNo);
stationResponseParam.setOccupied(staProtocol.isLoading());
- stationResponseParam.setInEnable((staProtocol.getAllowPut()));
- stationResponseParam.setOutEnable((staProtocol.getAllowTake()));
+ stationResponseParam.setInEnable(staProtocol.getAllowPut());
+ stationResponseParam.setOutEnable(staProtocol.getAllowTake());
stationResponseParam.setOnline(staProtocol.isAutoing());
list.add(stationResponseParam);
}
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/SiteController.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/SiteController.java
index 45d9d36..6e72352 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/SiteController.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/SiteController.java
@@ -72,6 +72,7 @@
vo.setWeight(staProtocol.getWeight() == null ? 0D : staProtocol.getWeight());
vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() ? (staProtocol.isLow() ? "浣�" : "楂�") : "-"); //楂樹綆搴撲綅
vo.setAllow((staProtocol.getAllowPut() ? "鍙斁" : "涓嶅彲鏀�") + "/" + (staProtocol.getAllowTake() ? "鍙彇" : "涓嶅彲鍙�"));
+ vo.setBarcode(staProtocol.getBarcode());
}
return R.ok().add(list);
@@ -114,6 +115,7 @@
vo.setWeight(staProtocol.getWeight() == null ? 0D : staProtocol.getWeight());
vo.setLocType1(staProtocol.isHigh() != staProtocol.isLow() ? (staProtocol.isLow() ? "浣�" : "楂�") : "-"); //楂樹綆搴撲綅
vo.setAllow((staProtocol.getAllowPut() ? "鍙斁" : "涓嶅彲鏀�") + "/" + (staProtocol.getAllowTake() ? "鍙彇" : "涓嶅彲鍙�"));
+ vo.setBarcode(staProtocol.getBarcode());
return R.ok().add(vo);
}
}
@@ -185,7 +187,7 @@
if (i == -1) {
return R.error("姝ょ珯鐐规棤闇�瀹夊叏淇″彿");
}
- staProtocol.setSafeSignal(new SafeSignal(i, (short) 0, flag));
+ staProtocol.setSafeSignal(new SafeSignal(i, true, flag));
redis.push(RedisConveyorConstant.CONVEYOR_SAFE_FLAG, staProtocol);
return R.ok();
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/vo/SiteTableVo.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/vo/SiteTableVo.java
index 0c74f1c..563c54c 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/vo/SiteTableVo.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/controller/vo/SiteTableVo.java
@@ -42,4 +42,7 @@
//鍙彇
private String allow = "-";
+
+ private String barcode = "-";
+
}
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/model/SafeSignal.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/model/SafeSignal.java
index 1d57edf..efcd1c4 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/model/SafeSignal.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/model/SafeSignal.java
@@ -9,12 +9,12 @@
//鏄暟缁勬墍鍦ㄤ綅缃紝灏辨槸绗嚑涓嚭搴撳彛鎴栬�呯鍑犱釜鍏ュ簱鍙�
private Integer index;
//鏄啓0杩樻槸1
- private short value;
+ private Boolean value;
//浠ｈ〃鍐欏湪浜や簰1杩樻槸2
private Boolean flag;
- public SafeSignal(Integer index, Short value, Boolean flag) {
+ public SafeSignal(Integer index, Boolean value, Boolean flag) {
this.index = index;
this.value = value;
this.flag = flag;
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/model/StaProtocol.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/model/StaProtocol.java
index 666098b..1f55b5f 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/model/StaProtocol.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/model/StaProtocol.java
@@ -12,6 +12,8 @@
@Data
public class StaProtocol implements Cloneable, Serializable {
+ private boolean startUpFlag = true;
+
private Integer plcId;
// 绔欑偣缂栧彿
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/ClearSingleOperationHandler.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/ClearSingleOperationHandler.java
index d529339..a5be5d1 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/ClearSingleOperationHandler.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/ClearSingleOperationHandler.java
@@ -92,7 +92,7 @@
continue;
}
if (ctuMainService.checkComplete(job.getTaskNo())) {
- staProtocol.setSafeSignal(new SafeSignal(devp.getPutSta().indexOf(takeSta), (short) 1, false));
+ staProtocol.setSafeSignal(new SafeSignal(devp.getPutSta().indexOf(takeSta), true, false));
redis.push(RedisConveyorConstant.CONVEYOR_SAFE_FLAG, staProtocol);
job.setUpdateTime(new Date());
job.setJobSts(ConveyorStateType.CLEARSIGNAL.getStatus());
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/OutOperationHandler.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/OutOperationHandler.java
index 6f551da..1e89ca8 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/OutOperationHandler.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/OutOperationHandler.java
@@ -80,14 +80,17 @@
if (staProtocol.getWorkNo() == 0 && staProtocol.isLoading()) {
String seqNum = ctuMainService.checkStationStatus(putSta.getStaNo());
if (seqNum != null) {
- staProtocol.setSafeSignal(new SafeSignal(devp.getPutSta().indexOf(putSta), (short) 1, true));
- redis.push(RedisConveyorConstant.CONVEYOR_SAFE_FLAG, staProtocol);
Job job = jobService.getJobByTaskNo(seqNum);
if (job != null) {
News.error("{}锛氱珯鐐癸細{}锛屽瓨鍦ㄤ换鍔�,{}", config.getMark(), staProtocol.getSiteId(), JSON.toJSON(job));
continue;
}
+
+ staProtocol.setSafeSignal(new SafeSignal(devp.getPutSta().indexOf(putSta), true, true));
+ redis.push(RedisConveyorConstant.CONVEYOR_SAFE_FLAG, staProtocol);
+
+
int workNo = wrkLastnoService.nextWorkNo(WorkNoTypeType.WORK_NO_TYPE.type);
staProtocol.setWorkNo(workNo);
staProtocol.setStaNo(putSta.getTargetSta());
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/StartUpOperationHandler.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/StartUpOperationHandler.java
index 5817391..32178da 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/StartUpOperationHandler.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/operation/handler/StartUpOperationHandler.java
@@ -12,7 +12,9 @@
import com.zy.acs.conveyor.core.properties.SlaveProperties;
import com.zy.acs.conveyor.core.service.StationService;
import com.zy.acs.conveyor.entity.Job;
+import com.zy.acs.conveyor.enums.WorkNoTypeType;
import com.zy.acs.conveyor.service.JobService;
+import com.zy.acs.conveyor.service.WrkLastnoService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -38,6 +40,10 @@
@Autowired
private StationService stationService;
+
+
+ @Autowired
+ private WrkLastnoService wrkLastnoService;
private final RedisSupport redis = RedisSupport.defaultRedisSupport;
@@ -79,25 +85,29 @@
}
}
- Job jobByJobNo = jobService.getJobByJobNo(staProtocol.getWorkNo());
- if (jobByJobNo == null) {
- News.error("{}锛氱珯鐐癸細{}锛屾壘涓嶅埌浠诲姟", config.getMark(), staProtocol.getSiteId());
- continue;
- }
- if (jobByJobNo.getJobSts() != ConveyorStateType.OUTBOUND.getStatus()) {
- if (jobByJobNo.getJobSts() == ConveyorStateType.STARTUP.getStatus()) {
- continue;
+// Job jobByJobNo = jobService.getJobByJobNo(staProtocol.getWorkNo());
+// if (jobByJobNo == null) {
+// News.error("{}锛氱珯鐐癸細{}锛屾壘涓嶅埌浠诲姟", config.getMark(), staProtocol.getSiteId());
+// continue;
+// }
+// if (jobByJobNo.getJobSts() != ConveyorStateType.OUTBOUND.getStatus()) {
+// if (jobByJobNo.getJobSts() == ConveyorStateType.STARTUP.getStatus()) {
+// continue;
+// }
+// News.error("{}锛氱珯鐐癸細{}锛屼换鍔＄姸鎬佷笉瀵癸紝{}", config.getMark(), staProtocol.getSiteId(), JSON.toJSON(jobByJobNo));
+// continue;
+// }
+ if (staProtocol.getWorkNo() == 0) {
+ Job job = initJob(getWorkNo(), staProtocol.getSiteId() + "");
+ staProtocol.setWorkNo(job.getJobNo());
+ staProtocol.setStaNo(inSta.getStaNo());
+ staProtocol.setStartUpFlag(false);
+ redis.push(RedisConveyorConstant.CONVEYOR_TASK_FLAG, staProtocol);
+ if (!jobService.insert(job)) {
+ News.info("{},鍚姩鍏ュ簱锛歿},{}", config.getMark(), staProtocol.getWorkNo(), staProtocol.getStaNo());
}
- News.error("{}锛氱珯鐐癸細{}锛屼换鍔＄姸鎬佷笉瀵癸紝{}", config.getMark(), staProtocol.getSiteId(), JSON.toJSON(jobByJobNo));
- continue;
}
- staProtocol.setStaNo(inSta.getStaNo());
- redis.push(RedisConveyorConstant.CONVEYOR_TASK_FLAG, staProtocol);
- jobByJobNo.setStartTime(new Date());
- jobByJobNo.setJobSts(ConveyorStateType.STARTUP.getStatus());
- if (!jobService.updateById(jobByJobNo)) {
- News.info("{},鍚姩鍏ュ簱锛歿},{}", config.getMark(), staProtocol.getWorkNo(), staProtocol.getStaNo());
- }
+
}
}
} catch (Exception e) {
@@ -105,4 +115,17 @@
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
}
}
+
+ private Job initJob(Integer workNo, String staNo) {
+ Job job = new Job();
+ job.setStaNo(staNo);
+ job.setJobNo(workNo);
+ job.setJobSts(ConveyorStateType.STARTUP.getStatus());
+ job.setStartTime(new Date());
+ return job;
+ }
+
+ private Integer getWorkNo() {
+ return wrkLastnoService.nextWorkNo(WorkNoTypeType.WORK_NO_TYPE.type);
+ }
}
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/service/Snap7Service.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/service/Snap7Service.java
index fb3e8f5..6e9f1d4 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/service/Snap7Service.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/service/Snap7Service.java
@@ -66,18 +66,18 @@
SafeSignal safeSignal = staProtocol.getSafeSignal();
int baseOffset = 0;
- short[] array = new short[6];
- array[0] = (short) 1;
- array[1] = (short) 0;
- array[2] = (short) 0;
- array[5] = (short) 0;
+ boolean[] array = new boolean[6];
+ array[0] = true;
+ array[1] = false;
+ array[2] = false;
+ array[5] = false;
if (safeSignal.getFlag()) {
- array[3] = (short) 0;
+ array[3] = false;
array[4] = safeSignal.getValue();
baseOffset = SafeSignalField.SAFE_SIGNAL_TO_CONVEYOR.getOffset() + safeSignal.getIndex() * SafeSignalField.SAFE_SIGNAL_TO_CONVEYOR.getByteLength();
} else {
array[3] = safeSignal.getValue();
- array[4] = (short) 0;
+ array[4] = false;
baseOffset = SafeSignalField.SAFE_SIGNAL_TO_CONVEYOR.getOffset() + 2 + safeSignal.getIndex() * SafeSignalField.SAFE_SIGNAL_TO_CONVEYOR.getByteLength();
}
String flagAddr = SafeSignalField.SAFE_SIGNAL_TO_CONVEYOR.getAddressPattern() + PlcConstant.ADDRESS_CONCATENATION
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java
index 165210f..9609a39 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/core/thread/SiemensDevpThread.java
@@ -169,8 +169,12 @@
staProtocol.setSegApply(status2[2]);
staProtocol.setApplyErr(status2[3]);
- for (int i = 0; i < 8; i++){
- if (status0[i+8]!=status2[i]){
+ if (!status2[1] && !status[0]) {
+ staProtocol.setStartUpFlag(true);
+ }
+
+ for (int i = 0; i < 8; i++) {
+ if (status0[i + 8] != status2[i]) {
log.info("鐘舵�佺爜涓嶄竴鑷� [id:{}] [i:{}] [status0:{}] [status2:{}]", slave.getId(), i, status0[i], status2[i]);
}
}
@@ -200,16 +204,16 @@
content, seg[0] + i * DeviceField.BARCODE.getByteLength());
String barcode = siemensS7Net.getByteTransform().TransString(
content, seg[1] + i * DeviceField.BARCODE.getByteLength(),
- DeviceField.BARCODE.getByteLength() - seg[1], "UTF-8");
+ DeviceField.BARCODE.getByteLength()-seg[1] , "UTF-8").trim();
- if (!Cools.isEmpty(barcode) && staNo != 0) {
+ if (!Cools.isEmpty(barcode) && !barcode.contains("Default") && staNo != 0) {
StaProtocol staProtocol = station.get(staNo);
if (staProtocol == null) {
log.warn("鎵爜绔欑偣涓嶅瓨鍦� [id:{}] [staNo:{}]", slave.getId(), staNo);
continue;
}
staProtocol.setBarcode(barcode);
- News.info("鏂欑鐮侊細{}", barcode);
+ //News.info("鏂欑鐮侊細{}", barcode);
}
}
}
@@ -240,7 +244,7 @@
if (!Cools.isEmpty(weight) && staNo != 0) {
StaProtocol staProtocol = station.get(staNo);
if (staProtocol == null) {
- log.warn("绉伴噸绔欑偣涓嶅瓨鍦� [id:{}] [staNo:{}]", slave.getId(), staNo);
+ log.warn(" [id:{}] [staNo:{}]", slave.getId(), staNo);
continue;
}
staProtocol.setWeight(BigDecimal.valueOf(weight).setScale(4, RoundingMode.HALF_UP).doubleValue());
@@ -379,12 +383,12 @@
staProtocolTake.setOutComplete(status2[4]);
//
if (status[3]) {
- staProtocolPut.setSafeSignal( new SafeSignal(i, (short) 0, true));
- redis.push(RedisConveyorConstant.CONVEYOR_SAFE_FLAG,staProtocolPut);
+ staProtocolPut.setSafeSignal(new SafeSignal(i, false, true));
+ redis.push(RedisConveyorConstant.CONVEYOR_SAFE_FLAG, staProtocolPut);
News.info("瀹夊叏浜や簰淇″彿澶嶄綅 [id:{}] [staNo:{}]", slave.getId(), staProtocolPut.getSiteId());
}
if (status2[4]) {
- staProtocolTake.setSafeSignal(new SafeSignal(i, (short) 0, false));
+ staProtocolTake.setSafeSignal(new SafeSignal(i, false, false));
redis.push(RedisConveyorConstant.CONVEYOR_SAFE_FLAG, staProtocolTake);
News.info("瀹夊叏浜や簰淇″彿澶嶄綅 [id:{}] [staNo:{}]", slave.getId(), staProtocolPut.getSiteId());
}
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/scheduler/JobLogScheduler.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/scheduler/JobLogScheduler.java
index 3d764c4..ab454e7 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/scheduler/JobLogScheduler.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/scheduler/JobLogScheduler.java
@@ -43,7 +43,7 @@
@Scheduled(cron = "0 0 2 * * ?")
public void delToLog() {
List<Job> jobByDay = jobMapper.listJobByDay(90);
- for (Job job :jobByDay) {
+ for (Job job : jobByDay) {
jobService.saveJobLog(job);
}
}
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/CtuMainServiceImpl.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/CtuMainServiceImpl.java
index 20254ec..d94f950 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/CtuMainServiceImpl.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/CtuMainServiceImpl.java
@@ -152,7 +152,7 @@
//throw new CoolException("璋冪敤涓嬪彂浠诲姟鎺ュ彛鎶ラ敊锛屽搷搴旂爜锛�" + jsonObject.getInteger(code));
}
} catch (Exception e) {
- log.error("妫�鏌ョ珯鐐圭姸鎬佸け璐ワ紝浠诲姟缂栧彿锛歿},{}", seqNum,e.getMessage());
+ log.error("妫�鏌ョ珯鐐圭姸鎬佸け璐ワ紝浠诲姟缂栧彿锛歿},{}", seqNum, e.getMessage());
}
return false;
}
diff --git a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/JobServiceImpl.java b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/JobServiceImpl.java
index 3c98975..be9dc7c 100644
--- a/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/JobServiceImpl.java
+++ b/zy-asc-conveyor/src/main/java/com/zy/acs/conveyor/service/impl/JobServiceImpl.java
@@ -58,7 +58,7 @@
public void saveJobLog(Job job) {
JobLog jobLog = new JobLog();
BeanUtils.copyProperties(job, jobLog);
- if (Cools.isEmpty(jobLog.getMemo())){
+ if (Cools.isEmpty(jobLog.getMemo())) {
jobLog.setMemo(DateUtils.convert(new Date()));
}
jobLogMapper.insert(jobLog);
diff --git a/zy-asc-conveyor/src/main/resources/application.yml b/zy-asc-conveyor/src/main/resources/application.yml
index e582c92..f407296 100644
--- a/zy-asc-conveyor/src/main/resources/application.yml
+++ b/zy-asc-conveyor/src/main/resources/application.yml
@@ -30,7 +30,7 @@
path: /stock/out/cv/logs
wms:
- url: 127.0.0.1:8081
+ url: 127.0.0.1:8082
apply: /rsf-open-api/rcs/api/open/location/allocate
ctu:
url: 127.0.0.1:8088
diff --git a/zy-asc-conveyor/src/main/webapp/views/pipeline.html b/zy-asc-conveyor/src/main/webapp/views/pipeline.html
index 2505149..ef16ef9 100644
--- a/zy-asc-conveyor/src/main/webapp/views/pipeline.html
+++ b/zy-asc-conveyor/src/main/webapp/views/pipeline.html
@@ -786,7 +786,8 @@
<th>閲嶉噺淇″彿</th>
<th>绌烘弧淇″彿</th>
<th>鐩爣绔�</th>
- <th>鍙斁/鍙彇</th>
+ <th>鏉＄爜</th>
+ <th>瀹夊叏淇″彿</th>
<!-- <th>楂樹綆淇″彿</th>-->
</tr>
</thead>
@@ -992,6 +993,7 @@
<td>${site.weight || '--'}</td>
<td>${site.emptyMk || '--'}</td>
<td>${site.staNo || '--'}</td>
+ <td>${site.barcode || '--'}</td>
<td>${site.allow || '--'}</td>
</tr>
`;
--
Gitblit v1.9.1