From 6a478880c4aa9c62e960a72591b1eb3ea92c223f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 24 十二月 2020 15:33:17 +0800
Subject: [PATCH] #
---
/dev/null | 80 --------------------------
src/main/java/com/zy/common/service/CommonService.java | 83 ++++++---------------------
2 files changed, 19 insertions(+), 144 deletions(-)
diff --git a/src/main/java/basCrnOpt.sql b/src/main/java/basCrnOpt.sql
deleted file mode 100644
index 932b314..0000000
--- a/src/main/java/basCrnOpt.sql
+++ /dev/null
@@ -1,21 +0,0 @@
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basErrLog/basErrLog.html', N'宸ヤ綔妗ｅ紓甯告棩蹇�', '251', '2', '11', '1');
-
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basErrLog#view', N'鏌ヨ', '20366', '3', '0', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basErrLog#btn-add', N'鏂板', '20366', '3', '1', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basErrLog#btn-edit', N'缂栬緫', '20366', '3', '2', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basErrLog#btn-delete', N'鍒犻櫎', '20366', '3', '3', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basErrLog#btn-export', N'瀵煎嚭', '20366', '3', '4', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basErrLog#btn-into', N'瀵煎叆', '20366', '3', '5', '1');
-
-
--- sqlserver
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basCrnOpt/basCrnOpt.html', N'鍫嗗灈鏈轰笅琛屾棩蹇�', '251', '2', '12', '1');
-
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basCrnOpt#view', N'鏌ヨ', '20373', '3', '0', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basCrnOpt#btn-add', N'鏂板', '20373', '3', '1', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basCrnOpt#btn-edit', N'缂栬緫', '20373', '3', '2', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basCrnOpt#btn-delete', N'鍒犻櫎', '20373', '3', '3', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basCrnOpt#btn-export', N'瀵煎嚭', '20373', '3', '4', '1');
-insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basCrnOpt#btn-into', N'瀵煎叆', '20373', '3', '5', '1');
-
-淇敼wrk_mast鍜寃rk_mast_log鐨刴anu_type闀垮害涓�255
\ No newline at end of file
diff --git a/src/main/java/basErrLog.sql b/src/main/java/basErrLog.sql
deleted file mode 100644
index 2c50eeb..0000000
--- a/src/main/java/basErrLog.sql
+++ /dev/null
@@ -1,80 +0,0 @@
-
-/****** Object: Table [dbo].[asr_bas_err_log] Script Date: 2020/12/21 14:43:29 ******/
-SET ANSI_NULLS ON
-GO
-SET QUOTED_IDENTIFIER ON
-GO
-SET ANSI_PADDING ON
-GO
-CREATE TABLE [dbo].[asr_bas_err_log](
- [id] [bigint] IDENTITY(1,1) NOT NULL,
- [uuid] [varchar](255) NULL,
- [wrk_no] [int] NULL,
- [start_time] [datetime] NULL,
- [end_time] [datetime] NULL,
- [wrk_sts] [bigint] NULL,
- [io_type] [int] NULL,
- [crn_no] [int] NULL,
- [plc_no] [int] NULL,
- [loc_no] [varchar](7) NULL,
- [sta_no] [int] NULL,
- [source_sta_no] [int] NULL,
- [source_loc_no] [varchar](7) NULL,
- [barcode] [varchar](255) NULL,
- [err_code] [int] NULL,
- [error] [varchar](255) NULL,
- [status] [int] NULL,
- [create_time] [datetime] NULL,
- [create_by] [bigint] NULL,
- [update_time] [datetime] NULL,
- [update_by] [bigint] NULL,
- [memo] [varchar](255) NULL
-) ON [PRIMARY]
-
-GO
-SET ANSI_PADDING OFF
-GO
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'asr_bas_err_log', @level2type=N'COLUMN',@level2name=N'id'
-GO
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'缂栧彿' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'asr_bas_err_log', @level2type=N'COLUMN',@level2name=N'uuid'
-GO
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'宸ヤ綔鍙�' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'asr_bas_err_log', @level2type=N'COLUMN',@level2name=N'wrk_no'
-GO
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'鍙戠敓鏃堕棿' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'asr_bas_err_log', @level2type=N'COLUMN',@level2name=N'start_time'
-GO
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'缁撴潫鏃堕棿' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'asr_bas_err_log', @level2type=N'COLUMN',@level2name=N'end_time'
-GO
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'宸ヤ綔鐘舵�乕asr_bas_wrk_status]' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'asr_bas_err_log', @level2type=N'COLUMN',@level2name=N'wrk_sts'
-GO
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'鍏ュ嚭搴撶被鍨媅asr_bas_wrk_iotype]' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'asr_bas_err_log', @level2type=N'COLUMN',@level2name=N'io_type'
-GO
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'鍫嗗灈鏈�' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'asr_bas_err_log', @level2type=N'COLUMN',@level2name=N'crn_no'
-GO
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'plc' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'asr_bas_err_log', @level2type=N'COLUMN',@level2name=N'plc_no'
-GO
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'鐩爣搴撲綅' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'asr_bas_err_log', @level2type=N'COLUMN',@level2name=N'loc_no'
-GO
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'鐩爣绔�' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'asr_bas_err_log', @level2type=N'COLUMN',@level2name=N'sta_no'
-GO
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'婧愮珯' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'asr_bas_err_log', @level2type=N'COLUMN',@level2name=N'source_sta_no'
-GO
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'婧愬簱浣�' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'asr_bas_err_log', @level2type=N'COLUMN',@level2name=N'source_loc_no'
-GO
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'鏉＄爜' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'asr_bas_err_log', @level2type=N'COLUMN',@level2name=N'barcode'
-GO
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'寮傚父鐮�' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'asr_bas_err_log', @level2type=N'COLUMN',@level2name=N'err_code'
-GO
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'寮傚父' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'asr_bas_err_log', @level2type=N'COLUMN',@level2name=N'error'
-GO
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'寮傚父鎯呭喌{1:寰呭鐞�,2:宸蹭慨澶峿' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'asr_bas_err_log', @level2type=N'COLUMN',@level2name=N'status'
-GO
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'娣诲姞鏃堕棿' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'asr_bas_err_log', @level2type=N'COLUMN',@level2name=N'create_time'
-GO
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'娣诲姞浜哄憳[sys_user]' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'asr_bas_err_log', @level2type=N'COLUMN',@level2name=N'create_by'
-GO
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'淇敼鏃堕棿' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'asr_bas_err_log', @level2type=N'COLUMN',@level2name=N'update_time'
-GO
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'淇敼浜哄憳[sys_user]' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'asr_bas_err_log', @level2type=N'COLUMN',@level2name=N'update_by'
-GO
-EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'澶囨敞' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'asr_bas_err_log', @level2type=N'COLUMN',@level2name=N'memo'
-GO
\ No newline at end of file
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 1986fe9..530f2d5 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.core.common.Arith;
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
@@ -49,20 +48,6 @@
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
- // 绫诲瀷
- switch (wrkMk) {
- case 0: // 鍏ュ簱 1 - 3000
- break;
- case 1: // 鎷ｆ枡/骞舵澘/鐩樼偣 3001 - 6000
- break;
- case 2: // 鍑哄簱 6001 -9000
- break;
- case 3: // 鍏朵粬 9001 -9999
- break;
- default:
- break;
- }
-
int workNo = wrkLastno.getWrkNo();
int sNo = wrkLastno.getSNo();
int eNo = wrkLastno.getENo();
@@ -104,6 +89,11 @@
// 鐢熸垚宸ヤ綔鍙�
int workNo = getWorkNo(WorkNoType.getWorkNoType(staDescId));
startupDto.setWorkNo(workNo);
+ if (sourceStaNo < 100) {
+ whsType = 1;
+ } else {
+ whsType = 2;
+ }
RowLastno rowLastno = rowLastnoService.selectById(whsType);
if (Cools.isEmpty(rowLastno)) {
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
@@ -112,33 +102,20 @@
int curRow = rowLastno.getCurrentRow();
int sRow = rowLastno.getsRow();
int eRow = rowLastno.geteRow();
- int crn_qty = rowLastno.getCrnQty();
- int rowCount = eRow - sRow + 1;
- // 鐩爣鍫嗗灈鏈哄彿
- int crnNo = 0;
- // 鐩爣搴撲綅
- LocMast locMast = null;
- // 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
- if (null == locMast) {
- // 鑾峰彇鐩爣绔欐墍鍦ㄨ揣鏋舵帓鍙� todo:luxiaotao
- if (curRow == sRow) {
- curRow = eRow;
- } else {
- curRow = sRow;
- }
- crnNo = whsType;
-// Shelves shelves = new Shelves(rowCount, crn_qty);
-// curRow = shelves.start(curRow);
-// if (curRow < 0) {
-// throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
-// }
-// for (List<Integer> node : shelves.nodes){
-// if (node.contains(curRow)) {
-// crnNo = shelves.nodes.indexOf(node) + 1;
-// break;
-// }
-// }
+ // 鑾峰彇鐩爣绔欐墍鍦ㄨ揣鏋舵帓鍙�
+ curRow = curRow == sRow ? eRow : sRow;
+ // 鐩爣鍫嗗灈鏈哄彿
+ int crnNo;
+ switch (whsType) {
+ case 1:
+ crnNo = 1;
+ break;
+ case 2:
+ crnNo = 2;
+ break;
+ default:
+ throw new CoolException("妫�绱㈠簱浣� -- 妫�绱㈠爢鍨涙満鍙峰け璐�");
}
basCrnpService.checkSiteStatus(crnNo);
@@ -155,9 +132,7 @@
int inQty = staNo.getInQty()==null?0:staNo.getInQty();
if (staNo.getAutoing().equals("Y") && inQty<2) {
// 鏌ユ壘搴撲綅
- if (locMast == null) {
- locMast = locMastService.queryFreeLocMast(curRow);
- }
+ LocMast locMast = locMastService.queryFreeLocMast(curRow);
if (Cools.isEmpty(locMast)) {
throw new CoolException("娌℃湁绌哄簱浣�");
}
@@ -179,26 +154,6 @@
throw new CoolException(rowLastno.getWhsType()+"鍙峰簱浣嶆帓鍙峰垎閰嶈鍒欎笉鍙敤");
}
return startupDto;
- }
-
- public static void main(String[] args) {
- System.out.println(Arith.remainder(1, 4));
- System.out.println("0200201".substring(0, 2));
- String locNo = "0800201";
- int row = Integer.parseInt(locNo.substring(0, 2));
- double remainder = Arith.remainder(row, 4);
- int targetRow;
- if (remainder == 1) {
- // 寰楀埌褰撳墠搴撲綅鐨勫鍥村簱浣�
- targetRow = row + 1;
- } else if (remainder == 0) {
- // 寰楀埌褰撳墠搴撲綅鐨勫唴鍥村簱浣�
- targetRow = row - 1;
- } else {
- return;
- }
- String zerofill = zerofill(String.valueOf(targetRow), 2)+locNo.substring(2);
- System.out.println(zerofill);
}
public static String zerofill(String msg, Integer count) {
--
Gitblit v1.9.1