From 405b119c269600a7a79676a6a75bbef2502ca34c Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 13 六月 2024 10:34:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 4bc7fbd..693e377 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -41,6 +41,8 @@
@Autowired
private RowLastnoService rowLastnoService;
@Autowired
+ private RowLastnoTypeService rowLastnoTypeService;
+ @Autowired
private BasCrnpService basCrnpService;
@Autowired
private StaDescService staDescService;
@@ -121,11 +123,38 @@
public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, LocTypeDto locTypeDto) {
try{
whsType = Utils.GetWhsType(sourceStaNo);
+ RowLastno rowLastno = rowLastnoService.selectById(whsType);
+ RowLastnoType rowLastnoType = rowLastnoTypeService.selectById(rowLastno.getTypeId());
+ /**
+ * 搴撳瀷 0: 鏍囧噯鍫嗗灈鏈哄簱 1: 骞冲簱 2: 绌挎鏉� 3: 鍥涘悜杞� 4: AGV 5: 鏈煡
+ */
+ switch (rowLastnoType.getType()){
+ case 0:
+ return getLocNoRun(whsType,staDescId,sourceStaNo,matnr,batch,grade,0,locTypeDto,0);
+ case 1:
+ log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�",sourceStaNo);
+ break;
+ case 2:
+ log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�",sourceStaNo);
+ break;
+ case 3:
+ log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�",sourceStaNo);
+ break;
+ case 4:
+ log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�",sourceStaNo);
+ break;
+ case 5:
+ log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�",sourceStaNo);
+ break;
+ default:
+ log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�",sourceStaNo);
+ break;
+ }
+
}catch (Exception e){
log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�",sourceStaNo);
- return null;
}
- return getLocNoRun(whsType,staDescId,sourceStaNo,matnr,batch,grade,0,locTypeDto,0);
+ return null;
}
/**
--
Gitblit v1.9.1