From 8257d89c461f6553d66fad1e5e3df3d172a00924 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期六, 29 十一月 2025 18:10:18 +0800
Subject: [PATCH] #
---
src/main/webapp/views/basArmMast/basArmMast.html | 24
src/main/java/com/zy/asrs/controller/ApiLogController.java | 17 +
src/main/java/com/zy/asrs/controller/OpenController.java | 27 +
src/main/java/com/zy/asrs/service/BasArmMastService.java | 2
src/main/java/com/zy/asrs/mapper/BasArmMastMapper.java | 2
src/main/webapp/static/js/apiLog/apiLogF.js | 265 ++++++++++++++++++
src/main/java/com/zy/asrs/controller/MobileController.java | 8
src/main/java/com/zy/asrs/entity/param/AgvGoParam.java | 14 +
src/main/java/com/zy/asrs/service/OpenService.java | 5
src/main/java/com/zy/asrs/service/impl/BasArmMastServiceImpl.java | 4
src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java | 2
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 146 ++++++++++
src/main/webapp/views/apiLog/apiLogF.html | 190 +++++++++++++
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 59 +++
src/main/java/com/zy/erp/kingdee/utils/PostMesDataUtils.java | 54 +++
src/main/java/com/zy/asrs/service/MobileService.java | 1
src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java | 12
17 files changed, 792 insertions(+), 40 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ApiLogController.java b/src/main/java/com/zy/asrs/controller/ApiLogController.java
index dbbb366..0b3fbc5 100644
--- a/src/main/java/com/zy/asrs/controller/ApiLogController.java
+++ b/src/main/java/com/zy/asrs/controller/ApiLogController.java
@@ -48,6 +48,23 @@
return R.ok(apiLogService.selectPage(new Page<>(curr, limit), wrapper));
}
+ @RequestMapping(value = "/apiLog/list/auth/v2")
+ @ManagerAuth
+ public R listFalse(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<ApiLog> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ wrapper.eq("result", 0);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ wrapper.orderBy("create_time", false);
+ }
+ return R.ok(apiLogService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index e10b4c3..1b7f8df 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -206,6 +206,14 @@
return R.ok("缁勬墭鎴愬姛");
}
+ @RequestMapping("/comb/agv/auth")
+ @ManagerAuth(memo = "缁勬墭")
+ public R combAgv(@RequestBody CombParam combParam){
+// mobileService.comb(combParam, getUserId());
+ mobileService.combAgv(combParam, getUserId());
+ return R.ok("缁勬墭鎴愬姛");
+ }
+
@RequestMapping("/combAuto/auth")
@ManagerAuth(memo = "缁勬墭")
public R combAuto(@RequestBody CombParam combParam){
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index bcba859..e5847dc 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -11,6 +11,7 @@
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
@@ -447,12 +448,9 @@
}
param.setTaskNo(Integer.parseInt(taskCode.substring(0, taskCode.indexOf("-"))));
-
-// if (Cools.isEmpty(param.getTimestamp())) {
-// return R.error("RGV浠诲姟鍙穂timestamp]涓嶈兘涓虹┖");
-// }
boolean taskAgvReport = openService.TaskAgvReport(param);
if (taskAgvReport){
+ agvBindAndBin(String.valueOf(param.getTaskNo()));
return R.ok();
}
return R.error("浠诲姟鍙蜂笉瀛樺湪");
@@ -541,9 +539,30 @@
}
}
if (bindCtnrAndBin) {
+ asyncProcessAfterValidation(param);
return new R(0,"鎴愬姛");
}
return R.error("搴撲綅涓嶅瓨鍦ㄦ垨鏃犳槑缁�");
}
+ @Async
+ public void agvBindAndBin(String taskNo) {
+ try {
+ Thread.sleep(500);
+ openService.agvBindAndBin(taskNo);
+ } catch (Exception e) {
+ log.error("寮傛澶勭悊AGV鍏夋爡鍚庣画閫昏緫澶辫触", e);
+ }
+ }
+
+ @Async
+ public void asyncProcessAfterValidation(AgvGoTheArnParam param) {
+ try {
+ Thread.sleep(500);
+ openService.agvApplicationPassedTheGrating(param);
+ } catch (Exception e) {
+ log.error("寮傛澶勭悊AGV鍏夋爡鍚庣画閫昏緫澶辫触", e);
+ }
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/entity/param/AgvGoParam.java b/src/main/java/com/zy/asrs/entity/param/AgvGoParam.java
new file mode 100644
index 0000000..ed66f2b
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/AgvGoParam.java
@@ -0,0 +1,14 @@
+package com.zy.asrs.entity.param;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class AgvGoParam {
+ String reqCode; //浠诲姟鍙�
+ String code; //
+ String message; // 浣嶇疆
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/BasArmMastMapper.java b/src/main/java/com/zy/asrs/mapper/BasArmMastMapper.java
index c84efe9..6ae81a2 100644
--- a/src/main/java/com/zy/asrs/mapper/BasArmMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasArmMastMapper.java
@@ -9,6 +9,6 @@
@Mapper
@Repository
public interface BasArmMastMapper extends BaseMapper<BasArmMast> {
- boolean updateArmMastStatus(@Param("armNo")int armNo, @Param("sortingLine")int sortingLine, @Param("status")int status, @Param("endStatus")int endStatus, @Param("staNoEnd")int staNoEnd);
+ boolean updateArmMastStatus(@Param("armNo")int armNo, @Param("sortingLine")int sortingLine, @Param("staNoEnd")int staNoEnd, @Param("status")int status, @Param("endStatus")int endStatus);
}
diff --git a/src/main/java/com/zy/asrs/service/BasArmMastService.java b/src/main/java/com/zy/asrs/service/BasArmMastService.java
index f604574..bb87a42 100644
--- a/src/main/java/com/zy/asrs/service/BasArmMastService.java
+++ b/src/main/java/com/zy/asrs/service/BasArmMastService.java
@@ -4,6 +4,6 @@
import com.baomidou.mybatisplus.service.IService;
public interface BasArmMastService extends IService<BasArmMast> {
- boolean updateArmMastStatus(int armNo,int sortingLine,int status,int endStatus,int staNoEnd);
+ boolean updateArmMastStatus(int armNo,int sortingLine,int staNoEnd,int status,int endStatus);
}
diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java
index aecea5c..f635948 100644
--- a/src/main/java/com/zy/asrs/service/MobileService.java
+++ b/src/main/java/com/zy/asrs/service/MobileService.java
@@ -46,6 +46,7 @@
*/
void comb(CombParam param, Long userId);
void combAuto(CombParam param, Long userId);
+ void combAgv(CombParam param, Long userId);
/**
* 榻愬鍏ュ簱鏌ヨ
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index e0a8758..55c7660 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -53,5 +53,8 @@
boolean taskAgvCreate(TaskAgvCreateParam param);
List<AgvLocListDetlParam> getAgvLocList(AgvLocListParam param);
boolean bindCtnrAndBin(bindCtnrAndBinParam param);
- boolean agvApplicationPassedTheGrating(ArmAgvGratingParam arm);
+ boolean agvApplicationPassedTheGrating(ArmAgvGratingParam param);
+ boolean agvApplicationPassedTheGrating(AgvGoTheArnParam param);
+ boolean agvBindAndBin(String taskNo);
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasArmMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasArmMastServiceImpl.java
index dfd6b2e..09b7d7b 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasArmMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasArmMastServiceImpl.java
@@ -9,7 +9,7 @@
@Service("basArmMastService")
public class BasArmMastServiceImpl extends ServiceImpl<BasArmMastMapper, BasArmMast> implements BasArmMastService {
@Override
- public boolean updateArmMastStatus(int armNo,int sortingLine,int status,int endStatus,int staNoEnd){
- return this.baseMapper.updateArmMastStatus(armNo,sortingLine,status,endStatus,staNoEnd);
+ public boolean updateArmMastStatus(int armNo,int sortingLine,int staNoEnd,int status,int endStatus){
+ return this.baseMapper.updateArmMastStatus(armNo,sortingLine,staNoEnd,status,endStatus);
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 49ca615..5194d86 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -679,7 +679,153 @@
// orderService.updateSettle(order.getId(), 2L, userId);
OrderInAndOutUtil.updateOrder(Boolean.TRUE,order.getId(), 2L, userId);
}
+ }
+ @Override
+ @Transactional
+ public void combAgv(CombParam param, Long userId) {
+ if (Cools.isEmpty(param.getBarcode(), param.getCombMats(),param.getLocNo())) {
+ throw new CoolException(BaseRes.PARAM);
+ }
+// if(param.getCombMats().size()>1){
+// throw new CoolException("璇锋彁鍙栦竴涓晢鍝侊紝鎴栬�呭埛鏂伴噸鏂扮粍鎵橈紒");
+// }
+ // 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
+ if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
+ eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
+ throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
+ }
+
+ if(param.getBarcode().length()!=6){
+ throw new CoolException("鏉＄爜闀垮害涓嶆槸6浣�===>>" + param.getBarcode());
+ }
+// if (param.getCombMats().size()>1){
+// throw new CoolException("涓嶅厑璁告贩鏂�===>>" + param.getBarcode());
+// }
+
+ int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
+ int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
+ int countwait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getBarcode()));
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",param.getLocNo()));
+ if (countLoc > 0 || countWrk > 0 || countwait > 0) {
+ throw new CoolException("缁勬墭妗�/宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�===>>" + param.getBarcode());
+ }
+ if(locMast == null){
+ throw new CoolException("涓嶅瓨鍦ㄨ搴撲綅" + param.getLocNo());
+ }
+
+ Date now = new Date();
+
+ // 鏃犲崟缁勬墭
+ if (Cools.isEmpty(param.getOrderNo())) {
+
+ // 鐢熸垚鍏ュ簱閫氱煡妗�
+ List<DetlDto> detlDtos = new ArrayList<>();
+ param.getCombMats().forEach(elem -> {
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(),elem.getBrand(),elem.getStandby1(),elem.getStandby2(),elem.getStandby3(),
+ elem.getBoxType1(),elem.getBoxType2(),elem.getBoxType3(), elem.getAnfme());
+ if (DetlDto.has(detlDtos, detlDto)) {
+ DetlDto one = DetlDto.findDto(detlDtos, detlDto);
+ assert one != null;
+ one.setAnfme(one.getAnfme() + detlDto.getAnfme());
+ } else {
+ detlDtos.add(detlDto);
+ }
+ });
+
+
+ for (DetlDto detlDto : detlDtos) {
+ Mat mat = matService.selectByMatnr(detlDto.getMatnr());
+ if (Cools.isEmpty(mat)) {
+ throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
+ }
+ WaitPakin waitPakin = new WaitPakin();
+ waitPakin.sync(mat);
+ waitPakin.setBatch(detlDto.getBatch());
+ waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
+ waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
+ waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
+ waitPakin.setStatus("Y"); // 鐘舵��
+ waitPakin.setAppeUser(userId);
+ waitPakin.setAppeTime(now);
+ waitPakin.setModiUser(userId);
+ waitPakin.setModiTime(now);
+ waitPakin.setStandby1(detlDto.getStandby1());
+ waitPakin.setStandby2(detlDto.getStandby2());
+ waitPakin.setStandby3(detlDto.getStandby3());
+ waitPakin.setBoxType1(detlDto.getBoxType1());
+ waitPakin.setBoxType2(detlDto.getBoxType2());
+ waitPakin.setBoxType3(detlDto.getBoxType3());
+ if (!waitPakinService.insert(waitPakin)) {
+ throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
+ }
+ }
+ // 鍏宠仈缁勬墭
+ } else {
+// Order order = orderService.selectByNo(param.getOrderNo());
+ Order order = OrderInAndOutUtil.selectByNo(Boolean.TRUE, param.getOrderNo());
+ if (Cools.isEmpty(order) || order.getSettle() > 2) {
+ throw new CoolException("鍗曟嵁缂栧彿宸茶繃鏈�");
+ }
+ // 鐢熸垚鍏ュ簱閫氱煡妗�
+ List<DetlDto> detlDtos = new ArrayList<>();
+ param.getCombMats().forEach(elem -> {
+
+ // 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
+// OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch());
+ OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.TRUE, order.getId(), elem.getMatnr(), elem.getBatch(),elem.getBrand(),elem.getStandby1(),elem.getStandby2(),elem.getStandby3(),
+ elem.getBoxType1(),elem.getBoxType2(),elem.getBoxType3());
+ if (elem.getAnfme() > orderDetl.getEnableQty()) {
+ throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
+ }
+ // 淇敼璁㈠崟浣滀笟鏁伴噺
+// if (!orderDetlService.increaseWorkQty(order.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme())) {
+// throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
+// }
+ OrderInAndOutUtil.increaseWorkQty(Boolean.TRUE,order.getId(), elem.getMatnr(), elem.getBatch(),elem.getBrand(),elem.getStandby1(),elem.getStandby2(),elem.getStandby3(),
+ elem.getBoxType1(),elem.getBoxType2(),elem.getBoxType3(), elem.getAnfme());
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(),elem.getBrand(),elem.getStandby1(),elem.getStandby2(),elem.getStandby3(),
+ elem.getBoxType1(),elem.getBoxType2(),elem.getBoxType3(), elem.getAnfme());
+ if (DetlDto.has(detlDtos, detlDto)) {
+ DetlDto one = DetlDto.findDto(detlDtos, detlDto);
+ assert one != null;
+ one.setAnfme(one.getAnfme() + detlDto.getAnfme());
+ } else {
+ detlDtos.add(detlDto);
+ }
+ });
+ for (DetlDto detlDto : detlDtos) {
+ Mat mat = matService.selectByMatnr(detlDto.getMatnr());
+ if (Cools.isEmpty(mat)) {
+ throw new CoolException(detlDto.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
+ }
+ WaitPakin waitPakin = new WaitPakin();
+ waitPakin.sync(mat);
+ waitPakin.setOrderNo(order.getOrderNo()); // 鍗曟嵁缂栧彿
+ waitPakin.setBatch(detlDto.getBatch()); // 搴忓垪鐮�
+ waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
+ waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
+ waitPakin.setAnfme(detlDto.getAnfme()); // 鏁伴噺
+ waitPakin.setStatus("Y"); // 鐘舵��
+ waitPakin.setAppeUser(userId);
+ waitPakin.setAppeTime(now);
+ waitPakin.setModiUser(userId);
+ waitPakin.setModiTime(now);
+ waitPakin.setStandby1(detlDto.getStandby1());
+ waitPakin.setStandby2(detlDto.getStandby2());
+ waitPakin.setStandby3(detlDto.getStandby3());
+ waitPakin.setBoxType1(detlDto.getBoxType1());
+ waitPakin.setBoxType2(detlDto.getBoxType2());
+ waitPakin.setBoxType3(detlDto.getBoxType3());
+ if (!waitPakinService.insert(waitPakin)) {
+ throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
+ }
+ locMast.setLocSts("R");
+ locMastService.updateById(locMast);
+ }
+// orderService.updateSettle(order.getId(), 2L, userId);
+ OrderInAndOutUtil.updateOrder(Boolean.TRUE,order.getId(), 2L, userId);
+ }
}
@Override
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 7b710b1..d402788 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -706,7 +706,8 @@
.eq("status", 1)
);
if (Cools.isEmpty(basArmMast)){
- throw new CoolException("鏈煡璇㈠埌鐩稿叧鏈烘鑷傛媶鐮佸灈浠诲姟锛侊紒锛�"+ JSON.toJSONString(param));
+ return;
+// throw new CoolException("鏈煡璇㈠埌鐩稿叧鏈烘鑷傛媶鐮佸灈浠诲姟锛侊紒锛�"+ JSON.toJSONString(param));
}
if (Integer.parseInt(param.getPick_num()) !=1){
basArmMast.setStatus(9);
@@ -871,23 +872,18 @@
agvBindCtnrAndBinParam.setReqCode(String.valueOf(System.currentTimeMillis()));
agvBindCtnrAndBinParam.setCtnrCode(param.getBarcode());
agvBindCtnrAndBinParam.setCtnrTyp("1");
- agvBindCtnrAndBinParam.setPositionCode(
- basAgvLocNoSou != null && basAgvLocNoSou.getAgvLocNo() != null
- ? basAgvLocNoSou.getAgvLocNo()
- : ""
- );
- agvBindCtnrAndBinParam.setStgBinCode(
- basAgvLocNoEnd != null && basAgvLocNoEnd.getAgvLocNo() != null
- ? basAgvLocNoEnd.getAgvLocNo()
- : ""
- );
+ 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;
-
try {
log.info("AGV缁戝畾瀹瑰櫒鎺ュ彛璇锋眰鍙傛暟: {}", JSON.toJSONString(agvBindCtnrAndBinParam));
@@ -928,6 +924,45 @@
return false;
}
+ @Override
+ @Transactional
+ public boolean agvApplicationPassedTheGrating(AgvGoTheArnParam param) {
+ String URL = "http://10.10.10.200:8181/rcms/services/rest/hikRpcService"; // AGV鎺ュ彛鍦板潃
+ String AGVPath = "continueTask"; // 鎺ュ彛璺緞
+ AgvGoParam agvGoParam = new AgvGoParam();
+ agvGoParam.setCode("0");
+ agvGoParam.setMessage("缁х画鎵ц");
+ agvGoParam.setReqCode(param.getReqCode());
+ ReturnT<String> result = new PostMesDataUtils().postMesDataArmGrating("鍏夋爡涓嬪彂鍚庣户缁换鍔★細", URL, AGVPath, param);
+ if (result.getCode()==200){
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ @Transactional
+ public boolean agvBindAndBin(String taskNo) {
+ 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;
+ }
+ return false;
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
index 6804b02..8626282 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
@@ -134,7 +134,7 @@
for(Integer staNo: STA_WORK_Exception){
BasDevp basDevp = basDevpService.selectById(staNo);
basDevp.setDevNo(siteOutMap.get(basDevp.getDevNo()));
- if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
+ if (basDevp.getWrkNo() > 10000 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
ReturnT<String> result = wrkMastStaInItHandler.start(null,basDevp,23);//寮傚父閫�鍑�
if (result.getCode()==200) {
continue;
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
index 063b19d..38666c1 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
@@ -203,9 +203,9 @@
Double length = jsonObjectNew.get("length") != null ? new BigDecimal(jsonObjectNew.get("eap7_decimalfield7").toString()).doubleValue() : 0.0;
Double netweight = jsonObjectNew.get("netweight") != null ? new BigDecimal(jsonObjectNew.get("eap7_decimalfield").toString()).doubleValue() : 0.0;
// 鐢熸垚鍟嗗搧妗ｆ
- height = height*10;
- width = width*10;
- length = length*10;
+ Double height1 = height*10;
+ Double width1 = width*10;
+ Double length1 = length*10;
Mat mat = matService.selectByMatnr(matnr);
if (mat == null) {
mat = new Mat();
@@ -214,9 +214,9 @@
mat.setTagId(tag.getId());
mat.setWeight(grossweight);//鍑�閲�
mat.setUnits(netweight);//姣涢噸
- mat.setManLength(length);
- mat.setHeight(height);
- mat.setWidth(width);
+ mat.setManLength(length1);
+ mat.setHeight(height1);
+ mat.setWidth(width1);
mat.setCreateTime(sdf1.parse(createTime));
mat.setUpdateTime(modifyTime);
mat.setStatus(1);
diff --git a/src/main/java/com/zy/erp/kingdee/utils/PostMesDataUtils.java b/src/main/java/com/zy/erp/kingdee/utils/PostMesDataUtils.java
index 0881611..dbe63b2 100644
--- a/src/main/java/com/zy/erp/kingdee/utils/PostMesDataUtils.java
+++ b/src/main/java/com/zy/erp/kingdee/utils/PostMesDataUtils.java
@@ -175,6 +175,60 @@
}
return SUCCESS;
}
+ public ReturnT<String> postMesDataAgvGrating(String name, String URL, String mesPath, Object combParam){
+// if (true){
+// System.out.println("name:"+name+",URL:"+URL+",mesPath:"+mesPath+",combParam:"+combParam);
+// return SUCCESS;
+// }
+ if(combParam != null){
+ String response = "";
+ boolean success = false;
+ try {
+// Map<String, Object> map = new HashMap<>()
+// map.put("appkey","ea1f0459efc02a79f046f982767939ae");
+ response = new HttpHandler.Builder()
+// .setHeaders(map)
+ .setUri(URL)
+ .setPath(mesPath)
+ .setJson(JSON.toJSONString(combParam))
+ .build()
+ .doPost();
+ System.out.println("response:"+response);
+ JSONObject jsonObject = JSON.parseObject(response);
+
+ if (jsonObject.getInteger("code").equals(200)) {
+ success = true;
+ } else {
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+"/"+mesPath, JSON.toJSONString(combParam), response);
+ throw new CoolException(name);
+ }
+ } catch (Exception e) {
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", URL+"/"+mesPath, JSON.toJSONString(combParam), response);
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg(e.getMessage());
+ } finally {
+ try {
+ if (success){
+ // 淇濆瓨鎺ュ彛鏃ュ織
+ ApiLogService apiLogService = SpringUtils.getBean(ApiLogService.class);
+ apiLogService.save(
+ name,
+ URL +"/"+ mesPath,
+ null,
+ "127.0.0.1",
+ JSON.toJSONString(combParam),
+ response,
+ success
+ );
+ } else {
+ postMesDataCallApiLogSave(response,success,name, URL, mesPath, combParam);
+ }
+ } catch (Exception e) {
+ log.error("", e); }
+ }
+ }
+ return SUCCESS;
+ }
public void postMesDataCallApiLogSave(String response,boolean success,String name, String URL, String mesPath, Object combParam) {
ApiLogService apiLogService = SpringUtils.getBean(ApiLogService.class);
diff --git a/src/main/webapp/static/js/apiLog/apiLogF.js b/src/main/webapp/static/js/apiLog/apiLogF.js
new file mode 100644
index 0000000..269e088
--- /dev/null
+++ b/src/main/webapp/static/js/apiLog/apiLogF.js
@@ -0,0 +1,265 @@
+var pageCurr;
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+ var admin = layui.admin;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#apiLog',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/apiLog/list/auth/v2',
+ page: true,
+ limit: 15,
+ limits: [15, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ height: 'full-120',
+ cols: [[
+ // {type: 'checkbox'}
+ // ,{field: 'id', align: 'center',title: 'ID'}
+ // ,{field: 'uuid', align: 'center',title: '鏃ュ織缂栧彿'}
+ // ,
+ {field: 'namespace', align: 'center',title: '鍚嶇О绌洪棿',hide: false}
+ ,{field: 'url', align: 'center',title: '鎺ュ彛鍦板潃',hide: false}
+ ,{field: 'appkey', align: 'center',title: '骞冲彴瀵嗛挜',hide: true}
+ ,{field: 'timestamp', align: 'center',title: '鏃堕棿鎴�',hide: true}
+ ,{field: 'clientIp', align: 'center',title: '瀹㈡埛绔疘P',hide: false}
+ ,{field: 'request', align: 'center',title: '璇锋眰鍐呭',hide: false}
+ ,{field: 'response', align: 'center',title: '鎿嶄綔鍐呭',hide: false}
+ // ,{field: 'err', align: 'center',title: '寮傚父鍐呭',hide: true}
+ ,{field: 'result$', align: 'center',title: '缁撴灉', templet: '#resTpl', width: 80,hide: false}
+ // ,{field: 'status$', align: 'center',title: '鐘舵��'}
+ ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿',hide: false}
+ // ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'memo', align: 'center',title: '澶囨敞', hide: true}
+
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 80, hide: true}
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function(res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ }
+ });
+
+ // 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(apiLog)', function (obj) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ searchData['orderByField'] = obj.field;
+ searchData['orderByType'] = obj.type;
+ tableIns.reload({
+ where: searchData,
+ page: {curr: 1}
+ });
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(apiLog)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id).data;
+ switch(obj.event) {
+ case 'addData':
+ showEditModel();
+ break;
+ case 'deleteData':
+ if (checkStatus.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ return;
+ }
+ del(checkStatus.map(function (d) {
+ return d.id;
+ }));
+ break;
+ case 'exportData':
+ admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+ var titles=[];
+ var fields=[];
+ obj.config.cols[0].map(function (col) {
+ if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+ titles.push(col.title);
+ fields.push(col.field);
+ }
+ });
+ var exportData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ exportData[this.name] = this.value;
+ });
+ var param = {
+ 'apiLog': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/apiLog/export/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(param),
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll();
+ if (res.code === 200) {
+ table.exportFile(titles,res.data,'xls');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ });
+ });
+ break;
+ }
+ });
+
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
+ table.on('tool(apiLog)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ case 'edit':
+ showEditModel(data);
+ break;
+ case "del":
+ del([data.id]);
+ break;
+ }
+ });
+
+ /* 寮圭獥 - 鏂板銆佷慨鏀� */
+ function showEditModel(mData) {
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+ content: $('#editDialog').html(),
+ success: function (layero, dIndex) {
+ layDateRender(mData);
+ form.val('detail', mData);
+ form.on('submit(editSubmit)', function (data) {
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/apiLog/"+(mData?'update':'add')+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: data.field,
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.close(dIndex);
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ return false;
+ });
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ layui.form.render('select');
+ }
+ });
+ }
+
+ /* 鍒犻櫎 */
+ function del(ids) {
+ layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/apiLog/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {ids: ids},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
+ // 鎼滅储
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 閲嶇疆
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ function layDateRender(data) {
+ setTimeout(function () {
+ layDate.render({
+ elem: '#createTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['createTime\\$']:null
+ });
+ layDate.render({
+ elem: '#updateTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['updateTime\\$']:null
+ });
+
+ }, 300);
+ }
+ layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+ parent.layer.closeAll();
+});
+
+function tableReload(child) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ tableIns.reload({
+ where: searchData,
+ page: {curr: pageCurr}
+ });
+}
diff --git a/src/main/webapp/views/apiLog/apiLogF.html b/src/main/webapp/views/apiLog/apiLogF.html
new file mode 100644
index 0000000..b517fda
--- /dev/null
+++ b/src/main/webapp/views/apiLog/apiLogF.html
@@ -0,0 +1,190 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+</head>
+<body>
+
+<div class="layui-fluid">
+ <div class="layui-card">
+ <div class="layui-card-body">
+ <div class="layui-form toolbar" id="search-box">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鍚嶇О绌洪棿:</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="namespace" 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="url" 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="request" placeholder="璇疯緭鍏ワ紙璁㈠崟鍙锋垨鍝佸彿锛�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline"> 
+ <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+ <i class="layui-icon"></i>鎼滅储
+ </button>
+ <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+ <i class="layui-icon"></i>閲嶇疆
+ </button>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="apiLog" lay-filter="apiLog"></table>
+ </div>
+ </div>
+</div>
+
+<script type="text/html" id="toolbar">
+ <div class="layui-btn-container">
+<!-- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>-->
+<!-- <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>-->
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
+ </div>
+</script>
+
+<script type="text/html" id="operate">
+<!-- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>-->
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+</script>
+
+<script type="text/html" id="resTpl">
+ <span name="settle"
+ {{# if( d.result === 1){ }}
+ class="layui-badge layui-badge-green" >{{d.result$}}</span>
+ {{# }else { }}
+ class="layui-badge layui-badge-red" >{{d.result$}}</span>
+ {{# } }}
+</script>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/apiLog/apiLogF.js" charset="utf-8"></script>
+</body>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+ <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
+ <input name="id" type="hidden">
+ <div class="layui-row">
+ <div class="layui-col-md12">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鏃ュ織缂栧彿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="uuid" placeholder="璇疯緭鍏ユ棩蹇楃紪鍙�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍚嶇О绌洪棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="namespace" placeholder="璇疯緭鍏ュ悕绉扮┖闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鎺ュ彛鍦板潃: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="url" placeholder="璇疯緭鍏ユ帴鍙ｅ湴鍧�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">骞冲彴瀵嗛挜: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="appkey" placeholder="璇疯緭鍏ュ钩鍙板瘑閽�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鏃堕棿鎴�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="timestamp" placeholder="璇疯緭鍏ユ椂闂存埑">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">瀹㈡埛绔疘P: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="clientIp" placeholder="璇疯緭鍏ュ鎴风IP">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">璇锋眰鍐呭: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="request" placeholder="璇疯緭鍏ヨ姹傚唴瀹�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍝嶅簲鍐呭: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="response" placeholder="璇疯緭鍏ュ搷搴斿唴瀹�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">寮傚父鍐呭: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="err" placeholder="璇疯緭鍏ュ紓甯稿唴瀹�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">缁撴灉: </label>
+ <div class="layui-input-block">
+ <select name="result">
+ <option value="">璇烽�夋嫨缁撴灉</option>
+ <option value="1">鎴愬姛</option>
+ <option value="0">澶辫触</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐘舵��: </label>
+ <div class="layui-input-block">
+ <select name="status">
+ <option value="">璇烽�夋嫨鐘舵��</option>
+ <option value="1">姝ｅ父</option>
+ <option value="0">绂佺敤</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">娣诲姞鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="createTime" id="createTime$" placeholder="璇疯緭鍏ユ坊鍔犳椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">淇敼鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="updateTime" id="updateTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">澶囨敞: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="memo" placeholder="璇疯緭鍏ュ娉�">
+ </div>
+ </div>
+
+ </div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </form>
+</script>
+</html>
+
diff --git a/src/main/webapp/views/basArmMast/basArmMast.html b/src/main/webapp/views/basArmMast/basArmMast.html
index 96c5426..cbf4533 100644
--- a/src/main/webapp/views/basArmMast/basArmMast.html
+++ b/src/main/webapp/views/basArmMast/basArmMast.html
@@ -156,12 +156,12 @@
<!-- <input class="layui-input" name="sortingLine" placeholder="璇疯緭鍏ヨ捣鐐�" lay-vertype="tips" lay-verify="required">-->
<!-- </div>-->
<!-- </div>-->
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鍒嗘嫞缁戝畾鏍囪: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="bindingTags" placeholder="璇疯緭鍏ュ垎鎷ｇ粦瀹氭爣璁�" lay-vertype="tips" lay-verify="required">
- </div>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label layui-form-required">鍒嗘嫞缁戝畾鏍囪: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="bindingTags" placeholder="璇疯緭鍏ュ垎鎷ｇ粦瀹氭爣璁�" lay-vertype="tips" lay-verify="required">-->
+<!-- </div>-->
+<!-- </div>-->
<!-- <div class="layui-form-item">-->
<!-- <label class="layui-form-label layui-form-required">浼樺厛绾�: </label>-->
<!-- <div class="layui-input-block">-->
@@ -214,12 +214,12 @@
<!-- <input class="layui-input" name="upc" placeholder="璇疯緭鍏�" lay-vertype="tips" lay-verify="required">-->
<!-- </div>-->
<!-- </div>-->
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">璐ф簮: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="supplier" placeholder="璇疯緭鍏ヨ揣婧�" lay-vertype="tips" lay-verify="required">
- </div>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label layui-form-required">璐ф簮: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="supplier" placeholder="璇疯緭鍏ヨ揣婧�" lay-vertype="tips" lay-verify="required">-->
+<!-- </div>-->
+<!-- </div>-->
<!-- <div class="layui-form-item">-->
<!-- <label class="layui-form-label layui-form-required">: </label>-->
<!-- <div class="layui-input-block">-->
--
Gitblit v1.9.1