From 50eb871e7dfcf064639cc15e53573baf28e60f26 Mon Sep 17 00:00:00 2001
From: Administrator <1051256694@qq.com>
Date: 星期四, 12 三月 2026 17:45:20 +0800
Subject: [PATCH] #
---
license.lic | 0
src/main/java/com/zy/system/entity/license/LicenseCheckListener.java | 44 +++++-----
src/main/java/com/zy/api/service/impl/HmesApiServiceImpl.java | 68 +++++++++--------
src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java | 13 +++
src/main/resources/mapper/LocDetlMapper.xml | 2
src/main/webapp/static/js/locAroundBind/locAroundBind.js | 1
src/main/java/com/zy/asrs/entity/WrkMast.java | 2
src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 15 ++-
src/main/resources/mapper/WrkMastMapper.xml | 1
src/main/java/com/zy/common/web/WcsController.java | 25 +++++-
src/main/webapp/views/basDevice/basDevice.html | 10 ++
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 6 +
src/main/java/com/zy/api/controller/HmesApiController.java | 4 +
src/main/resources/application-dev.yml | 2
src/main/resources/license.lic | 0
15 files changed, 123 insertions(+), 70 deletions(-)
diff --git a/license.lic b/license.lic
index 22364dc..1c35635 100644
--- a/license.lic
+++ b/license.lic
Binary files differ
diff --git a/src/main/java/com/zy/api/controller/HmesApiController.java b/src/main/java/com/zy/api/controller/HmesApiController.java
index dcbc9aa..cff31d2 100644
--- a/src/main/java/com/zy/api/controller/HmesApiController.java
+++ b/src/main/java/com/zy/api/controller/HmesApiController.java
@@ -1,6 +1,7 @@
package com.zy.api.controller;
+import com.alibaba.fastjson.JSONObject;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
@@ -9,6 +10,7 @@
import com.zy.asrs.entity.param.OpenOrderPakoutParam;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -19,6 +21,7 @@
@Api(value = "HMES瀵规帴")
@RestController
+@Slf4j
@RequestMapping("/api")
public class HmesApiController {
@@ -35,6 +38,7 @@
@ApiOperation("涓嬪彂鐢熶骇浠诲姟")
@PostMapping("/work/tasks")
public R menauWork(@RequestBody OpenOrderPakoutParam params) {
+ log.info("涓嬪彂鐢熶骇浠诲姟={}", JSONObject.toJSONString(params));
if (Objects.isNull(params)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
diff --git a/src/main/java/com/zy/api/service/impl/HmesApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/HmesApiServiceImpl.java
index 4bd4a81..968cd42 100644
--- a/src/main/java/com/zy/api/service/impl/HmesApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/HmesApiServiceImpl.java
@@ -17,6 +17,7 @@
import com.zy.asrs.service.impl.OrderDetlPakoutServiceImpl;
import com.zy.asrs.service.impl.OrderPakoutServiceImpl;
import com.zy.common.model.DetlDto;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -25,6 +26,7 @@
import java.util.stream.Collectors;
@Service
+@Slf4j
public class HmesApiServiceImpl implements HmesApiService {
@Autowired
@@ -75,12 +77,46 @@
// 濡傛灉鍗曟嵁涓嶅瓨鍦ㄥ垯娣诲姞锛涘鏋滃崟鎹瓨鍦紝浣滀笟涓棤娉曚慨鏀癸紝鍙嶄箣鍒欎慨鏀瑰崟鎹�
if (!Cools.isEmpty(order)) {
if (order.getSettle() > 1L) {
+ log.error(param.getOrderNo() + "姝ｅ湪鍑哄簱锛屾棤娉曚慨鏀瑰崟鎹�");
throw new CoolException(param.getOrderNo() + "姝ｅ湪鍑哄簱锛屾棤娉曚慨鏀瑰崟鎹�");
}
orderPakoutService.remove(order.getId());
}
DocType docType = docTypeService.selectOrAdd(param.getBillType(), Boolean.FALSE);
Date now = new Date();
+
+ // 鍗曟嵁鏄庣粏妗�
+ List<DetlDto> list = new ArrayList<>();
+ List<DetlDto> orderDetails = param.getMatList();
+ for (DetlDto detail : orderDetails) {
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(),detail.getBrand(),detail.getDevNo(),detail.getStandby2(),detail.getStandby3(),detail.getLineNumber(),
+ detail.getBoxType1(),detail.getBoxType2(),detail.getBoxType3(), detail.getAnfme());
+ if (DetlDto.hasLineNumber(list, dto)) {
+ DetlDto detlDto = DetlDto.findLineNumber(list, dto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getDevNo(),dto.getStandby2(),dto.getStandby3(),dto.getLineNumber(),
+ dto.getBoxType1(),dto.getBoxType2(),dto.getBoxType3());
+ assert detlDto != null;
+ detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
+ } else {
+ list.add(dto);
+ }
+ }
+ //涓嬪彂鐨勮鍗曟槑缁嗭紝鏌ョ湅搴撳瓨鏄惁鏈夎冻澶熺殑搴撳瓨锛屾帓闄ゆ満鍙扮殑搴撲綅
+ for (DetlDto detail : list) {
+ List<LocDetl> matnr = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("matnr", detail.getMatnr()));
+ Double count=0.0;
+ for (LocDetl detl : matnr) {
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", detl.getLocNo()).eq("loc_sts","F"));
+ if (locMast != null) {
+ LocAroundBind bLocNo = locAroundBindService.selectOne(new EntityWrapper<LocAroundBind>().eq("b_loc_no", locMast.getLocNo()));
+ if (Cools.isEmpty(bLocNo)) {
+ count=detl.getAnfme()+count;
+ }
+ }
+ }
+ if (count<detail.getAnfme()) {
+ return R.error("鐗╂枡="+detail.getMatnr()+"搴撳瓨涓嶈冻鏃犳硶鐢熸垚璁㈠崟");
+ }
+ }
// 鍗曟嵁涓绘。
order = new OrderPakout(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
@@ -120,38 +156,6 @@
);
if (!orderPakoutService.insert(order)) {
throw new CoolException("鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
- // 鍗曟嵁鏄庣粏妗�
- List<DetlDto> list = new ArrayList<>();
- List<DetlDto> orderDetails = param.getMatList();
- for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(),detail.getBrand(),detail.getDevNo(),detail.getStandby2(),detail.getStandby3(),detail.getLineNumber(),
- detail.getBoxType1(),detail.getBoxType2(),detail.getBoxType3(), detail.getAnfme());
- if (DetlDto.hasLineNumber(list, dto)) {
- DetlDto detlDto = DetlDto.findLineNumber(list, dto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getDevNo(),dto.getStandby2(),dto.getStandby3(),dto.getLineNumber(),
- dto.getBoxType1(),dto.getBoxType2(),dto.getBoxType3());
- assert detlDto != null;
- detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
- } else {
- list.add(dto);
- }
- }
- //涓嬪彂鐨勮鍗曟槑缁嗭紝鏌ョ湅搴撳瓨鏄惁鏈夎冻澶熺殑搴撳瓨锛屾帓闄ゆ満鍙扮殑搴撲綅
- for (DetlDto detail : list) {
- List<LocDetl> matnr = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("matnr", detail.getMatnr()));
- Double count=0.0;
- for (LocDetl detl : matnr) {
- LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", detl.getLocNo()).eq("loc_sts","F"));
- if (locMast != null) {
- LocAroundBind bLocNo = locAroundBindService.selectOne(new EntityWrapper<LocAroundBind>().eq("b_loc_no", locMast.getLocNo()));
- if (Cools.isEmpty(bLocNo)) {
- count=detl.getAnfme()+count;
- }
- }
- }
- if (count<detail.getAnfme()) {
- return R.error("鐗╂枡="+detail.getMatnr()+"搴撳瓨涓嶈冻鏃犳硶鐢熸垚璁㈠崟");
- }
}
for (DetlDto detlDto : list) {
Mat mat = matService.selectByMatnr(detlDto.getMatnr());
diff --git a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
index 3b3fc44..37283b4 100644
--- a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -201,7 +201,7 @@
}
}
}
- }else if (wrkMast.getIoType()==101){
+ }else if (wrkMast.getIoType()==101 || wrkMast.getIoType()==110) {
wrkMast.setWrkSts(12L);
wrkMast.setModiTime(new Date());
wrkMastService.updateById(wrkMast);
@@ -371,6 +371,17 @@
} else {
throw new CoolException("浠诲姟鍙锋埅鍙栧け璐ワ紝璇锋鏌ヤ富浠诲姟妗ｄ换妗rkCode瀛楁");
}
+ }else{
+ String wrkNo = mast.getWrkCode();
+ WrkMast orgWrk = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkNo));
+ if (Objects.isNull(orgWrk)) {
+ throw new CoolException("鏁版嵁閿欒锛屼富浠诲姟妗ｄ笉瀛樺湪鎴栧凡鍒犻櫎锛侊紒");
+ }
+ mast.setOveMk("Y");
+ orgWrk.setOveMk("Y");
+ if (!wrkMastService.updateById(orgWrk)) {
+ throw new CoolException("浠诲姟妗ｄ慨鏀瑰け璐ワ紒锛�");
+ }
}
}
} else {
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index a389c76..4f21fd1 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -32,6 +32,8 @@
private Integer wrkNo;
@ApiModelProperty("浠诲姟绫诲瀷锛� agv, crn")
+ @TableField("task_type")
+ @TableId(value = "task_type")
private String taskType;
@ApiModelProperty("浠诲姟缂栫爜")
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 6298d71..8870b81 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -350,6 +350,7 @@
wrkMast.setCrnNo(locMast.getCrnNo());
wrkMast.setSourceStaNo(staDesc.getCrnStn() + ""); // 婧愮珯
wrkMast.setStaNo(staDesc.getStnNo() + ""); // 鐩爣绔�
+ wrkMast.setOveMk(staDesc.getStnNo()==1076? "Y":"N");
wrkMast.setSourceLocNo(dto.getLocNo()); // 婧愬簱浣�
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
@@ -458,7 +459,8 @@
.eq("dev_no", basDevice.getType()).orderBy("order_no"));
if (Objects.isNull(binds)) {
- throw new CoolException("鏈哄彴鏈缃粯璁ゅ伐浣滀綅锛侊紒");
+ log.error("娌℃湁鍙敤鏈哄彴");
+ return;
}
//
// Set<String> locs = binds.stream().map(LocAroundBind::getBlocNo).collect(Collectors.toSet());
@@ -723,6 +725,8 @@
wrkMast.setExitMk("N"); // 閫�鍑�
wrkMast.setEmptyMk("Y"); // 绌烘澘
wrkMast.setLinkMis("N");
+ wrkMast.setOveMk("Y");
+ wrkMast.setBarcode(locMast.getBarcode());
wrkMast.setAppeUser(userId);
wrkMast.setAppeTime(now);
wrkMast.setModiUser(userId);
diff --git a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
index df0a5de..efe8e29 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -102,12 +102,12 @@
}else {
continue;
}
- Integer crnNo = wrkMast.getCrnNo();
- //璇ュ爢鍨涙満宸茬粡涓嬪彂浠诲姟缁檞cs鍚庝笉鍐嶄笅鍙戞柊鐨勬惉杩愪换鍔�
- List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).in("wrk_sts", Arrays.asList(2L, 12L)));
- if (!wrkMasts1.isEmpty()) {
- continue;
- }
+// Integer crnNo = wrkMast.getCrnNo();
+// //璇ュ爢鍨涙満宸茬粡涓嬪彂浠诲姟缁檞cs鍚庝笉鍐嶄笅鍙戞柊鐨勬惉杩愪换鍔�
+// List<WrkMast> wrkMasts1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).in("wrk_sts", Arrays.asList(2L, 12L)));
+// if (!wrkMasts1.isEmpty()) {
+// continue;
+// }
//婧愬簱浣嶄负鍐荤粨搴撲綅鏃剁姝笅鍙戞惉杩愪换鍔＄粰鍫嗗灈鏈�
if (!Cools.isEmpty(wrkMast.getSourceLocNo())){
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
@@ -132,7 +132,7 @@
String wcsLocNo = Cools.isEmpty(wrkMast.getLocNo()) ? "" : Utils.WMSLocToWCSLoc(wrkMast.getLocNo());
WorkTaskParams params = new WorkTaskParams();
//鍑哄簱鍜岀Щ搴�
- if(wrkMast.getIoType()==101&&!Cools.isEmpty(wrkMast.getStaNo())&& !wrkMast.getStaNo().equals("0")) {
+ if((wrkMast.getIoType()==101||wrkMast.getIoType()==110)&&!Cools.isEmpty(wrkMast.getStaNo())&& !wrkMast.getStaNo().equals("0")) {
params.setType("out")
.setTaskNo(wrkMast.getWrkNo()+"")
.setSourceLocNo(wcsSourceLocNo)
@@ -144,6 +144,7 @@
params.setType("in")
.setTaskNo(wrkMast.getWrkNo()+"")
.setSourceStaNo(wrkMast.getSourceStaNo())
+ .setStaNo(wrkMast.getStaNo())
.setLocNo(wcsLocNo)
.setTaskPri(wrkMast.getIoPri().intValue())
.setBarcode(wrkMast.getBarcode());
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 607bd5b..1124064 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -62,6 +62,7 @@
@PostMapping("/pakin/loc/v1")
@ResponseBody
public synchronized R getLocNo(@RequestBody SearchLocParam param) {
+ StartupDto dto = null;
log.info("鏀跺埌WCS鍏ュ簱鎺ュ彛璇锋眰====>>鍏ュ弬:{}", param);
if (Cools.isEmpty(param.getIoType())) {
return R.error("鍏ュ嚭搴撶被鍨嬩笉鑳戒负绌�");
@@ -75,7 +76,7 @@
//3S19000677895,M22003772,3 ,KP, 0A2030 ,0A2030202306050023
//3S绠辩爜鍙� ,绔瓙鐗╂枡鍙� ,鏁伴噺,鍗曚綅,渚涘簲鍟嗙紪鍙�,渚涘簲鍟嗘壒娆″彿
//鏁伴噺鍜岄噸閲忚浆鎹㈠嚭鏉ョ殑鏄惁宸笉澶�
- //weight 涓� 43.39 鍘荤毊2.35 = 41.05
+ //weight 涓� 43.39 鍘荤毊2.45 = 40.95
//鎵樼洏鐮佷緥瀛� 845000820308,M11000787,1000,MT,0A1263,0A126320260120
//鎹㈢畻闇�瑕�41.05*24.36绾︾瓑浜�1000
if (Cools.isEmpty(param.getBarcode())) {
@@ -91,8 +92,22 @@
String threeCode = param.getBarcode();
param.setBarcode(barcode);
//瀹為檯绉伴噸鏁伴噺
- Double m = param.getWeight() -2.35;
+ Double m = param.getWeight() -2.45;
+
+ WrkMast wrkMast1 = wrkMastService.selectByBarcode(barcode);
+ if (!Cools.isEmpty(wrkMast1)&&wrkMast1.getWrkSts()==2) {
+ StartupDto dto1 =new StartupDto();
+ dto1.setBarcode(barcode);
+ dto1.setSourceStaNo(Integer.valueOf(wrkMast1.getSourceStaNo()));
+ dto1.setStaNo(Integer.valueOf(wrkMast1.getStaNo()));
+ String s = Utils.WMSLocToWCSLoc(wrkMast1.getLocNo());
+ dto1.setLocNo(s);
+ dto1.setCrnNo(wrkMast1.getCrnNo());
+ dto1.setWorkNo(wrkMast1.getWrkNo());
+ dto1.setTaskPri((int) Math.round(wrkMast1.getIoPri()));
+ return R.ok(dto1);
+ }
Mat mat = matService.selectByMatnr(matnr);
if(mat==null){
log.info("娌℃湁鎵惧埌璇ョ墿鏂欐。妗�--"+matnr+"缁勬墭鏃惰嚜鍔ㄦ柊澧炵墿鏂欙紝榛樿24.36KG/M");
@@ -132,6 +147,7 @@
waitPakin.setZpallet(param.getBarcode());
waitPakin.setAnfme(m);
waitPakin.setThreeCode(threeCode);
+ waitPakins.add(waitPakin);
waitPakinService.insert(waitPakin);
}else {
for(WaitPakin waitPakin : waitPakins){
@@ -148,7 +164,9 @@
if(Cools.isEmpty(waitPakin.getBeBatch())||waitPakin.getBeBatch()!=1){
flag = true;
}
- if (flag && (weight - m < -2.0 || weight - m > 2.0)) {
+ //2.5KG * 姣忓叕鏂ら暱搴� = 璇樊鍊�
+ Double dou= 2.5*mat.getVolume();
+ if (flag && (weight - m < -dou || weight - m > dou)) {
return R.error("浜岀淮鐮�="+threeCode+"鐨勭墿鏂欏疄闄呯О閲嶈浆鎹㈡垚鐨勭背鏁板拰鐗╂枡鏍囩鎻愪緵鐨勭背鏁扮浉宸緝澶ч渶瑕侀��鍥炴垨鑰呮爣璁板悗鎵嶈兘鍏ュ簱锛�");
}
@@ -167,7 +185,6 @@
sourceStaNo.setLocType1(param.getLocType1());
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
- StartupDto dto = null;
switch (param.getIoType()) {
case 1://婊℃墭鐩樺叆搴�
assert waitPakins != null;
diff --git a/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java b/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
index 99d99cc..66234c2 100644
--- a/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
+++ b/src/main/java/com/zy/system/entity/license/LicenseCheckListener.java
@@ -69,11 +69,11 @@
logger.info("++++++++ 寮�濮嬪姞杞借鍙瘉 ++++++++");
try {
-// String publicKeysStoreFileName = this.getClass().getClassLoader().getResource(publicKeysStorePath).getPath();
-// File publicKeysStoreFile = new File(publicKeysStoreFileName);
-//
-// String licensePathFileName = this.getClass().getClassLoader().getResource(licensePath).getPath();
-// File licensePathFile = new File(licensePathFileName);
+ String publicKeysStoreFileName = this.getClass().getClassLoader().getResource(publicKeysStorePath).getPath();
+ File publicKeysStoreFile = new File(publicKeysStoreFileName);
+
+ String licensePathFileName = this.getClass().getClassLoader().getResource(licensePath).getPath();
+ File licensePathFile = new File(licensePathFileName);
LicenseVerifyParam param = new LicenseVerifyParam();
param.setSubject(subject);
@@ -84,29 +84,29 @@
LicenseVerify licenseVerify = new LicenseVerify();
//瀹夎璇佷功
-// LicenseContent install = licenseVerify.install(param);
+ LicenseContent install = licenseVerify.install(param);
logger.info("++++++++ 璁稿彲璇佸姞杞界粨鏉� ++++++++");
logger.info("++++++++ 璁稿彲璇佸姞杞芥爣璁帮紝鎼滅储淇敼 ++++++++");
licenseTimer.setSystemSupport(true);
- licenseTimer.setLicenseDays(9999);
- return true;
+// licenseTimer.setLicenseDays(9999);
+// return true;
-// licenseTimer.setSystemSupport(install!=null);
-//
-// if (install != null) {
-// Date start = new Date();
-// Date end = install.getNotAfter();
-// Long starTime = start.getTime();
-// Long endTime = end.getTime();
-// Long num = endTime - starTime;//鏃堕棿鎴崇浉宸殑姣鏁�
-// int day = (int) (num / 24 / 60 / 60 / 1000);
-// licenseTimer.setLicenseDays(day);
-// }
-//
-//
-// return install != null;
+ licenseTimer.setSystemSupport(install!=null);
+
+ if (install != null) {
+ Date start = new Date();
+ Date end = install.getNotAfter();
+ Long starTime = start.getTime();
+ Long endTime = end.getTime();
+ Long num = endTime - starTime;//鏃堕棿鎴崇浉宸殑姣鏁�
+ int day = (int) (num / 24 / 60 / 60 / 1000);
+ licenseTimer.setLicenseDays(day);
+ }
+
+
+ return install != null;
} catch (Exception e) {
return false;
}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 18599c6..29753c8 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -48,7 +48,7 @@
#License鐩稿叧閰嶇疆
license:
- subject: integrationasrs
+ subject: jxhtasrs
publicAlias: publicCert
storePass: public_zhongyang_123456789
licensePath: license.lic
diff --git a/src/main/resources/license.lic b/src/main/resources/license.lic
index 22364dc..1c35635 100644
--- a/src/main/resources/license.lic
+++ b/src/main/resources/license.lic
Binary files differ
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 0072278..7729c7c 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -51,6 +51,8 @@
<result column="box_type1" property="boxType1" />
<result column="box_type2" property="boxType2" />
<result column="box_type3" property="boxType3" />
+ <result column="area_id" property="areaId" />
+
</resultMap>
<sql id="batchSeq">
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 02a13e6..a06edb2 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -60,6 +60,7 @@
<result column="full_plt" property="fullPlt" />
<result column="pre_have" property="preHave" />
<result column="take_none" property="takeNone" />
+ <result column="task_type" property="taskType" />
</resultMap>
<select id="selectToBeCompleteData" resultMap="BaseResultMap">
diff --git a/src/main/webapp/static/js/locAroundBind/locAroundBind.js b/src/main/webapp/static/js/locAroundBind/locAroundBind.js
index 9361d1f..673bf17 100644
--- a/src/main/webapp/static/js/locAroundBind/locAroundBind.js
+++ b/src/main/webapp/static/js/locAroundBind/locAroundBind.js
@@ -30,6 +30,7 @@
, {field: 'blocNo', align: 'center', title: '宸ヤ綅'}
, {field: 'locType$', align: 'center', title: '宸ヤ綅鐘舵��'}
, {field: 'def$', align: 'center', title: '宸ヤ綅绫诲瀷'}
+ , {field: 'freeze', align: 'center', title: '鏄惁鍐荤粨'}
, {fixed: 'right', title: '鎿嶄綔', align: 'center', toolbar: '#operate', width: 240}
]],
request: {
diff --git a/src/main/webapp/views/basDevice/basDevice.html b/src/main/webapp/views/basDevice/basDevice.html
index a2b9041..472ff71 100644
--- a/src/main/webapp/views/basDevice/basDevice.html
+++ b/src/main/webapp/views/basDevice/basDevice.html
@@ -18,9 +18,15 @@
<div class="layui-form toolbar" id="search-box">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">缂栧彿:</label>
+ <label class="layui-form-label">鏈哄彴鍙�:</label>
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ <input class="layui-input" type="text" name="dev_no" placeholder="鏈哄彴鍙�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍐呴儴缂栧彿:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="type" placeholder="鍐呴儴缂栧彿" autocomplete="off">
</div>
</div>
<div class="layui-inline"> 
--
Gitblit v1.9.1