From cda03cb23bc12f582029ac8d6df103d86e61fc8b Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 02 十月 2023 13:48:57 +0800
Subject: [PATCH] AGV调试更改 工作档自增
---
src/main/webapp/static/js/agvLocDetl/locDetl.js | 2
src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 7 +
src/main/java/com/zy/asrs/service/AgvWrkMastLogService.java | 3
src/main/java/com/zy/asrs/service/AgvWrkMastService.java | 2
src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java | 6 +
src/main/java/com/zy/asrs/controller/AgvBasDevpController.java | 2
src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java | 11 ++
src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java | 2
src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java | 21 +++--
src/main/webapp/static/js/agvWrkMastLog/wrkMastLog.js | 39 ---------
src/main/java/com/zy/asrs/utils/Utils.java | 2
src/main/java/com/zy/asrs/service/impl/AgvWrkMastLogServiceImpl.java | 5
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 24 +++--
src/main/webapp/static/js/common.js | 2
src/main/webapp/static/js/agvWaitPakin/waitPakin.js | 4 +
src/main/webapp/static/js/agvWrkDetlLog/wrkDetlLog.js | 4 +
src/main/java/com/zy/asrs/mapper/StaDescMapper.java | 4 +
src/main/java/com/zy/asrs/mapper/AgvWrkMastMapper.java | 15 +++
src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java | 2
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 3
src/main/java/com/zy/asrs/controller/AgvOpenController.java | 22 ++++-
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 2
src/main/webapp/static/js/agvWrkMast/wrkMast.js | 2
src/main/java/com/zy/asrs/mapper/AgvWrkMastLogMapper.java | 15 +++
src/main/webapp/static/js/agvWrkDetl/wrkDetl.js | 4 +
src/main/java/com/zy/asrs/utils/AppAuthUtil.java | 8 -
src/main/java/com/zy/asrs/mapper/AgvWaitPakinLogMapper.java | 2
src/main/webapp/static/js/agvWaitPakinLog/waitPakinLog.js | 4 +
src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java | 11 +-
src/main/resources/application.yml | 10 +
30 files changed, 150 insertions(+), 90 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
index 36413b6..82ae4e1 100644
--- a/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvBasDevpController.java
@@ -170,7 +170,7 @@
if("F".equals(agvBasDevp.getLocSts()) || "R".equals(agvBasDevp.getLocSts())){
//鍏堝幓鍏ュ簱閫氱煡妗ｆ壘鏄庣粏
Page<AgvWaitPakin> agvWaitPakinPage = agvWaitPakinService.selectPage(new Page<>(curr, limit), new EntityWrapper<AgvWaitPakin>()
- .eq("zpallet", agvBasDevp.getBarcode()));
+ .eq("supp_code", agvBasDevp.getBarcode()));
if(agvWaitPakinPage.getRecords().size()>0){
return R.ok(agvWaitPakinPage);
}else {
diff --git a/src/main/java/com/zy/asrs/controller/AgvOpenController.java b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
index 8b2d906..4aa441f 100644
--- a/src/main/java/com/zy/asrs/controller/AgvOpenController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
@@ -1,5 +1,7 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
import com.core.common.Cools;
@@ -55,17 +57,29 @@
@AppAuth(memo = "ESS浠诲姟鍥炶皟")
public R taskEventStaus(@RequestBody AgvTaskCallBackParam param, HttpServletRequest request){
+ apiLogService.save(
+ "ESS浠诲姟鍥炶皟",
+ "/tzskwms/agv/task/event/status",
+ null,
+ null,
+ JSON.toJSONString(JSONObject.toJSONString(param)),
+ null,
+ true
+ );
+
+
//save api log (appkey 鍚庣画娣诲姞)
- AppAuthUtil.auth("test-appkey",param, request);
+
+ AppAuthUtil.auth("",param, request);
AgvWrkMast agvWrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("wrk_no", param.getTaskCode()));
if(Cools.isEmpty(agvWrkMast)){
return R.error("浠诲姟缂栧彿閿欒");
}
- if(!checkParam(param,agvWrkMast)){
- return R.error("浠诲姟鍙傛暟涓庡伐浣滄。鍙傛暟涓嶇鍚�");
- }
+// if(!checkParam(param,agvWrkMast)){
+// return R.error("浠诲姟鍙傛暟涓庡伐浣滄。鍙傛暟涓嶇鍚�");
+// }
AgvTask agvTask = AgvTask.valueOf(param.getEventType());
Class<AgvTask> clz = AgvTask.class;
diff --git a/src/main/java/com/zy/asrs/mapper/AgvWaitPakinLogMapper.java b/src/main/java/com/zy/asrs/mapper/AgvWaitPakinLogMapper.java
index 4175ed8..e272f93 100644
--- a/src/main/java/com/zy/asrs/mapper/AgvWaitPakinLogMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/AgvWaitPakinLogMapper.java
@@ -10,7 +10,7 @@
@Repository
public interface AgvWaitPakinLogMapper extends BaseMapper<AgvWaitPakinLog> {
- @Insert("insert into agv_cust_wait_pakin_log select * from agv_cust_wait_pakin where zpallet=#{zpallet}")
+ @Insert("insert into agv_cust_wait_pakin_log select * from agv_cust_wait_pakin where supp_code=#{zpallet}")
int save(String zpallet);
}
diff --git a/src/main/java/com/zy/asrs/mapper/AgvWrkMastLogMapper.java b/src/main/java/com/zy/asrs/mapper/AgvWrkMastLogMapper.java
index d1cc7e5..81ccf20 100644
--- a/src/main/java/com/zy/asrs/mapper/AgvWrkMastLogMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/AgvWrkMastLogMapper.java
@@ -1,6 +1,7 @@
package com.zy.asrs.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.AgvWrkMast;
import com.zy.asrs.entity.AgvWrkMastLog;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
@@ -13,4 +14,18 @@
@Insert("insert into agv_wrk_mast_log select * from agv_wrk_mast where wrk_no=#{workNo}")
int save(Integer workNo);
+ @Insert("INSERT INTO agv_wrk_mast_log(wrk_no,wrk_sts," +
+ "io_type," +
+ "io_time," +
+ "io_pri," +
+ "source_loc_no," +
+ "loc_no," +
+ "barcode," +
+ "appe_user," +
+ "appe_time," +
+ "modi_user," +
+ "modi_time) " +
+ "VALUES(#{wrkNo},#{wrkSts},#{ioType},#{ioTime},#{ioPri},#{sourceLocNo},#{locNo},#{barcode},#{appeUser},#{appeTime},#{modiUser},#{modiTime})")
+ int saveByWrkMast(AgvWrkMast agvWrkMast);
+
}
diff --git a/src/main/java/com/zy/asrs/mapper/AgvWrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/AgvWrkMastMapper.java
index 46ca27e..b531382 100644
--- a/src/main/java/com/zy/asrs/mapper/AgvWrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/AgvWrkMastMapper.java
@@ -2,9 +2,24 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.AgvWrkMast;
+import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface AgvWrkMastMapper extends BaseMapper<AgvWrkMast> {
+ @Insert("INSERT INTO agv_wrk_mast(wrk_sts," +
+ "io_type," +
+ "io_time," +
+ "io_pri," +
+ "source_loc_no," +
+ "loc_no," +
+ "barcode," +
+ "appe_user," +
+ "appe_time," +
+ "modi_user," +
+ "modi_time) " +
+ "VALUES(#{wrkSts},#{ioType},#{ioTime},#{ioPri},#{sourceLocNo},#{locNo},#{barcode},#{appeUser},#{appeTime},#{modiUser},#{modiTime})")
+ public int insertByIncrease(AgvWrkMast agvWrkMast);
+
}
diff --git a/src/main/java/com/zy/asrs/mapper/StaDescMapper.java b/src/main/java/com/zy/asrs/mapper/StaDescMapper.java
index 4eb6237..2ef51ad 100644
--- a/src/main/java/com/zy/asrs/mapper/StaDescMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/StaDescMapper.java
@@ -4,6 +4,7 @@
import com.zy.asrs.entity.StaDesc;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -18,4 +19,7 @@
StaDesc queryCrnStn(Integer crnNo);
+ @Select("SELECT dev_no FROM [dbo].[asr_bas_devp] WHERE out_enable = 'Y' AND loading = 'N' AND autoing = 'Y'")
+ List<Integer> queryOutStation();
+
}
diff --git a/src/main/java/com/zy/asrs/service/AgvWrkMastLogService.java b/src/main/java/com/zy/asrs/service/AgvWrkMastLogService.java
index f55763c..864a789 100644
--- a/src/main/java/com/zy/asrs/service/AgvWrkMastLogService.java
+++ b/src/main/java/com/zy/asrs/service/AgvWrkMastLogService.java
@@ -1,10 +1,11 @@
package com.zy.asrs.service;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.AgvWrkMast;
import com.zy.asrs.entity.AgvWrkMastLog;
public interface AgvWrkMastLogService extends IService<AgvWrkMastLog> {
- boolean save(Integer workNo);
+ boolean save(AgvWrkMast workNo);
}
diff --git a/src/main/java/com/zy/asrs/service/AgvWrkMastService.java b/src/main/java/com/zy/asrs/service/AgvWrkMastService.java
index d82d2b9..e0d2298 100644
--- a/src/main/java/com/zy/asrs/service/AgvWrkMastService.java
+++ b/src/main/java/com/zy/asrs/service/AgvWrkMastService.java
@@ -15,4 +15,6 @@
public int containerMove(List<AgvWrkMast> agvWrkMastList) throws IOException;
public int containerMoveOut(List<AgvWrkMast> agvWrkMastList) throws IOException;
+
+ public boolean insertByIncrease(AgvWrkMast agvWrkMast);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
index f9759e6..aafa7b2 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
@@ -122,7 +122,7 @@
if("F".equals(agvBasDevpDto.getLocSts()) || "R".equals(agvBasDevpDto.getLocSts())){
AgvWaitPakin agvWaitPakin = agvWaitPakinService.selectOne(new EntityWrapper<AgvWaitPakin>()
- .eq("zpallet", agvBasDevpDto.getBarcode()));
+ .eq("supp_code", agvBasDevpDto.getBarcode()));
agvBasDevpDto.setAgvWaitPakin(agvWaitPakin);
@@ -134,7 +134,9 @@
}
}
- setFlagForAgvBasDevpDto(agvWrkMast,agvBasDevpDto);
+ if(!Cools.isEmpty(agvWrkMast)){
+ setFlagForAgvBasDevpDto(agvWrkMast,agvBasDevpDto);
+ }
return agvBasDevpDto;
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
index bf76e41..7353979 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -34,7 +34,7 @@
public void addLocDetlInfo(String locNo, int taskCode) {
List<AgvWrkDetl> agvWrkDetls = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", taskCode));
- List<AgvLocDetl> agvLocDetlList = agvWrkDetls.stream().map(agvWrkDetl -> {
+ agvWrkDetls.stream().map(agvWrkDetl -> {
AgvLocDetl agvLocDetl = new AgvLocDetl();
BeanUtils.copyProperties(agvWrkDetl, agvLocDetl);
agvLocDetl.setLocNo(locNo);
@@ -69,7 +69,7 @@
LocDto locDto = new LocDto(agvLocDetl.getLocNo(), agvLocDetl.getMatnr(), agvLocDetl.getMaktx(), agvLocDetl.getBatch(), orderNo, anfme);
locDto.setCsocode(csocode);
locDto.setIsoseq(isoseq);
- locDto.setContainerCode(agvLocDetl.getZpallet());
+ locDto.setContainerCode(agvLocDetl.getSuppCode());
//褰撳墠搴撲綅鎵�澶勬ゼ灞�
int floor = Integer.parseInt(agvLocDetl.getLocNo().split("@")[1]);
locDto.setAgvStaNos(queryAgvStaNosByFloor(floor));
@@ -157,7 +157,8 @@
private void wapperSetCondition(Wrapper wrapper,String column, String condition){
if(Cools.isEmpty(condition)){
- wrapper.isNull(column);
+ wrapper.andNew().eq(column,"").or().isNull(column);
+ //wrapper.isNull(column);
}else {
wrapper.eq(column,condition);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
index 66a8f06..3efb55f 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
@@ -51,7 +51,7 @@
//妫�鏌ユ槸鍚﹀凡瀛樺湪鐩稿悓鐨勬墭鐩樻潯鐮侊紝瀛樺湪鍒欐姏鍑哄紓甯�
if (agvWaitPakinService.selectCount(new EntityWrapper<AgvWaitPakin>().
- eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
+ eq("supp_code", param.getBarcode()).eq("io_status", "N")) > 0) {
throw new CoolException(param.getBarcode() + "鏁版嵁姝ｅ湪杩涜鍏ュ簱");
}
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
index e7b35ac..b8e83d9 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -13,7 +13,6 @@
import com.zy.common.model.OrderDto;
import com.zy.common.model.StartupDto;
import com.zy.common.model.TaskDto;
-import com.zy.common.model.enums.WorkNoType;
import com.zy.common.service.AgvCommonService;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -79,7 +78,7 @@
throw new CoolException("閫変腑鐨勭珯鐐逛腑鍚湁璐т綅鐘舵�佷笉涓篎.鍦ㄥ簱鐨勭珯鐐癸紝璇烽噸鏂伴�夋嫨");
}
- List<AgvWaitPakin> agvWaitPakinList = agvWaitPakinService.selectList(new EntityWrapper<AgvWaitPakin>().eq("zpallet", agvBasDevp.getBarcode()));
+ List<AgvWaitPakin> agvWaitPakinList = agvWaitPakinService.selectList(new EntityWrapper<AgvWaitPakin>().eq("supp_code", agvBasDevp.getBarcode()));
//妫�绱㈠簱浣嶏紝閫夋嫨鍚堥�傜殑搴撲綅
AgvLocMast agvLocMast = agvCommonService.getLocNo(agvWaitPakinList, agvBasDevp.getFloor());
@@ -89,7 +88,7 @@
//鐢熸垚宸ヤ綔妗ｆ槑缁�
//createWrkDetlReWrite(agvWaitPakinList,wrkMast,userId);
agvWaitPakinList.forEach(wp -> {
- createWrkDetlReWrite(wp.getMatnr(),wrkMast.getWrkNo(),wp.getOrderNo(),wp.getBatch(),wp.getAnfme(),wp.getZpallet(),now,userId,wp.getThreeCode(),wp.getDeadTime());
+ createWrkDetlReWrite(wp.getMatnr(),wrkMast.getWrkNo(),wp.getOrderNo(),wp.getBatch(),wp.getAnfme(),wp.getSuppCode(),now,userId,wp.getThreeCode(),wp.getDeadTime());
});
//鏇存柊婧愮珯鐐逛俊鎭�
updateAgvBasDevp(agvBasDevp,"R");
@@ -119,7 +118,7 @@
long wrkSts = 21L;
String sourceLocNo = taskDto.getLocNo();
String targetLocNo = taskDto.getAgvStaNo();
- String barcode = agvLocDetl.getZpallet();
+ String barcode = agvLocDetl.getSuppCode();
//鏄庣粏妗ｆ墍闇�鍙傛暟
String mantr = taskDto.getLocDtos().get(0).getMatnr();
String orderNo = taskDto.getLocDtos().get(0).getOrderNo();
@@ -514,8 +513,8 @@
private AgvWrkMast createWrkMast(int ioType, long wrkSts, String sourceLocNo, String locNo, String barcode, Date now, Long userId){
AgvWrkMast wrkMast = new AgvWrkMast();
//鐢熸垚宸ヤ綔鍙�
- int workNo = agvCommonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
- wrkMast.setWrkNo(workNo);
+// int workNo = agvCommonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
+// wrkMast.setWrkNo();
//宸ヤ綔鐘舵��
wrkMast.setWrkSts(wrkSts);
//鍏ュ嚭搴撶被鍨�
@@ -542,9 +541,16 @@
wrkMast.setAppeTime(now);
wrkMast.setModiUser(userId);
wrkMast.setModiTime(now);
- if (!agvWrkMastService.insert(wrkMast)) {
+
+ if (!agvWrkMastService.insertByIncrease(wrkMast)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
}
+
+ int i = agvWrkMastService.selectCount(new EntityWrapper<AgvWrkMast>());
+ log.info(i + "");
+
+
+ wrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", locNo).eq("source_loc_no",sourceLocNo));
return wrkMast;
}
@@ -556,8 +562,8 @@
private AgvWrkMast createWrkMast(AgvBasDevp agvBasDevp,AgvLocMast agvLocMast, Date now, Long userId){
AgvWrkMast wrkMast = new AgvWrkMast();
//鐢熸垚宸ヤ綔鍙�
- int workNo = agvCommonService.getWorkNo(0);
- wrkMast.setWrkNo(workNo);
+ //int workNo = agvCommonService.getWorkNo(0);
+ //wrkMast.setWrkNo(workNo);
wrkMast.setIoTime(new Date());
// 宸ヤ綔鐘舵�侊細201.鐢熸垚鍏ュ簱浠诲姟ID
wrkMast.setWrkSts(201L);
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastLogServiceImpl.java
index 2d7cb53..21c3b5a 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastLogServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastLogServiceImpl.java
@@ -1,6 +1,7 @@
package com.zy.asrs.service.impl;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.zy.asrs.entity.AgvWrkMast;
import com.zy.asrs.entity.AgvWrkMastLog;
import com.zy.asrs.mapper.AgvWrkMastLogMapper;
import com.zy.asrs.service.AgvWrkMastLogService;
@@ -10,8 +11,8 @@
public class AgvWrkMastLogServiceImpl extends ServiceImpl<AgvWrkMastLogMapper, AgvWrkMastLog> implements AgvWrkMastLogService {
@Override
- public boolean save(Integer workNo) {
- return this.baseMapper.save(workNo) > 0;
+ public boolean save(AgvWrkMast agvWrkMast) {
+ return this.baseMapper.saveByWrkMast(agvWrkMast) > 0;
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
index a0f8e09..9671a2f 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
@@ -39,6 +39,9 @@
@Value("${agv.containerMoveInPath}")
private String containerMoveInPath;
+ @Value("${agv.containerMoveOutPath}")
+ private String containerMoveOutPath;
+
@Autowired
AgvWrkMastMapper agvWrkMastMapper;
@Autowired
@@ -103,7 +106,13 @@
positionCodeMap.put("positionCode",agvWrkMast.getLocNo());
positionCodeMapList.add(positionCodeMap);
}
- return doHttpRequest(containerMoveParam,"瀹瑰櫒鍏ュ満浠诲姟涓嬪彂",url, containerMoveInPath,null,"127.0.0.1");
+ return doHttpRequest(containerMoveParam,"瀹瑰櫒绂诲満浠诲姟涓嬪彂",url, containerMoveOutPath,null,"127.0.0.1");
+ }
+
+ public boolean insertByIncrease(AgvWrkMast agvWrkMast) {
+ int index = this.baseMapper.insertByIncrease(agvWrkMast);
+
+ return index > 0;
}
private void getContainerMoveParam(List<AgvWrkMast> agvWrkMastList,List<Map<String,String>> positionCodeMapList){
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index a6f231a..10265ee 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -124,6 +124,7 @@
anfme = anfme > issued ? issued : anfme;
LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderNo, anfme);
List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), ioType);
+
locDto.setStaNos(staNos);
locDto.setCsocode(csocode);
locDto.setIsoseq(isoseq);
@@ -187,7 +188,7 @@
private void wapperSetCondition(Wrapper wrapper,String column, String condition){
if(Cools.isEmpty(condition)){
- wrapper.isNull(column);
+ wrapper.andNew().eq(column,"").or().isNull(column);
}else {
wrapper.eq(column,condition);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
index 01ada7a..99ab58f 100644
--- a/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ManLocDetlServiceImpl.java
@@ -230,7 +230,7 @@
private void wapperSetCondition(Wrapper wrapper,String column, String condition){
if(Cools.isEmpty(condition)){
- wrapper.isNull(column);
+ wrapper.andNew().eq(column,"").or().isNull(column);
}else {
wrapper.eq(column,condition);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
index 999ba33..df20f50 100644
--- a/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
@@ -38,7 +38,8 @@
if (row == 31 || row == 32) {
crnNo = 3;
}
- return this.baseMapper.queryOutStaNosByCrnNo(crnNo, typeNo);
+ return this.baseMapper.queryOutStation();
+ //return this.baseMapper.queryOutStaNosByCrnNo(crnNo, typeNo);
}
@Override
@@ -58,13 +59,13 @@
public StaDesc queryCrnStnAuto(Integer typeNo, Integer crnNo, Integer stnNo) {
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
.eq("type_no", typeNo)
- .eq("stn_no", stnNo)
- .eq("crn_no", crnNo);
+ .eq("stn_no", stnNo);
+ //.eq("crn_no", crnNo);
StaDesc staDesc = this.selectOne(wrapper);
if (staDesc == null) {
wrapper = new EntityWrapper<StaDesc>()
- .eq("type_no", typeNo)
- .eq("crn_no", crnNo);
+ .eq("type_no", typeNo);
+ //.eq("crn_no", crnNo);
List<StaDesc> staDescs = this.selectList(wrapper);
if (Cools.isEmpty(staDescs)) {
throw new CoolException("鍑哄簱璺緞涓嶅瓨鍦�");
diff --git a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
index c19448b..ef79460 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -10,6 +10,7 @@
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -18,6 +19,7 @@
import java.util.List;
import java.util.Map;
+@Slf4j
@Service
public class AgvWrkMastHandler extends AbstractHandler<String> {
@@ -57,21 +59,19 @@
agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"F");
}
//鐢熸垚AGV宸ヤ綔鍘嗗彶妗�
- agvWrkMastLogService.save(wrkNo);
+ agvWrkMastLogService.save(agvWrkMast);
//鐢熸垚AGV宸ヤ綔鏄庣粏鍘嗗彶妗�
agvWrkDetlLogService.save(wrkNo);
- //鍒犻櫎AGV宸ヤ綔妗�
- agvWrkMastService.deleteById(wrkNo);
- //鍒犻櫎AGV宸ヤ綔鏄庣粏妗�
- agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no",wrkNo));
//绫诲瀷涓哄叆搴撴椂
if(agvWrkMast.getIoType() == 1){
//鏇存柊鐩爣搴撲綅鏄庣粏
+ log.info("鏇存柊鐩爣搴撲綅鏄庣粏 agvWrkMast.getLocNo(): " + agvWrkMast.getLocNo() + ", wrkNo: " + wrkNo);
agvLocDetlService.addLocDetlInfo(agvWrkMast.getLocNo(),wrkNo);
//鐢熸垚鍏ュ簱閫氱煡鍘嗗彶妗�
- agvWaitPakinLogService.save(barcode);
+ boolean save = agvWaitPakinLogService.save(barcode);
//鍒犻櫎鍏ュ簱閫氱煡妗�
- agvWaitPakinService.delete(new EntityWrapper<AgvWaitPakin>().eq("zpallet",barcode));
+ log.info("鍒犻櫎鍏ュ簱閫氱煡妗� supp_code: " + barcode);
+ agvWaitPakinService.delete(new EntityWrapper<AgvWaitPakin>().eq("supp_code",barcode));
}
//绫诲瀷涓哄簱浣嶇Щ杞椂
if(agvWrkMast.getIoType() == 11){
@@ -90,6 +90,11 @@
orderService.checkComplete(o);
});
}
+
+ //鍒犻櫎AGV宸ヤ綔妗�
+ agvWrkMastService.deleteById(wrkNo);
+ //鍒犻櫎AGV宸ヤ綔鏄庣粏妗�
+ agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no",wrkNo));
return SUCCESS;
}
@@ -110,7 +115,7 @@
}
//鐢熸垚AGV宸ヤ綔鍘嗗彶妗�
- agvWrkMastLogService.save(wrkNo);
+ agvWrkMastLogService.save(agvWrkMast);
//鐢熸垚AGV宸ヤ綔鏄庣粏鍘嗗彶妗�
agvWrkDetlLogService.save(wrkNo);
//鍒犻櫎AGV宸ヤ綔妗�
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index 7a2ac41..77634f2 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -118,7 +118,7 @@
}
// 淇敼璁㈠崟鐘舵�� 浣滀笟涓� ===>> 宸插畬鎴�
for (WrkDetl wrkDetl : wrkDetlsKeyOrder) {
- if (BaseController.isJSON(wrkDetl.getOrderNo())) {
+ if (!BaseController.isJSON(wrkDetl.getOrderNo())) {
orderService.checkComplete(wrkDetl.getOrderNo());
} else {
// 璁㈠崟鍚堝苟鍑哄簱
diff --git a/src/main/java/com/zy/asrs/utils/AppAuthUtil.java b/src/main/java/com/zy/asrs/utils/AppAuthUtil.java
index b2a3128..a861486 100644
--- a/src/main/java/com/zy/asrs/utils/AppAuthUtil.java
+++ b/src/main/java/com/zy/asrs/utils/AppAuthUtil.java
@@ -1,7 +1,5 @@
package com.zy.asrs.utils;
-import com.core.common.Cools;
-import com.core.exception.CoolException;
import lombok.extern.slf4j.Slf4j;
import javax.servlet.http.HttpServletRequest;
@@ -13,9 +11,9 @@
public static void auth(String appkey, Object obj, HttpServletRequest request) {
request.setAttribute("cache", obj);
- if (Cools.isEmpty(appkey)) {
- throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�");
- }
+// if (Cools.isEmpty(appkey)) {
+// throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�");
+// }
// if (!APP_KEY_LIST.contains(appkey)) {
// throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�");
// }
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index fb9d3a1..7b5c23f 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -387,7 +387,7 @@
public static void wapperSetCondition(Wrapper wrapper, String column, String condition){
if(Cools.isEmpty(condition)){
- wrapper.isNull(column);
+ wrapper.andNew().eq(column,"").or().isNull(column);
}else {
wrapper.eq(column,condition);
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d84dd0c..4ce90f7 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -63,9 +63,13 @@
password: Poy@2022
agv:
- url: localhost:8080
- taskCreatePath: /test/task/create
- containerMoveInPath: /test/container/moveIn
+# url: localhost:8080
+# taskCreatePath: /test/task/create
+# containerMoveInPath: /test/container/moveIn
+ url: 10.10.10.182:9046
+ taskCreatePath: /task/create
+ containerMoveInPath: /expand/api/moveIn/container
+ containerMoveOutPath: /expand/api/moveOut/container
u8:
url: http://192.168.1.55:8010
diff --git a/src/main/webapp/static/js/agvLocDetl/locDetl.js b/src/main/webapp/static/js/agvLocDetl/locDetl.js
index d6482fd..ab8a10e 100644
--- a/src/main/webapp/static/js/agvLocDetl/locDetl.js
+++ b/src/main/webapp/static/js/agvLocDetl/locDetl.js
@@ -8,7 +8,7 @@
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
,{field: 'batch', align: 'center',title: '搴忓垪鐮�', width: 300, sort:true, hide: true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
+ ,{field: 'suppCode', align: 'center',title: '鏂欑鐮�'}
,{field: 'threeCode', align: 'center',title: '閿�鍞鍗曞彿'}
,{field: 'dead_time', align: 'center',title: '閿�鍞鍗曡鍙�'}
,{field: 'specs', align: 'center',title: '瑙勬牸鍨嬪彿', hide: false}
diff --git a/src/main/webapp/static/js/agvWaitPakin/waitPakin.js b/src/main/webapp/static/js/agvWaitPakin/waitPakin.js
index d5646ab..76c37af 100644
--- a/src/main/webapp/static/js/agvWaitPakin/waitPakin.js
+++ b/src/main/webapp/static/js/agvWaitPakin/waitPakin.js
@@ -1,6 +1,10 @@
var pageCurr;
function getCol() {
var cols = [ {type: 'checkbox'} ];
+ cols.push(
+ //{field: 'suppCode', align: 'center',title: '鏂欑鐮�'},
+ {field: 'anfme', align: 'center',title: '鏁伴噺'});
+ arrRemove(detlCols, 'field', 'zpallet');
cols.push.apply(cols, detlCols);
cols.push({field: 'status', align: 'center',title: '鏁版嵁鐘舵��', templet:function(row){
var html = "<input value='status' type='checkbox' lay-skin='switch' lay-text='姝ｅ父|閿佸畾'' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
diff --git a/src/main/webapp/static/js/agvWaitPakinLog/waitPakinLog.js b/src/main/webapp/static/js/agvWaitPakinLog/waitPakinLog.js
index 0ca33d5..64c12e8 100644
--- a/src/main/webapp/static/js/agvWaitPakinLog/waitPakinLog.js
+++ b/src/main/webapp/static/js/agvWaitPakinLog/waitPakinLog.js
@@ -2,6 +2,10 @@
function getCol() {
var cols = [
];
+ cols.push(
+ //{field: 'suppCode', align: 'center',title: '鏂欑鐮�'},
+ {field: 'anfme', align: 'center',title: '鏁伴噺'});
+ arrRemove(detlCols, 'field', 'zpallet');
cols.push.apply(cols, detlCols);
cols.push({field: 'status', align: 'center',title: '鏁版嵁鐘舵��', templet:function(row){
var html = "<input value='status' type='checkbox' lay-skin='switch' lay-text='姝ｅ父|閿佸畾' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";
diff --git a/src/main/webapp/static/js/agvWrkDetl/wrkDetl.js b/src/main/webapp/static/js/agvWrkDetl/wrkDetl.js
index f26ec85..5b91290 100644
--- a/src/main/webapp/static/js/agvWrkDetl/wrkDetl.js
+++ b/src/main/webapp/static/js/agvWrkDetl/wrkDetl.js
@@ -4,6 +4,10 @@
{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿', width: 160}
];
+ cols.push(
+ //{field: 'suppCode', align: 'center',title: '鏂欑鐮�'},
+ {field: 'anfme', align: 'center',title: '鏁伴噺'});
+ arrRemove(detlCols, 'field', 'zpallet');
cols.push.apply(cols, detlCols);
cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true})
diff --git a/src/main/webapp/static/js/agvWrkDetlLog/wrkDetlLog.js b/src/main/webapp/static/js/agvWrkDetlLog/wrkDetlLog.js
index 85da753..b1d105d 100644
--- a/src/main/webapp/static/js/agvWrkDetlLog/wrkDetlLog.js
+++ b/src/main/webapp/static/js/agvWrkDetlLog/wrkDetlLog.js
@@ -4,6 +4,10 @@
{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
];
+ cols.push(
+ //{field: 'suppCode', align: 'center',title: '鏂欑鐮�'},
+ {field: 'anfme', align: 'center',title: '鏁伴噺'});
+ arrRemove(detlCols, 'field', 'zpallet');
cols.push.apply(cols, detlCols);
cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',hide: true}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿',hide: true}
diff --git a/src/main/webapp/static/js/agvWrkMast/wrkMast.js b/src/main/webapp/static/js/agvWrkMast/wrkMast.js
index ccd559c..85ad9a2 100644
--- a/src/main/webapp/static/js/agvWrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/agvWrkMast/wrkMast.js
@@ -30,7 +30,7 @@
,{field: 'sourceLocNo', align: 'center',title: '婧愬簱浣�'}
,{field: 'locNo', align: 'center',title: '鐩爣搴撲綅'}
//,{field: 'steNo', align: 'center',title: '灏忚溅', width: 70}
- ,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: false}
+ ,{field: 'barcode', align: 'center',title: '鏂欑鐮�', hide: false}
,{field: 'preHave', align: 'center',title: '鍏堝叆鍝�', hide: true}
,{field: 'takeNone', align: 'center',title: '绌烘搷浣�', hide: true}
// ,{field: 'picking', align: 'center',title: '鎷ｆ枡', templet:function(row){
diff --git a/src/main/webapp/static/js/agvWrkMastLog/wrkMastLog.js b/src/main/webapp/static/js/agvWrkMastLog/wrkMastLog.js
index 148dcfc..366c810 100644
--- a/src/main/webapp/static/js/agvWrkMastLog/wrkMastLog.js
+++ b/src/main/webapp/static/js/agvWrkMastLog/wrkMastLog.js
@@ -20,53 +20,16 @@
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
- // {type: 'checkbox'}
-// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
-// ,{field: 'id', align: 'center',title: '缂栧彿'}
{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�',event: 'wrkNo', sort: true}
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿', width:160, sort: true}
,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��', width:160}
,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�', width:160}
,{field: 'ioPri', align: 'center',title: '浼樺厛绾�'}
- //,{field: 'crnNo$', align: 'center',title: '鍫嗗灈鏈哄彿'}
- //,{field: 'sourceStaNo$', align: 'center',title: '婧愮珯'}
- //,{field: 'staNo$', align: 'center',title: '鐩爣绔�'}
,{field: 'sourceLocNo', align: 'center',title: '婧愬簱浣�'}
,{field: 'locNo', align: 'center',title: '鐩爣搴撲綅'}
- // ,{field: 'picking', align: 'center',title: '鎷ｆ枡', templet:function(row){
- // var html = "<input value='picking' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
- // if(row.picking === 'Y'){html += " checked ";}
- // html += ">";
- // return html;
- // }}
- // ,{field: 'exitMk', align: 'center',title: '閫�鍑�', templet:function(row){
- // var html = "<input value='exitMk' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
- // if(row.exitMk === 'Y'){html += " checked ";}
- // html += ">";
- // return html;
- // }}
- // ,{field: 'emptyMk', align: 'center',title: '绌烘澘', templet:function(row){
- // var html = "<input value='emptyMk' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
- // if(row.emptyMk === 'Y'){html += " checked ";}
- // html += ">";
- // return html;
- // }}
- //
- // ,{field: 'crnStrTime$', align: 'center',title: '鍫嗗灈鏈哄惎鍔ㄦ椂闂�'}
- // ,{field: 'crnEndTime$', align: 'center',title: '鍫嗗灈鏈哄仠姝㈡椂闂�'}
- // ,{field: 'plcStrTime$', align: 'center',title: '鎷ｆ枡鏃堕棿'}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true}
- // ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�',event: 'appeUser', style: 'cursor:pointer'}
- // ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
- ,{field: 'barcode', align: 'center',title: '鏉＄爜'}
- // ,{field: 'fullPlt', align: 'center',title: '婊℃澘', templet:function(row){
- // var html = "<input value='fullPlt' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
- // if(row.fullPlt === 'Y'){html += " checked ";}
- // html += ">";
- // return html;
- // }}
-
+ ,{field: 'barcode', align: 'center',title: '鏂欑鐮�'}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 80}
]],
request: {
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 448053b..1d3e070 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -225,6 +225,8 @@
var detlCols = [
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜', hide: true}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜', hide: false}
+ ,{field: 'suppCode', align: 'center',title: '鏂欑鐮�', hide: false}
+ ,{field: 'suppCode', align: 'center',title: '鏂欑鐮�', hide: true}
,{field: 'matnr', align: 'center',title: '瀛樿揣缂栫爜',hide: true}
,{field: 'matnr', align: 'center',title: '瀛樿揣缂栫爜'}
,{field: 'batch', align: 'center',title: '搴忓垪鐮�', width: 300, sort:true, hide: true}
--
Gitblit v1.9.1