From 816536ec6e6c394689ca050a9a4f59e5ce7d67ad Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 12 十月 2023 19:02:53 +0800
Subject: [PATCH] 自动补货单
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 8 +
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 3
src/main/java/com/zy/asrs/service/LocDetlService.java | 2
src/main/java/com/zy/common/web/param/ReplenishmentParam.java | 2
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 3
src/main/webapp/views/agvBasDevpVisualized/basDevp.html | 4
src/main/java/com/zy/asrs/task/handler/AutoReplenishmentHandler.java | 145 ++++++++++++++++++++++++++++-------
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 5 +
src/main/java/com/zy/common/web/WcsController.java | 36 ++++++++
src/main/java/com/zy/asrs/service/LocMastService.java | 2
src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java | 3
src/main/resources/application.yml | 4
12 files changed, 174 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index 9e097b6..1e1303a 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -71,4 +71,7 @@
int updateStockFreeze(String matnr, String locNo, Integer stockFreeze);
+ @Select("SELECT loc_no FROM asr_loc_detl WHERE matnr = #{matnr} GROUP BY loc_no")
+ List<String> selectLocNo(@Param("matnr") String matnr);
+
}
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 41f917f..3ac2cb5 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -67,4 +67,6 @@
List<LocDetl> selectByLocNo(String locNo);
+ List<String> selectLocNo(String matnr);
+
}
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index 01e3905..9dbfeae 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -1,7 +1,6 @@
package com.zy.asrs.service;
import com.baomidou.mybatisplus.service.IService;
-import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
import java.util.List;
@@ -60,4 +59,5 @@
Integer updateLocType2ByRBL(Integer locType2, Integer startRow, Integer endRow, Integer startBay, Integer endBay, Integer startLev, Integer endLev);
+ void updateByLocNo(LocMast locMast);
}
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 94ca11d..46c7a70 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -182,6 +182,11 @@
}
@Override
+ public List<String> selectLocNo(String matnr) {
+ return this.baseMapper.selectLocNo(matnr);
+ }
+
+ @Override
public int updateStockFreeze(String matnr, String locNo, Integer stockFreeze) {
return this.baseMapper.updateStockFreeze(matnr, locNo, stockFreeze);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index 1c44970..be4b66b 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -1,9 +1,9 @@
package com.zy.asrs.service.impl;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
-import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.LocMastService;
@@ -17,7 +17,6 @@
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Iterator;
import java.util.List;
@Slf4j
@@ -186,4 +185,9 @@
public Integer updateLocType2ByRBL(Integer locType2, Integer startRow, Integer endRow, Integer startBay, Integer endBay, Integer startLev, Integer endLev) {
return this.baseMapper.updateLocType2ByRBL(locType2, startRow, endRow, startBay, endBay, startLev, endLev);
}
+
+ public void updateByLocNo(LocMast locMast){
+
+ this.update(locMast,new EntityWrapper<LocMast>().eq("loc_no",locMast.getLocNo()));
+ }
}
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 066d20a..656b917 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -445,6 +445,9 @@
wrkDetl.setAppeUser(userId);
wrkDetl.setModiTime(now);
wrkDetl.setModiUser(userId);
+ wrkDetl.setSuppCode(locDto.getContainerCode());
+ wrkDetl.setThreeCode(locDto.getCsocode());
+ wrkDetl.setDeadTime(locDto.getIsoseq());
if (!wrkDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
diff --git a/src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java b/src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java
index 7050458..55df580 100644
--- a/src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoReplenishmentScheduler.java
@@ -9,7 +9,6 @@
import com.zy.asrs.task.handler.AutoReplenishmentHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.util.List;
@@ -28,7 +27,7 @@
/*
瀹氭椂澶勭悊鑷姩琛ヨ揣鍗曟嵁
*/
- @Scheduled(cron = "0/5 * * * * ? ")
+ //@Scheduled(cron = "0/5 * * * * ? ")
public void excute(){
DocType docType = docTypeService.selectOne(new EntityWrapper<DocType>().eq("doc_name", "鑷姩琛ヨ揣鍗�"));
List<Order> orderList = orderService.selectList(new EntityWrapper<Order>()
diff --git a/src/main/java/com/zy/asrs/task/handler/AutoReplenishmentHandler.java b/src/main/java/com/zy/asrs/task/handler/AutoReplenishmentHandler.java
index 2a9cb89..3b95b94 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutoReplenishmentHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutoReplenishmentHandler.java
@@ -2,20 +2,18 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.entity.LocMast;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.service.LocDetlService;
-import com.zy.asrs.service.LocMastService;
-import com.zy.asrs.service.OrderDetlService;
-import com.zy.asrs.service.WorkService;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
+import com.zy.common.model.enums.WorkNoType;
+import com.zy.common.service.CommonService;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -30,10 +28,18 @@
@Autowired
private LocMastService locMastService;
@Autowired
- private WorkService workService;
+ private CommonService commonService;
+ @Autowired
+ private WrkMastService wrkMastService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
+ @Autowired
+ private OrderService orderService;
+
@Transactional
public ReturnT<String> start(Order order) {
+ Date now = new Date();
Set<String> locNos = pakoutLoc(order);
for (String locNo : locNos){
@@ -42,10 +48,16 @@
throw new CoolException("搴撲綅鐘舵�佸凡鍙樻洿");
}
//鐢熸垚宸ヤ綔妗�
-
+ WrkMast wrkMast = createWrkMast(locNo,locMast.getBarcode(),now);
//鐢熸垚宸ヤ綔妗ｆ槑缁�
+ List<LocDetl> locDetls = locDetlService.selectByLocNo(locNo);
+ createWrkDetl(locDetls, wrkMast,order.getOrderNo(),now);
//淇敼搴撲綅鐘舵��
+ locMast.setLocSts("R");
+ locMastService.updateByLocNo(locMast);
}
+ order.setSettle(2L);
+ orderService.updateById(order);
return SUCCESS;
@@ -56,44 +68,115 @@
Set<String> locNos = new HashSet<>();
//鏍规嵁璁㈠崟鐢熸垚鍥涢」搴撳嚭搴撳伐浣滄。
List<OrderDetl> orderDetlList = orderDetlService.selectList(new EntityWrapper<OrderDetl>().eq("order_no", order.getOrderNo()));
- orderDetlList.forEach(orderDetl -> {
+
+ for(OrderDetl orderDetl : orderDetlList){
+ if(orderDetl.getAnfme() - orderDetl.getQty() <= 0){
+ continue;
+ }
+
String matnr = orderDetl.getMatnr();
Double orderAnfme = orderDetl.getAnfme();
- List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
- .eq("matnr", matnr)
- .eq("loc_sts","F")
- .groupBy("loc_no"));
- for (LocDetl locDetl : locDetls){
- String locNo = locDetl.getLocNo();
- //璁㈠崟寰呭嚭鏁伴噺鍑忓幓搴撳瓨鏁伴噺
- orderAnfme -= locDetl.getAnfme();
- //娣诲姞寰呭嚭搴撳簱浣�
- locNos.add(locNo);
+ List<String> locNosSearch = locDetlService.selectLocNo(matnr);
+ for(String locNo : locNosSearch){
+ List<LocDetl> locDetls = locDetlService.selectByLocNo(locNo);
+ locNos.add(locNo);
+ for (LocDetl locDetl :locDetls){
+ if(matnr.equals(locDetl.getMatnr())){
+ orderAnfme -= locDetl.getAnfme();
+ }
+ }
if(orderAnfme <= 0){
orderDetl.setQty(orderDetl.getAnfme() - orderAnfme);
orderDetlService.updateById(orderDetl);
break;
}
}
+ }
- });
+// orderDetlList.forEach(orderDetl -> {
+//
+// if(orderDetl.getAnfme() - orderDetl.getQty() <= 0){
+// cont
+// }
+//
+// String matnr = orderDetl.getMatnr();
+// Double orderAnfme = orderDetl.getAnfme();
+//
+// List<String> locNosSearch = locDetlService.selectLocNo(matnr);
+//
+// for(String locNo : locNosSearch){
+// List<LocDetl> locDetls = locDetlService.selectByLocNo(locNo);
+// locNos.add(locNo);
+// for (LocDetl locDetl :locDetls){
+// if(matnr.equals(locDetl.getMatnr())){
+// orderAnfme -= locDetl.getAnfme();
+// }
+// }
+// if(orderAnfme <= 0){
+// orderDetl.setQty(orderDetl.getAnfme() - orderAnfme);
+// orderDetlService.updateById(orderDetl);
+// break;
+// }
+// }
+//
+// });
return locNos;
}
- public static void main(String[] args) {
- for (int i=0; i<10; i++){
- for (int y=0; y<10; y++){
- System.out.println(i);
- System.out.println(y);
- if(y == 5){
- break;
- }
- }
+ private WrkMast createWrkMast(String locNo,String barCode,Date now){
+ int ioType = 101;
+ int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(workNo);
+ wrkMast.setIoTime(now);
+ wrkMast.setWrkSts(21L); // 宸ヤ綔鐘舵�侊細21.鐢熸垚鍑哄簱浠诲姟
+ wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
+ wrkMast.setIoPri(300D); // 浼樺厛绾э細13
+ //wrkMast.setOutMost(outMost?1:0);;
+ //wrkMast.setCrnNo(outMost?outCrnNo:locMast.getCrnNo());
+ //wrkMast.setSourceStaNo(loc); // 婧愮珯
+ wrkMast.setStaNo(300); // 鐩爣绔�
+ wrkMast.setSourceLocNo(locNo); // 婧愬簱浣�
+ wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("N"); // 绌烘澘
+ wrkMast.setLinkMis("N");
+ wrkMast.setBarcode(barCode);
+ //wrkMast.setAppeUser(userId); // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast.setAppeTime(now);
+ //wrkMast.setModiUser(userId);
+ wrkMast.setModiTime(now);
+
+ wrkMast.setMk("Y");
+ if (!wrkMastService.insert(wrkMast)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細"+locNo);
}
+ return wrkMast;
}
+ private void createWrkDetl(List<LocDetl> locDetls, WrkMast wrkMast,String orderNo, Date now){
+ locDetls.forEach(locDetl -> {
+ WrkDetl wrkDetl = new WrkDetl();
+ BeanUtils.copyProperties(locDetl,wrkDetl);
+ wrkDetl.setZpallet(wrkMast.getBarcode());
+ wrkDetl.setIoTime(now);
+ wrkDetl.setWrkNo(wrkMast.getWrkNo());
+ //wrkDetl.setBatch(locDetl.getBatch());
+ wrkDetl.setOrderNo(orderNo);
+ //wrkDetl.setAnfme(locDetl.getAnfme()); // 鏁伴噺
+ wrkDetl.setAppeTime(now);
+ //wrkDetl.setAppeUser(userId);
+ wrkDetl.setModiTime(now);
+ //wrkDetl.setSuppCode(locDetl.getSuppCode());
+ //wrkDetl.setModiUser(userId);
+ if (!wrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
+ }
+ });
+ }
}
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index d2ccfbb..213dc39 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -10,7 +10,6 @@
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
-import com.zy.common.service.erp.ErpService;
import com.zy.common.web.param.ReplenishmentParam;
import com.zy.common.web.param.SearchLocParam;
import lombok.extern.slf4j.Slf4j;
@@ -49,7 +48,11 @@
@Autowired
private MatService matService;
@Autowired
- private ErpService erpService;
+ private AgvWaitPakinService agvWaitPakinService;
+ @Autowired
+ private AgvWorkService agvWorkService;
+// @Autowired
+// private ErpService erpService;
@PostMapping("/pakin/loc/v1")
@ResponseBody
@@ -299,11 +302,38 @@
}
/*
- 鍥涢」搴撳線AGV琛ヨ揣锛寃cs璋冪敤姝ゆ帴鍙�
+ 鍥涢」搴撳線AGV琛ヨ揣锛岀敓鎴怉GV鍏ュ簱閫氱煡妗�
*/
@PostMapping("/replenishment")
@ResponseBody
public R replenishment(@RequestBody ReplenishmentParam param){
+ Date now = new Date();
+ Integer wrkNo = param.getWrkNo();
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkNo);
+ wrkDetls.forEach(wrkDetl -> {
+ AgvWaitPakin agvWaitPakin = new AgvWaitPakin();
+ BeanUtils.copyProperties(wrkDetl,agvWaitPakin);
+ agvWaitPakin.setIoStatus("Y");
+ agvWaitPakin.setModiTime(now);
+ agvWaitPakin.setAppeTime(now);
+ agvWaitPakinService.insert(agvWaitPakin);
+
+ });
+
+ return R.ok();
+ }
+
+ /*
+ 鐢熸垚AGV宸ヤ綔妗�
+ */
+ @PostMapping("/start")
+ @ResponseBody
+ public R start(@RequestBody ReplenishmentParam param){
+
+ //缁戝畾绔欑偣
+
+
+ //agvWorkService.createWaitPainWrkMastStart(agvBasDevpList, getUserId());
return R.ok();
diff --git a/src/main/java/com/zy/common/web/param/ReplenishmentParam.java b/src/main/java/com/zy/common/web/param/ReplenishmentParam.java
index ee6c515..d294c3e 100644
--- a/src/main/java/com/zy/common/web/param/ReplenishmentParam.java
+++ b/src/main/java/com/zy/common/web/param/ReplenishmentParam.java
@@ -8,4 +8,6 @@
private String containerCode;
//agv绔欑偣
private String devNo;
+ //宸ヤ綔鍙�
+ private Integer wrkNo;
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 330352b..7f83267 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,9 +10,9 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://localhost:1433;databasename=tzskasrs
+ #url: jdbc:sqlserver://localhost:1433;databasename=tzskasrs
#url: jdbc:sqlserver://192.168.4.15:1433;databasename=tzskasrs
- #url: jdbc:sqlserver://10.10.10.40:1433;databasename=tzskasrs
+ url: jdbc:sqlserver://10.10.10.40:1433;databasename=tzskasrs
username: sa
password: sa@123
mvc:
diff --git a/src/main/webapp/views/agvBasDevpVisualized/basDevp.html b/src/main/webapp/views/agvBasDevpVisualized/basDevp.html
index d39c441..11ab93d 100644
--- a/src/main/webapp/views/agvBasDevpVisualized/basDevp.html
+++ b/src/main/webapp/views/agvBasDevpVisualized/basDevp.html
@@ -81,7 +81,7 @@
{{#if agvWaitPakin.batch}}
搴忓垪鐮侊細{{agvWaitPakin.batch}} </br>
{{/if}}
- 鎵樼洏鐮侊細{{agvWaitPakin.zpallet}} </br>
+ 鏂欑鐮侊細{{agvWaitPakin.suppCode}} </br>
鏁伴噺锛歿{agvWaitPakin.anfme}}
</div>
{{/if}}
@@ -98,7 +98,7 @@
{{#if agvWrkDetl.batch}}
搴忓垪鐮侊細{{agvWrkDetl.batch}} </br>
{{/if}}
- 鎵樼洏鐮侊細{{agvWrkDetl.zpallet}} </br>
+ 鏂欑鐮侊細{{agvWaitPakin.suppCode}} </br>
鏁伴噺锛歿{agvWrkDetl.anfme}}
</div>
{{/if}}
--
Gitblit v1.9.1