From 606e903e80fa9a7e77c72879494b47fbd195b93a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 22 八月 2025 13:42:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 55 insertions(+), 1 deletions(-)
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 caac500..37ca2d9 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -87,6 +87,59 @@
@Autowired
private AgvSiteService agvSiteService;
+
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void AgvStaBind(CombParam param,Long userId) {
+ AgvSite agvSite = agvSiteService.selectOne(new EntityWrapper<AgvSite>().eq("name", param.getBarcode()));
+ if (Cools.isEmpty(agvSite)){
+ throw new CoolException("鏈壘鍒癆GV鏆傚瓨浣嶄俊鎭�");
+ }
+ if (agvSite.getStatus() != 0){
+ throw new CoolException("AGV鏆傚瓨浣嶇姸鎬佷笉涓虹┖闂�");
+ }
+
+ int workNo = commonService.getWorkNo(1);
+ Date now = new Date();
+ WrkMast wrkMast1 = new WrkMast();
+ wrkMast1.setWrkNo(workNo);
+ wrkMast1.setWrkSts(2L);
+ wrkMast1.setIoType(300);
+ wrkMast1.setIoTime(now);
+ wrkMast1.setIoPri(13D); // 浼樺厛绾э細13
+ wrkMast1.setFullPlt("Y"); // 婊℃澘锛歒
+ wrkMast1.setPicking("N"); // 鎷ｆ枡
+ wrkMast1.setExitMk("N"); // 閫�鍑�
+ wrkMast1.setEmptyMk("N"); // 绌烘澘
+ wrkMast1.setLinkMis("N");
+ wrkMast1.setAppeUser(userId); // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast1.setAppeTime(now);
+ wrkMast1.setModiUser(userId);
+ wrkMast1.setModiTime(now);
+ wrkMast1.setBarcode(param.getBarcode());
+ if (!wrkMastService.insert(wrkMast1)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ }
+ // 鐢熸垚宸ヤ綔妗ｆ槑缁�
+ param.getCombMats().forEach(waitPakin -> {
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(waitPakin);
+ wrkDetl.setWrkNo(workNo);
+ wrkDetl.setIoTime(now);
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setModiTime(now);
+ if (!wrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+ }
+ });
+
+ agvSite.setWorkNo(workNo);
+ agvSite.setStatus(1);
+ agvSiteService.updateById(agvSite);
+
+ }
+
@Override
public R inLocCallAgv(String sta, String inSta) {
@@ -1280,7 +1333,7 @@
@Override
public R siteList() {
- List<AgvSite> agvSites = agvSiteService.selectList(new EntityWrapper<AgvSite>().eq("status", 1));
+ List<AgvSite> agvSites = agvSiteService.selectList(new EntityWrapper<AgvSite>());
ArrayList<AgvSiteListVo> agvSiteListVos = new ArrayList<>();
for (AgvSite agvSite : agvSites) {
AgvSiteListVo agvSiteListVo = new AgvSiteListVo();
@@ -1335,6 +1388,7 @@
return R.ok();
}
+
public void uploadErp(InventoryErpParam param){
String response = "";
boolean success = false;
--
Gitblit v1.9.1