From 42b021b392b9752c4520425d245213ed262c9059 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期六, 01 三月 2025 23:04:50 +0800
Subject: [PATCH] 四期
---
src/main/java/com/zy/asrs/controller/OrderController.java | 2
src/main/java/com/zy/system/controller/RoleController.java | 2
src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 5
src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java | 2
src/main/java/com/zy/asrs/task/AutoMoveScheduler.java | 38 +++++
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 32 ++--
src/main/java/com/zy/asrs/mapper/AgvBasDevpMapper.java | 1
src/main/java/com/zy/asrs/service/AgvLocDetlService.java | 4
src/main/java/com/zy/asrs/mapper/AgvLocDetlMapper.java | 6
src/main/resources/application-loc.yml | 2
src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java | 16 +-
src/main/java/com/zy/asrs/controller/OutController.java | 190 +++++++++++++++++++------------
src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java | 25 ++-
13 files changed, 211 insertions(+), 114 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 30b2cf3..31bae3d 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -392,7 +392,7 @@
// wrapper.in("source", docIds);
Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
for (OrderDetl record : page.getRecords()) {
- Double sumAnfme = agvLocDetlService.getSumAnfmeDb(record.getMatnr(), record.getThreeCode(), 1);
+ Double sumAnfme = agvLocDetlService.getSumAnfmeDb2(record.getMatnr(), record.getThreeCode(), 1);
record.setStock(sumAnfme == null ? 0 : sumAnfme);
}
return R.ok(page);
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 801d229..44abf25 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -14,6 +14,8 @@
import com.zy.common.model.OrderMergeVo;
import com.zy.common.model.TaskDto;
import com.zy.common.web.BaseController;
+import com.zy.system.entity.Config;
+import com.zy.system.service.ConfigService;
import lombok.Synchronized;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -61,6 +63,13 @@
@Autowired
private AgvLocDetlService agvLocDetlService;
+ @Autowired
+ private ConfigService configService;
+
+
+ @Autowired
+ private AgvWrkMastService agvWrkMastService;
+
@PostMapping("/out/pakout/orderDetlIds/auth")
@ManagerAuth
public R pakoutOrderDetlIds(@RequestParam Long orderId) throws InterruptedException {
@@ -81,28 +90,32 @@
double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty()).orElse(0.0D);
Order order = orderService.selectByNo(orderDetl.getOrderNo());
DocType docType = docTypeService.selectById(order.getDocType());
- if("浜哄伐琛ヨ揣鍗�".equals(docType.getDocName())){
- if (issued <= 0.0D) { continue; }
- issued = locDetlService.queryStockAndSetLocDto1(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime());
+ if ("浜哄伐琛ヨ揣鍗�".equals(docType.getDocName())) {
+ if (issued <= 0.0D) {
+ continue;
+ }
+ issued = locDetlService.queryStockAndSetLocDto1(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrderNo(), locDtoList, issued, orderDetl.getThreeCode(), orderDetl.getDeadTime());
if (issued > 0) {
- LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued,orderDetl.getProcessSts());
+ LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued, orderDetl.getProcessSts());
locDto.setLack(Boolean.TRUE);
locDtoList.add(locDto);
}
- }else {
- if (issued <= 0.0D) { continue; }
+ } else {
+ if (issued <= 0.0D) {
+ continue;
+ }
//浠庡钩搴撳鎵�
//issued = manLocDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime());
//鍏堟壘AGV鐨勫簱瀛橈紝濡傛灉杩斿洖鐨刬ssued澶т簬0锛屽垯鍘诲洓椤瑰簱鎵�
- issued = agvLocDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime(),null);
+ issued = agvLocDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrderNo(), locDtoList, issued, orderDetl.getThreeCode(), orderDetl.getDeadTime(), null);
//浠庡洓椤瑰簱鐨勫簱瀛橀噷闈㈡壘锛�
//issued = locDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime());
if (issued > 0) {
- LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued,orderDetl.getProcessSts());
+ LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued, orderDetl.getProcessSts());
locDto.setLack(Boolean.TRUE);
locDtoList.add(locDto);
}
@@ -127,28 +140,32 @@
double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty()).orElse(0.0D);
Order order = orderService.selectByNo(orderDetl.getOrderNo());
DocType docType = docTypeService.selectById(order.getDocType());
- if("浜哄伐琛ヨ揣鍗�".equals(docType.getDocName())){
- if (issued <= 0.0D) { continue; }
- issued = locDetlService.queryStockAndSetLocDto1(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime());
+ if ("浜哄伐琛ヨ揣鍗�".equals(docType.getDocName())) {
+ if (issued <= 0.0D) {
+ continue;
+ }
+ issued = locDetlService.queryStockAndSetLocDto1(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrderNo(), locDtoList, issued, orderDetl.getThreeCode(), orderDetl.getDeadTime());
if (issued > 0) {
- LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued,orderDetl.getProcessSts());
+ LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued, orderDetl.getProcessSts());
locDto.setLack(Boolean.TRUE);
locDtoList.add(locDto);
}
- }else {
- if (issued <= 0.0D) { continue; }
+ } else {
+ if (issued <= 0.0D) {
+ continue;
+ }
//浠庡钩搴撳鎵�
//issued = manLocDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime());
//鍏堟壘AGV鐨勫簱瀛橈紝濡傛灉杩斿洖鐨刬ssued澶т簬0锛屽垯鍘诲洓椤瑰簱鎵�
- issued = agvLocDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime(),"bcp");
+ issued = agvLocDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrderNo(), locDtoList, issued, orderDetl.getThreeCode(), orderDetl.getDeadTime(), "bcp");
//浠庡洓椤瑰簱鐨勫簱瀛橀噷闈㈡壘锛�
//issued = locDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime());
if (issued > 0) {
- LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued,orderDetl.getProcessSts());
+ LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued, orderDetl.getProcessSts());
locDto.setLack(Boolean.TRUE);
locDtoList.add(locDto);
}
@@ -177,28 +194,32 @@
double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getQty()).orElse(0.0D);
Order order = orderService.selectByNo(orderDetl.getOrderNo());
DocType docType = docTypeService.selectById(order.getDocType());
- if("浜哄伐琛ヨ揣鍗�".equals(docType.getDocName())){
- if (issued <= 0.0D) { continue; }
- issued = locDetlService.queryStockAndSetLocDto1(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime());
+ if ("浜哄伐琛ヨ揣鍗�".equals(docType.getDocName())) {
+ if (issued <= 0.0D) {
+ continue;
+ }
+ issued = locDetlService.queryStockAndSetLocDto1(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrderNo(), locDtoList, issued, orderDetl.getThreeCode(), orderDetl.getDeadTime());
if (issued > 0) {
- LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued,orderDetl.getProcessSts());
+ LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued, orderDetl.getProcessSts());
locDto.setLack(Boolean.TRUE);
locDtoList.add(locDto);
}
- }else {
- if (issued <= 0.0D) { continue; }
+ } else {
+ if (issued <= 0.0D) {
+ continue;
+ }
//浠庡钩搴撳鎵�
//issued = manLocDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime());
//鍏堟壘AGV鐨勫簱瀛橈紝濡傛灉杩斿洖鐨刬ssued澶т簬0锛屽垯鍘诲洓椤瑰簱鎵�
- issued = agvLocDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime(), AsrsConstants.ERCHANG);
+ issued = agvLocDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getOrderNo(), locDtoList, issued, orderDetl.getThreeCode(), orderDetl.getDeadTime(), AsrsConstants.ERCHANG);
//浠庡洓椤瑰簱鐨勫簱瀛橀噷闈㈡壘锛�
//issued = locDetlService.queryStockAndSetLocDto(orderDetl.getMatnr(),orderDetl.getBatch(),orderDetl.getOrderNo(),locDtoList,issued,orderDetl.getThreeCode(),orderDetl.getDeadTime());
if (issued > 0) {
- LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued,orderDetl.getProcessSts());
+ LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued, orderDetl.getProcessSts());
locDto.setLack(Boolean.TRUE);
locDtoList.add(locDto);
}
@@ -218,22 +239,38 @@
for (LocDto locDto : locDtos) {
if (locDto.getAnfme() == 0) {
- return R.error(locDto.getMatnr()+"锛氬嚭搴撴暟閲忎负0");
+ return R.error(locDto.getMatnr() + "锛氬嚭搴撴暟閲忎负0");
}
}
//鍒ゆ柇鏄惁鍙互鐢熸垚鍑哄簱宸ヤ綔妗�
boolean lack = true;
for (LocDto locDto : locDtos) {
//濡傛灉AGV鍑哄簱绔欎负绌� 鍜� 鍥涢」搴撳嚭搴撶珯涓虹┖ 骞朵笖 鏈夊簱瀛樼殑鎯呭喌涓� 鍒欒繑鍥�
- if (Cools.isEmpty(locDto.getStaNo()) && Cools.isEmpty(locDto.getAgvStaNo()) &&!locDto.isLack()) {
- return R.error(locDto.getLocNo()+"搴撲綅璇烽�夋嫨鍑哄簱绔�");
+ if (Cools.isEmpty(locDto.getStaNo()) && Cools.isEmpty(locDto.getAgvStaNo()) && !locDto.isLack()) {
+ return R.error(locDto.getLocNo() + "搴撲綅璇烽�夋嫨鍑哄簱绔�");
}
AgvLocMast agvLocMast = agvLocMastService.selectById(locDto.getLocNo());
List<String> staNoList = agvBasDevpService.selectCacheShelvesStationCodeByLocType(agvLocMast.getLocType1());
- if(!staNoList.contains(locDto.getAgvStaNo())){
- return R.error(locDto.getAgvStaNo()+"璇ョ珯鐐瑰凡鏈夊嚭搴撲换鍔★紝鏃犳硶閫夋嫨璇ョ珯鐐瑰嚭搴�");
+
+ Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "FOUR"));
+ if (config != null) {
+ if (config.getStatus().intValue() == 1) {
+ List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().eq("source_loc_no", locDto.getAgvStaNo()));
+ if (agvWrkMasts != null && !agvWrkMasts.isEmpty()) {
+ for (AgvWrkMast agvWrkMast : agvWrkMasts) {
+ if (agvWrkMast.getWrkSts() < 204) {
+ return R.error(locDto.getAgvStaNo() + "璇ョ珯鐐瑰凡鏈変换鍔★紝绛変换鍔″畬鎴愭垨鑰呰揣鏋舵惉璧板啀鍙枡");
+ }
+ }
+ }
+ }
+ }
+
+
+ if (!staNoList.contains(locDto.getAgvStaNo())) {
+ return R.error(locDto.getAgvStaNo() + "璇ョ珯鐐瑰凡鏈夊嚭搴撲换鍔★紝鏃犳硶閫夋嫨璇ョ珯鐐瑰嚭搴�");
}
}
//濡傛灉鎵�鏈夊簱閮芥病鏈夊簱瀛橈紝鍒欒繑鍥�
@@ -253,7 +290,7 @@
List<TaskDto> taskDtos = new ArrayList<>();
List<TaskDto> agvTaskDtos = new ArrayList<>();
- generateTaskDto(locDtos,taskDtos,agvTaskDtos);
+ generateTaskDto(locDtos, taskDtos, agvTaskDtos);
//鐢熸垚AGV鍑哄簱浠诲姟
agvWorkService.stockOutWrkMast(agvTaskDtos, getUserId());
@@ -266,6 +303,7 @@
}
return R.ok();
}
+
@PostMapping("/process/out/pakout/auth")
@ManagerAuth(memo = "鍔犲伐鍑哄簱")
@Transactional
@@ -276,15 +314,15 @@
boolean lack = true;
for (LocDto locDto : locDtos) {
//濡傛灉AGV鍑哄簱绔欎负绌� 鍜� 鍥涢」搴撳嚭搴撶珯涓虹┖ 骞朵笖 鏈夊簱瀛樼殑鎯呭喌涓� 鍒欒繑鍥�
- if (Cools.isEmpty(locDto.getStaNo()) && Cools.isEmpty(locDto.getAgvStaNo()) &&!locDto.isLack()) {
- return R.error(locDto.getLocNo()+"搴撲綅璇烽�夋嫨鍑哄簱绔�");
+ if (Cools.isEmpty(locDto.getStaNo()) && Cools.isEmpty(locDto.getAgvStaNo()) && !locDto.isLack()) {
+ return R.error(locDto.getLocNo() + "搴撲綅璇烽�夋嫨鍑哄簱绔�");
}
AgvLocMast agvLocMast = agvLocMastService.selectById(locDto.getLocNo());
- List<String> staNoList = agvBasDevpService.selectCacheShelvesStationCodeByLocType(agvLocMast.getLocType1(),agvLocMast.getFloor());
+ List<String> staNoList = agvBasDevpService.selectCacheShelvesStationCodeByLocType(agvLocMast.getLocType1(), agvLocMast.getFloor());
- if(!staNoList.contains(locDto.getAgvStaNo())){
- return R.error(locDto.getAgvStaNo()+"璇ョ珯鐐瑰凡鏈夊嚭搴撲换鍔★紝鏃犳硶閫夋嫨璇ョ珯鐐瑰嚭搴�");
+ if (!staNoList.contains(locDto.getAgvStaNo())) {
+ return R.error(locDto.getAgvStaNo() + "璇ョ珯鐐瑰凡鏈夊嚭搴撲换鍔★紝鏃犳硶閫夋嫨璇ョ珯鐐瑰嚭搴�");
}
}
@@ -305,7 +343,7 @@
List<TaskDto> taskDtos = new ArrayList<>();
List<TaskDto> agvTaskDtos = new ArrayList<>();
- generateTaskDto(locDtos,taskDtos,agvTaskDtos);
+ generateTaskDto(locDtos, taskDtos, agvTaskDtos);
//鐢熸垚AGV鍑哄簱浠诲姟
agvWorkService.processOut(agvTaskDtos, getUserId());
@@ -319,7 +357,7 @@
*/
@RequestMapping(value = "/order/merge/preview/auth")
@ManagerAuth
- public R mergePreview(@RequestParam(value = "orderIds[]") List<Long> orderIds){
+ public R mergePreview(@RequestParam(value = "orderIds[]") List<Long> orderIds) {
return R.ok().add(orderService.mergePreview(orderIds));
}
@@ -336,9 +374,9 @@
continue;
}
//鍏堟壘AGV鐨勫簱瀛橈紝濡傛灉杩斿洖鐨刬ssued澶т簬0锛屽垯鍘诲洓椤瑰簱鎵�
- issued = agvLocDetlService.queryStockAndSetLocDto(vo.getMatnr(),vo.getBatch(),JSON.toJSONString(vo.getOrderDtos()),locDtoList,issued, vo.getCsocode(), vo.getIsoseq(),null);
+ issued = agvLocDetlService.queryStockAndSetLocDto(vo.getMatnr(), vo.getBatch(), JSON.toJSONString(vo.getOrderDtos()), locDtoList, issued, vo.getCsocode(), vo.getIsoseq(), null);
//浠庡洓椤瑰簱鐨勫簱瀛橀噷闈㈡壘锛�
- issued = locDetlService.queryStockAndSetLocDto(vo.getMatnr(),vo.getBatch(),JSON.toJSONString(vo.getOrderDtos()),locDtoList,issued, vo.getCsocode(), vo.getIsoseq());
+ issued = locDetlService.queryStockAndSetLocDto(vo.getMatnr(), vo.getBatch(), JSON.toJSONString(vo.getOrderDtos()), locDtoList, issued, vo.getCsocode(), vo.getIsoseq());
if (issued > 0) {
LocDto locDto = new LocDto(null, vo.getMatnr(), vo.getMaktx(), vo.getBatch(), JSON.toJSONString(vo.getOrderDtos()), issued);
@@ -356,21 +394,23 @@
/*
鐢熸垚鍑哄簱浠诲姟dto
*/
- private void generateTaskDto(List<LocDto> locDtos, List<TaskDto> taskDtos, List<TaskDto> agvTaskDtos){
+ private void generateTaskDto(List<LocDto> locDtos, List<TaskDto> taskDtos, List<TaskDto> agvTaskDtos) {
// 鏍规嵁 锛堝簱浣� & 鍑哄簱绔欙級 鍒嗙粍锛� 鐞嗘兂鐘舵�侊細涓�缁勪负涓�娆″嚭搴撲换鍔�
for (LocDto locDto : locDtos) {
- if (locDto.isLack()) { continue; }
+ if (locDto.isLack()) {
+ continue;
+ }
//AGV搴�
- if(!Cools.isEmpty(locDto.getAgvStaNos())){
+ if (!Cools.isEmpty(locDto.getAgvStaNos())) {
//骞冲簱
- if("鏃犻渶绔欑偣".equals(locDto.getAgvStaNo())){
+ if ("鏃犻渶绔欑偣".equals(locDto.getAgvStaNo())) {
generateManPakout(locDto);
- }else {
- generateTaskDtoForAgv(locDto,agvTaskDtos);
+ } else {
+ generateTaskDtoForAgv(locDto, agvTaskDtos);
}
//鍥涢」搴�
- }else{
- generateTaskDtoForBase(locDto,taskDtos);
+ } else {
+ generateTaskDtoForBase(locDto, taskDtos);
}
}
@@ -379,10 +419,10 @@
/*
鐢熸垚AGV鐨勪换鍔to
*/
- private void generateTaskDtoForAgv(LocDto locDto, List<TaskDto> agvTaskDtos){
+ private void generateTaskDtoForAgv(LocDto locDto, List<TaskDto> agvTaskDtos) {
// 闃叉鍓嶇椤甸潰鎻愬彇搴撲綅淇℃伅鍚庯紝鍦ㄥ叾浠栧湴鏂瑰璇ュ簱浣嶇敓鎴愪簡鍑哄簱浠诲姟(搴撲綅鐘舵�侀潪F鐘舵��)
AgvLocMast agvLocMast = agvLocMastService.selectById(locDto.getLocNo());
- if(!Cools.isEmpty(agvLocMast) && !agvLocMast.getLocSts().equals("F")){
+ if (!Cools.isEmpty(agvLocMast) && !agvLocMast.getLocSts().equals("F")) {
throw new CoolException("搴撲綅鍙烽潪鍦ㄥ簱鐘舵�侊紝璇烽噸鏂伴�夋嫨鍑哄簱搴撲綅===>>" + locDto.getLocNo());
}
TaskDto taskDto = new TaskDto(locDto.getLocNo(), locDto.getAgvStaNo(), locDto);
@@ -400,10 +440,10 @@
/*
鐢熸垚鍥涢」搴撶殑浠诲姟dto
*/
- private void generateTaskDtoForBase(LocDto locDto, List<TaskDto> taskDtos){
+ private void generateTaskDtoForBase(LocDto locDto, List<TaskDto> taskDtos) {
// 闃叉鍓嶇椤甸潰鎻愬彇搴撲綅淇℃伅鍚庯紝鍦ㄥ叾浠栧湴鏂瑰璇ュ簱浣嶇敓鎴愪簡鍑哄簱浠诲姟(搴撲綅鐘舵�侀潪F鐘舵��)
LocMast locMast = locMastService.selectById(locDto.getLocNo());
- if(!Cools.isEmpty(locMast) && !locMast.getLocSts().equals("F")){
+ if (!Cools.isEmpty(locMast) && !locMast.getLocSts().equals("F")) {
throw new CoolException("搴撲綅鍙烽潪鍦ㄥ簱鐘舵�侊紝璇烽噸鏂伴�夋嫨鍑哄簱搴撲綅===>>" + locDto.getLocNo());
}
@@ -421,40 +461,40 @@
/*
鐢熸垚骞冲簱鎷ｈ揣鍗�
*/
- private void generateManPakout(LocDto locDto){
- ManLocDetl manLocDetl = manLocDetlService.selectItem(locDto.getLocNo(), locDto.getMatnr(), locDto.getBatch(),locDto.getCsocode(),locDto.getIsoseq(),locDto.getContainerCode());
- if (!Cools.isEmpty(manLocDetl) && !(locDto.getAnfme()>manLocDetl.getAnfme())) {
+ private void generateManPakout(LocDto locDto) {
+ ManLocDetl manLocDetl = manLocDetlService.selectItem(locDto.getLocNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getCsocode(), locDto.getIsoseq(), locDto.getContainerCode());
+ if (!Cools.isEmpty(manLocDetl) && !(locDto.getAnfme() > manLocDetl.getAnfme())) {
manLocDetl.setStatus(0);
- manLocDetlService.update(manLocDetl, new EntityWrapper<ManLocDetl>().eq("loc_no", manLocDetl.getLocNo()).eq("matnr",manLocDetl.getMatnr()));
+ manLocDetlService.update(manLocDetl, new EntityWrapper<ManLocDetl>().eq("loc_no", manLocDetl.getLocNo()).eq("matnr", manLocDetl.getMatnr()));
//addPakOUT 鐢熸垚鎷ｈ揣鍗曟垚鍔�
if (addPakOUT(locDto).equals(R.ok())) {
Order order = orderService.selectByNo(locDto.getOrderNo());
- if (Cools.isEmpty(order)){
- throw new CoolException("鏌ヨ璁㈠崟澶辫触锛岃鑱旂郴绠＄悊鍛�"+locDto.getOrderNo());
+ if (Cools.isEmpty(order)) {
+ throw new CoolException("鏌ヨ璁㈠崟澶辫触锛岃鑱旂郴绠＄悊鍛�" + locDto.getOrderNo());
}
- if (order.getSettle()==1){
- if (!orderService.updateSettle(order.getId(),2L,null)){
- throw new CoolException("淇敼璁㈠崟鐘舵�佸け璐ワ紝璇疯仈绯荤鐞嗗憳"+locDto.getOrderNo());
+ if (order.getSettle() == 1) {
+ if (!orderService.updateSettle(order.getId(), 2L, null)) {
+ throw new CoolException("淇敼璁㈠崟鐘舵�佸け璐ワ紝璇疯仈绯荤鐞嗗憳" + locDto.getOrderNo());
}
}
OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("order_no", locDto.getOrderNo()).eq("matnr", locDto.getMatnr()));
- if (Cools.isEmpty(orderDetl)){
- throw new CoolException("鏌ヨ璁㈠崟鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�"+locDto.getOrderNo()+locDto.getMatnr());
+ if (Cools.isEmpty(orderDetl)) {
+ throw new CoolException("鏌ヨ璁㈠崟鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�" + locDto.getOrderNo() + locDto.getMatnr());
}
orderDetl.setQty(orderDetl.getQty() + locDto.getAnfme());
- if (!orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>().eq("order_no", locDto.getOrderNo()).eq("matnr", locDto.getMatnr()))){
- throw new CoolException("淇敼璁㈠崟鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�"+locDto.getOrderNo()+locDto.getMatnr());
+ if (!orderDetlService.update(orderDetl, new EntityWrapper<OrderDetl>().eq("order_no", locDto.getOrderNo()).eq("matnr", locDto.getMatnr()))) {
+ throw new CoolException("淇敼璁㈠崟鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�" + locDto.getOrderNo() + locDto.getMatnr());
}
}
- }else {
+ } else {
throw new CoolException("搴撳瓨涓嶈冻");
}
}
- private R addPakOUT(LocDto locDto){
- ManPakOut manPakOut=new ManPakOut();
- manPakOut.setWrkNo(locDto.getOrderNo()+"-"+System.currentTimeMillis());
- manPakOut.setWrkSts((long)1);
+ private R addPakOUT(LocDto locDto) {
+ ManPakOut manPakOut = new ManPakOut();
+ manPakOut.setWrkNo(locDto.getOrderNo() + "-" + System.currentTimeMillis());
+ manPakOut.setWrkSts((long) 1);
manPakOut.setAnfme(locDto.getAnfme());
manPakOut.setLocNo(locDto.getLocNo());
manPakOut.setMatnr(locDto.getMatnr());
@@ -472,9 +512,9 @@
manPakOut.setIsoseq(locDto.getIsoseq());
ManPakOut manPakOutExist = manPakOutService.selectOne(new EntityWrapper<ManPakOut>().eq("doc_num", locDto.getOrderNo()));
- if (Cools.isEmpty(manPakOutExist)){
+ if (Cools.isEmpty(manPakOutExist)) {
manPakOut.setName(locDto.getMaktx());
- }else{
+ } else {
manPakOut.setUuid(manPakOutExist.getUuid());
}
manPakOutService.insert(manPakOut);
@@ -492,12 +532,14 @@
/*
璁㈠崟棰勬牎楠� ===>> 1.璁㈠崟鐘舵�侊紱 2.璁㈠崟甯﹀嚭鏁伴噺
*/
- private List<OrderDto> orderPreVerification(List<LocDto> locDtos){
+ private List<OrderDto> orderPreVerification(List<LocDto> locDtos) {
List<OrderDto> orderDtos = new ArrayList<>();
for (LocDto locDto : locDtos) {
if (!isJSON(locDto.getOrderNo())) {
- //if (!Cools.isEmpty(locDto.getOrderNo())) {
- if (Cools.isEmpty(locDto.getOrderNo())) { continue; }
+ //if (!Cools.isEmpty(locDto.getOrderNo())) {
+ if (Cools.isEmpty(locDto.getOrderNo())) {
+ continue;
+ }
OrderDto orderDto = new OrderDto(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(), locDto.getAnfme());
if (OrderDto.has(orderDtos, orderDto)) {
OrderDto dto = OrderDto.find(orderDtos, orderDto);
diff --git a/src/main/java/com/zy/asrs/mapper/AgvBasDevpMapper.java b/src/main/java/com/zy/asrs/mapper/AgvBasDevpMapper.java
index 336db4b..2635653 100644
--- a/src/main/java/com/zy/asrs/mapper/AgvBasDevpMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/AgvBasDevpMapper.java
@@ -53,6 +53,7 @@
"FROM\n" +
"\tagv_bas_devp\n" +
"\tLEFT JOIN agv_wrk_mast ON agv_bas_devp.dev_no = agv_wrk_mast.source_loc_no \n" +
+ "or agv_bas_devp.dev_no = agv_wrk_mast.loc_no \n" +
"WHERE\n" +
"\tagv_wrk_mast.loc_no IS NULL \n" +
"\tAND agv_bas_devp.loc_type1 = #{locType} \n" +
diff --git a/src/main/java/com/zy/asrs/mapper/AgvLocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/AgvLocDetlMapper.java
index 996af28..379154f 100644
--- a/src/main/java/com/zy/asrs/mapper/AgvLocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/AgvLocDetlMapper.java
@@ -43,9 +43,13 @@
Double selectSumAnfmeByMatnrProcessed2(@Param("matnr") String matnr,@Param("threeCode") String threeCode);
- @Select("select sum(a.anfme) as sum from agv_loc_detl a left join agv_loc_mast b on a.loc_no = b.loc_no where (b.loc_sts = 'F' or b.loc_sts = 'R') and b.floor = #{floor} and a.matnr = #{matnr} AND a.three_code = #{threeCode} AND a.process_sts != 1")
+ @Select("select sum(a.anfme) as sum from agv_loc_detl a left join agv_loc_mast b on a.loc_no = b.loc_no where b.floor = 1 AND a.matnr = #{matnr} AND a.three_code = #{threeCode} AND a.process_sts != 1 AND (b.loc_sts = 'F' or b.loc_sts = 'R')")
Double selectSumAnfmeByMatnr2(@Param("matnr") String matnr,@Param("threeCode") String threeCode,@Param("floor") Integer floor);
+ @Select("select sum(a.anfme) as sum from agv_loc_detl a left join agv_loc_mast b on a.loc_no = b.loc_no where (b.loc_sts = 'F' or b.loc_sts = 'R') AND b.floor != 2 AND a.matnr = #{matnr} AND a.three_code = #{threeCode} AND a.process_sts != 1")
+ Double selectSumAnfmeByMatnr3(@Param("matnr") String matnr,@Param("threeCode") String threeCode,@Param("floor") Integer floor);
+
+
@Select("select sum(a.anfme) as sum from agv_loc_detl a left join agv_loc_mast b on a.loc_no = b.loc_no where (b.loc_sts = 'F' or b.loc_sts = 'R') and b.floor != #{floor} and a.matnr = #{matnr} AND a.three_code = #{threeCode} AND a.process_sts != 1")
Double getSumAnfmeback(@Param("matnr") String matnr,@Param("threeCode") String threeCode,@Param("floor") Integer floor);
diff --git a/src/main/java/com/zy/asrs/service/AgvLocDetlService.java b/src/main/java/com/zy/asrs/service/AgvLocDetlService.java
index 6d5f96d..0e3bcf5 100644
--- a/src/main/java/com/zy/asrs/service/AgvLocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/AgvLocDetlService.java
@@ -33,9 +33,11 @@
Double getSumAnfmeProcessed2(String matnr, String threeCode);
-
Double getSumAnfmeDb(String matnr, String threeCode, Integer floor);
+
+ Double getSumAnfmeDb2(String matnr, String threeCode, Integer floor);
+
Double getSumAnfmeback(String matnr, String threeCode, Integer floor);
Integer sum();
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 5aa3083..763e2ae 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -241,6 +241,11 @@
}
@Override
+ public Double getSumAnfmeDb2(String matnr, String threeCode, Integer floor) {
+ return this.baseMapper.selectSumAnfmeByMatnr3(matnr, threeCode, floor);
+ }
+
+ @Override
public Double getSumAnfmeback(String matnr, String threeCode, Integer floor) {
return this.baseMapper.getSumAnfmeback(matnr, threeCode, floor);
}
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 8d226bd..ed6a8de 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvMobileServiceImpl.java
@@ -516,7 +516,7 @@
//璐ф灦缂栫爜
mast.setBarcode(agvLocMast.getBarcode());
//璐ф灦绫诲瀷
- mast.setWhsType(30);
+ mast.setWhsType(Integer.parseInt(agvLocMast.getBarcode().substring(0,2)));
mast.setAppeUser(userId);
mast.setAppeTime(now);
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 f3158bd..0aec48a 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -579,16 +579,20 @@
agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, false);
}
} else {
- List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().like("loc_no", "02F1").like("source_loc_no", "F1"));
- if (Integer.parseInt(config.getValue()) <= agvWrkMasts.size()) {
- agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true);
+ if (station.endsWith("F4") && locType == 3) {
+ agvLocMast = agvCommonService.getLocNo(locType, 1, false, false);
} else {
- if (isCurrLev.get()) {
+ List<AgvWrkMast> agvWrkMasts = agvWrkMastService.selectList(new EntityWrapper<AgvWrkMast>().like("loc_no", "02F1").like("source_loc_no", "F1"));
+ if (Integer.parseInt(config.getValue()) <= agvWrkMasts.size()) {
agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true);
} else {
- agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, false);
+ if (isCurrLev.get()) {
+ agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, true);
+ } else {
+ agvLocMast = agvCommonService.getLocNo(locType, agvBasDevp.getFloor(), false, false);
+ }
+ //agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,false);
}
- //agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),false,false);
}
}
diff --git a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
index 538c254..7f31374 100644
--- a/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AutoMoveScheduler.java
@@ -215,20 +215,48 @@
*/
@Scheduled(cron = "0/30 * * * * ? ")
private void autoEmptyBack4() {
- // 鏌ヨ 涓嶄负1妤肩殑绌鸿揣鏋�
List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(new EntityWrapper<AgvLocMast>()
// TODO 鍥涙湡
.eq("loc_sts", "D").eq("loc_type1", 3).andNew().ne("floor", 1).or().ne("lev1", 1));
if (agvLocMasts.isEmpty()) {
return;
}
+
+
for (AgvLocMast agvLocMast : agvLocMasts) {
- try {
- autoMoveHandler.autoEmptyBack4(agvLocMast);
- } catch (Exception e) {
- log.error("搴撲綅鍙�" + agvLocMast.getLocNo() + "绌烘澘鑷姩鍥炲簱 搴撲綅-鎺ラ┏鐐� 搴撲綅-鍚稿杞﹂棿,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細" + e.getMessage());
+ if (agvLocMast.getLocNo().contains("F4")) {
+ Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "RETURN_3_TIME"));
+ boolean flag = false;
+ if (config != null && !Cools.isEmpty(config.getValue())) {
+ try {
+ // 鍒ゆ柇鏄惁鍦ㄦ墽琛屾椂闂村唴
+ ProcesTimeData procesTimeData = JSONObject.parseObject(config.getValue(), ProcesTimeData.class);
+ if (procesTimeData != null && config.getStatus() == 1 && TimeUtils.between(procesTimeData)) {
+ flag = true;
+ }
+ } catch (Exception e) {
+ log.error("6绫诲瀷绌鸿揣鏋惰繑鍥炵殑鎵ц鏃堕棿鐐硅В鏋愬紓甯革細===銆嬪紓甯稿師鍥狅細" + e.getMessage());
+ flag = true;
+ }
+ }
+ if (flag) {
+ try {
+ autoMoveHandler.autoEmptyBack4(agvLocMast);
+ } catch (Exception e) {
+ log.error("搴撲綅鍙�" + agvLocMast.getLocNo() + "绌烘澘鑷姩鍥炲簱 搴撲綅-鎺ラ┏鐐� 搴撲綅-鍚稿杞﹂棿,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細" + e.getMessage());
+ }
+ }
+ } else {
+ try {
+ autoMoveHandler.autoEmptyBack4(agvLocMast);
+ } catch (Exception e) {
+ log.error("搴撲綅鍙�" + agvLocMast.getLocNo() + "绌烘澘鑷姩鍥炲簱 搴撲綅-鎺ラ┏鐐� 搴撲綅-鍚稿杞﹂棿,澶勭悊澶辫触锛�===銆嬪紓甯稿師鍥狅細" + e.getMessage());
+ }
}
+
}
+
+
}
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index c72487c..94e67e3 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -3,8 +3,10 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.Cools;
+import com.zy.asrs.entity.AgvLocDetl;
import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.mapper.OrderDetlMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.task.core.ReturnT;
@@ -65,21 +67,21 @@
List<Order> orders = orderService.selectComplete();
for (Order order : orders) {
//濡傛灉鏄皟鎷ㄥ崟鍒欒繘琛屽垽鏂�
-// if (order.getDocType() == 33) {
-// //鏌ヨ搴撳瓨涓槸鍚﹀瓨鍦ㄨ璁㈠崟鐨勭墿鏂欎俊鎭紝瀛樺湪鍒欎笉澶勭悊璇ヨ鍗�
-// List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
-// Boolean flag = false;
-// for (OrderDetl orderDetl : orderDetlList) {
-// List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("matnr", orderDetl.getMatnr()).eq("three_code", orderDetl.getThreeCode()));
-// if (!Cools.isEmpty(agvLocDetls)) {
-// //鍙鏈変竴椤硅鍗曟槑缁嗗瓨鍦紝鍒欐爣璇嗕负true锛岃烦杩囪璁㈠崟
-// flag = true;
-// }
-// }
-// if (flag) {
-// continue;
-// }
-// }
+ if (order.getDocType() == 33) {
+ //鏌ヨ搴撳瓨涓槸鍚﹀瓨鍦ㄨ璁㈠崟鐨勭墿鏂欎俊鎭紝瀛樺湪鍒欎笉澶勭悊璇ヨ鍗�
+ List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
+ Boolean flag = false;
+ for (OrderDetl orderDetl : orderDetlList) {
+ List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("matnr", orderDetl.getMatnr()).eq("three_code", orderDetl.getThreeCode()));
+ if (!Cools.isEmpty(agvLocDetls)) {
+ //鍙鏈変竴椤硅鍗曟槑缁嗗瓨鍦紝鍒欐爣璇嗕负true锛岃烦杩囪璁㈠崟
+ flag = true;
+ }
+ }
+ if (flag) {
+ continue;
+ }
+ }
ReturnT<String> result = orderSyncHandler.start(order);
if (!result.isSuccess()) {
//log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
diff --git a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
index 0b4fb38..9b17b0a 100644
--- a/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AutoMoveHandler.java
@@ -155,7 +155,8 @@
//璐ф灦缂栫爜
mast.setBarcode(agvLocMast.getBarcode());
//璐ф灦绫诲瀷
- mast.setWhsType(30);
+ mast.setWhsType(Integer.parseInt(agvLocMast.getBarcode().substring(0,2)));
+
// 鐩爣妤煎眰
mast.setPauseMk(agvLocMast.getLocType3().toString());
@@ -190,6 +191,7 @@
updateAgvBasDevp(devpNo, "S", null, agvLocMast.getBarcode());
return SUCCESS;
}
+
private ReturnT<String> doAutoMove2(AgvWrkMast agvWrkMast) {
Date now = new Date();
@@ -323,7 +325,8 @@
//璐ф灦缂栫爜
mast.setBarcode(agvLocMast.getBarcode());
//璐ф灦绫诲瀷
- mast.setWhsType(30);
+ mast.setWhsType(Integer.parseInt(agvLocMast.getBarcode().substring(0,2)));
+
mast.setAppeUser(9527L);
mast.setAppeTime(now);
@@ -460,7 +463,8 @@
//璐ф灦缂栫爜
mast.setBarcode(agvLocMast.getBarcode());
//璐ф灦绫诲瀷
- mast.setWhsType(30);
+ mast.setWhsType(Integer.parseInt(agvLocMast.getBarcode().substring(0,2)));
+
mast.setAppeUser(9527L);
mast.setAppeTime(now);
@@ -544,7 +548,8 @@
//璐ф灦缂栫爜
mast.setBarcode(agvLocMast.getBarcode());
//璐ф灦绫诲瀷
- mast.setWhsType(30);
+ mast.setWhsType(Integer.parseInt(agvLocMast.getBarcode().substring(0,2)));
+
mast.setAppeUser(9527L);
mast.setAppeTime(now);
@@ -585,7 +590,8 @@
//璐ф灦缂栫爜
mast.setBarcode(agvBasDevp.getBarcode());
//璐ф灦绫诲瀷
- mast.setWhsType(30);
+ mast.setWhsType(Integer.parseInt(agvBasDevp.getBarcode().substring(0,2)));
+
mast.setAppeUser(9527L);
mast.setAppeTime(now);
mast.setModiUser(9527L);
@@ -642,7 +648,8 @@
//璐ф灦缂栫爜
mast.setBarcode(agvBasDevp.getBarcode());
//璐ф灦绫诲瀷
- mast.setWhsType(30);
+ mast.setWhsType(Integer.parseInt(agvBasDevp.getBarcode().substring(0,2)));
+
mast.setAppeUser(9527L);
mast.setAppeTime(now);
mast.setModiUser(9527L);
@@ -697,7 +704,8 @@
//璐ф灦缂栫爜
mast.setBarcode(agvLocMast.getBarcode());
//璐ф灦绫诲瀷
- mast.setWhsType(30);
+ mast.setWhsType(Integer.parseInt(agvLocMast.getBarcode().substring(0,2)));
+
mast.setAppeUser(9527L);
mast.setAppeTime(now);
@@ -779,7 +787,8 @@
//璐ф灦缂栫爜
mast.setBarcode(agvLocMast.getBarcode());
//璐ф灦绫诲瀷
- mast.setWhsType(30);
+ mast.setWhsType(Integer.parseInt(agvLocMast.getBarcode().substring(0,2)));
+
mast.setAppeUser(9527L);
mast.setAppeTime(now);
diff --git a/src/main/java/com/zy/system/controller/RoleController.java b/src/main/java/com/zy/system/controller/RoleController.java
index b5187e8..3a32c47 100644
--- a/src/main/java/com/zy/system/controller/RoleController.java
+++ b/src/main/java/com/zy/system/controller/RoleController.java
@@ -150,7 +150,7 @@
// }
}
- Page<Role> page = roleService.selectPage(new Page<>(0, 10), wrapper);
+ Page<Role> page = roleService.selectPage(new Page<>(0, 1000), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
for (Role role : page.getRecords()){
Map<String, Object> map = new HashMap<>();
diff --git a/src/main/resources/application-loc.yml b/src/main/resources/application-loc.yml
index 37be624..029addb 100644
--- a/src/main/resources/application-loc.yml
+++ b/src/main/resources/application-loc.yml
@@ -11,7 +11,7 @@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
#url: jdbc:sqlserver://127.0.0.1:1433;databasename=phyzasrs
- url: jdbc:sqlserver://192.168.108.248:1433;databasename=phyzasrs
+ url: jdbc:sqlserver://192.168.108:248;databasename=phyzasrs
username: sa
password: sa@123
mvc:
--
Gitblit v1.9.1