From d05dd9bd1e32e95108b0a299ccf71459c685c222 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期三, 19 六月 2024 14:25:59 +0800
Subject: [PATCH] 模块名称修改
---
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceProductionLog.java | 8
pms-parent/pms-global/src/main/resources/mapper/StaWipSnExMapper.xml | 24 +-
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkHistory.java | 8
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaRepairInfo.java | 8
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaDeviceProductionLogMapper.java | 27 ++
pms-parent/pms-global/src/main/resources/application-global.yml | 2
pms-parent/pms-web-station/pom.xml | 4
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java | 8
pms-parent/pms-global/src/main/resources/mapper/StaDevOpsTaskClaimInfoMapper.xml | 24 +-
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaWipSnEx.java | 8
pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeMapper.xml | 24 +-
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLast.java | 8
pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml | 24 +-
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaDeviceLastMapper.java | 27 ++
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaDeviceLifeMapper.java | 27 ++
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java | 2
pms-parent/pms-global/src/main/resources/mapper/StaRepairInfoMapper.xml | 24 +-
pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml | 24 +-
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDevOpsTaskClaimInfo.java | 8
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLife.java | 14
pms-parent/pms-web-station/src/main/resources/application.yml | 6
/dev/null | 154 --------------
pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkHistoryMapper.xml | 24 +-
pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml | 24 +-
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepCtrl.java | 2
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaRepairInfoMapper.java | 27 ++
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaWipSnExMapper.java | 27 ++
pms-parent/pms-web-station/src/main/resources/log4j2.yml | 2
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaAssemblyWorkHistoryMapper.java | 27 ++
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaDevOpsTaskClaimInfoMapper.java | 27 ++
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaAssemblyWorkLastMapper.java | 27 ++
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/PmsStationApplication.java | 8
32 files changed, 360 insertions(+), 298 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaAssemblyWorkHistoryMapper.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaAssemblyWorkHistoryMapper.java
new file mode 100644
index 0000000..c7e1ea6
--- /dev/null
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaAssemblyWorkHistoryMapper.java
@@ -0,0 +1,27 @@
+package com.dy.pmsGlobal.daoSta;
+
+import com.dy.pmsGlobal.pojoSta.StaAssemblyWorkHistory;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @author User
+* @description 閽堝琛ㄣ�恠ta_assembly_work_history(鐢熶骇绾跨敓浜т换鍔¤棰嗚〃)銆戠殑鏁版嵁搴撴搷浣淢apper
+* @createDate 2024-06-19 14:21:17
+* @Entity com.dy.pmsGlobal.pojoSta.StaAssemblyWorkHistory
+*/
+@Mapper
+public interface StaAssemblyWorkHistoryMapper {
+
+ int deleteByPrimaryKey(Long id);
+
+ int insert(StaAssemblyWorkHistory record);
+
+ int insertSelective(StaAssemblyWorkHistory record);
+
+ StaAssemblyWorkHistory selectByPrimaryKey(Long id);
+
+ int updateByPrimaryKeySelective(StaAssemblyWorkHistory record);
+
+ int updateByPrimaryKey(StaAssemblyWorkHistory record);
+
+}
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaAssemblyWorkLastMapper.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaAssemblyWorkLastMapper.java
new file mode 100644
index 0000000..1a315d7
--- /dev/null
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaAssemblyWorkLastMapper.java
@@ -0,0 +1,27 @@
+package com.dy.pmsGlobal.daoSta;
+
+import com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @author User
+* @description 閽堝琛ㄣ�恠ta_assembly_work_last(鐢熶骇绾跨敓浜т换鍔¤棰嗚〃)銆戠殑鏁版嵁搴撴搷浣淢apper
+* @createDate 2024-06-19 14:21:17
+* @Entity com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast
+*/
+@Mapper
+public interface StaAssemblyWorkLastMapper {
+
+ int deleteByPrimaryKey(Long id);
+
+ int insert(StaAssemblyWorkLast record);
+
+ int insertSelective(StaAssemblyWorkLast record);
+
+ StaAssemblyWorkLast selectByPrimaryKey(Long id);
+
+ int updateByPrimaryKeySelective(StaAssemblyWorkLast record);
+
+ int updateByPrimaryKey(StaAssemblyWorkLast record);
+
+}
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaDevOpsTaskClaimInfoMapper.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaDevOpsTaskClaimInfoMapper.java
new file mode 100644
index 0000000..5541143
--- /dev/null
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaDevOpsTaskClaimInfoMapper.java
@@ -0,0 +1,27 @@
+package com.dy.pmsGlobal.daoSta;
+
+import com.dy.pmsGlobal.pojoSta.StaDevOpsTaskClaimInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @author User
+* @description 閽堝琛ㄣ�恠ta_dev_ops_task_claim_info(瀹夎杩愮淮浠诲姟璁ら琛�)銆戠殑鏁版嵁搴撴搷浣淢apper
+* @createDate 2024-06-19 14:21:17
+* @Entity com.dy.pmsGlobal.pojoSta.StaDevOpsTaskClaimInfo
+*/
+@Mapper
+public interface StaDevOpsTaskClaimInfoMapper {
+
+ int deleteByPrimaryKey(Long id);
+
+ int insert(StaDevOpsTaskClaimInfo record);
+
+ int insertSelective(StaDevOpsTaskClaimInfo record);
+
+ StaDevOpsTaskClaimInfo selectByPrimaryKey(Long id);
+
+ int updateByPrimaryKeySelective(StaDevOpsTaskClaimInfo record);
+
+ int updateByPrimaryKey(StaDevOpsTaskClaimInfo record);
+
+}
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaDeviceLastMapper.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaDeviceLastMapper.java
new file mode 100644
index 0000000..0ffcabb
--- /dev/null
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaDeviceLastMapper.java
@@ -0,0 +1,27 @@
+package com.dy.pmsGlobal.daoSta;
+
+import com.dy.pmsGlobal.pojoSta.StaDeviceLast;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @author User
+* @description 閽堝琛ㄣ�恠ta_device_last(璁惧鏈�鏂扮姸鎬佽〃)銆戠殑鏁版嵁搴撴搷浣淢apper
+* @createDate 2024-06-19 14:21:17
+* @Entity com.dy.pmsGlobal.pojoSta.StaDeviceLast
+*/
+@Mapper
+public interface StaDeviceLastMapper {
+
+ int deleteByPrimaryKey(Long id);
+
+ int insert(StaDeviceLast record);
+
+ int insertSelective(StaDeviceLast record);
+
+ StaDeviceLast selectByPrimaryKey(Long id);
+
+ int updateByPrimaryKeySelective(StaDeviceLast record);
+
+ int updateByPrimaryKey(StaDeviceLast record);
+
+}
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaDeviceLifeMapper.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaDeviceLifeMapper.java
new file mode 100644
index 0000000..6a131aa
--- /dev/null
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaDeviceLifeMapper.java
@@ -0,0 +1,27 @@
+package com.dy.pmsGlobal.daoSta;
+
+import com.dy.pmsGlobal.pojoSta.StaDeviceLife;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @author User
+* @description 閽堝琛ㄣ�恠ta_device_life(璁惧鐢熷懡鍛ㄦ湡琛�)銆戠殑鏁版嵁搴撴搷浣淢apper
+* @createDate 2024-06-19 14:21:17
+* @Entity com.dy.pmsGlobal.pojoSta.StaDeviceLife
+*/
+@Mapper
+public interface StaDeviceLifeMapper {
+
+ int deleteByPrimaryKey(Long id);
+
+ int insert(StaDeviceLife record);
+
+ int insertSelective(StaDeviceLife record);
+
+ StaDeviceLife selectByPrimaryKey(Long id);
+
+ int updateByPrimaryKeySelective(StaDeviceLife record);
+
+ int updateByPrimaryKey(StaDeviceLife record);
+
+}
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaDeviceProductionLogMapper.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaDeviceProductionLogMapper.java
new file mode 100644
index 0000000..8cf66bc
--- /dev/null
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaDeviceProductionLogMapper.java
@@ -0,0 +1,27 @@
+package com.dy.pmsGlobal.daoSta;
+
+import com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @author User
+* @description 閽堝琛ㄣ�恠ta_device_production_log(璁惧鐢熶骇鏃ュ織琛�)銆戠殑鏁版嵁搴撴搷浣淢apper
+* @createDate 2024-06-19 14:21:17
+* @Entity com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog
+*/
+@Mapper
+public interface StaDeviceProductionLogMapper {
+
+ int deleteByPrimaryKey(Long id);
+
+ int insert(StaDeviceProductionLog record);
+
+ int insertSelective(StaDeviceProductionLog record);
+
+ StaDeviceProductionLog selectByPrimaryKey(Long id);
+
+ int updateByPrimaryKeySelective(StaDeviceProductionLog record);
+
+ int updateByPrimaryKey(StaDeviceProductionLog record);
+
+}
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaRepairInfoMapper.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaRepairInfoMapper.java
new file mode 100644
index 0000000..843f697
--- /dev/null
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaRepairInfoMapper.java
@@ -0,0 +1,27 @@
+package com.dy.pmsGlobal.daoSta;
+
+import com.dy.pmsGlobal.pojoSta.StaRepairInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @author User
+* @description 閽堝琛ㄣ�恠ta_repair_info銆戠殑鏁版嵁搴撴搷浣淢apper
+* @createDate 2024-06-19 14:21:17
+* @Entity com.dy.pmsGlobal.pojoSta.StaRepairInfo
+*/
+@Mapper
+public interface StaRepairInfoMapper {
+
+ int deleteByPrimaryKey(Long id);
+
+ int insert(StaRepairInfo record);
+
+ int insertSelective(StaRepairInfo record);
+
+ StaRepairInfo selectByPrimaryKey(Long id);
+
+ int updateByPrimaryKeySelective(StaRepairInfo record);
+
+ int updateByPrimaryKey(StaRepairInfo record);
+
+}
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaWipSnExMapper.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaWipSnExMapper.java
new file mode 100644
index 0000000..53cd18d
--- /dev/null
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoSta/StaWipSnExMapper.java
@@ -0,0 +1,27 @@
+package com.dy.pmsGlobal.daoSta;
+
+import com.dy.pmsGlobal.pojoSta.StaWipSnEx;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+* @author User
+* @description 閽堝琛ㄣ�恠ta_wip_sn_ex(璁惧鍏宠仈琛�)銆戠殑鏁版嵁搴撴搷浣淢apper
+* @createDate 2024-06-19 14:21:17
+* @Entity com.dy.pmsGlobal.pojoSta.StaWipSnEx
+*/
+@Mapper
+public interface StaWipSnExMapper {
+
+ int deleteByPrimaryKey(Long id);
+
+ int insert(StaWipSnEx record);
+
+ int insertSelective(StaWipSnEx record);
+
+ StaWipSnEx selectByPrimaryKey(Long id);
+
+ int updateByPrimaryKeySelective(StaWipSnEx record);
+
+ int updateByPrimaryKey(StaWipSnEx record);
+
+}
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoAssemblyWorkHistoryMapper.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoAssemblyWorkHistoryMapper.java
deleted file mode 100644
index 748fc78..0000000
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoAssemblyWorkHistoryMapper.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.dy.pmsGlobal.daoWo;
-
-import com.dy.pmsGlobal.pojoWo.WoAssemblyWorkHistory;
-
-/**
-
-* @description 閽堝琛ㄣ�恮o_assembly_work_history(鐢熶骇绾跨敓浜т换鍔¤棰嗚〃)銆戠殑鏁版嵁搴撴搷浣淢apper
-* @createDate 2024-06-19 10:20:29
-* @Entity com.dy.pmsGlobal.pojoWo.WoAssemblyWorkHistory
-*/
-public interface WoAssemblyWorkHistoryMapper {
-
- int deleteByPrimaryKey(Long id);
-
- int insert(WoAssemblyWorkHistory record);
-
- int insertSelective(WoAssemblyWorkHistory record);
-
- WoAssemblyWorkHistory selectByPrimaryKey(Long id);
-
- int updateByPrimaryKeySelective(WoAssemblyWorkHistory record);
-
- int updateByPrimaryKey(WoAssemblyWorkHistory record);
-
-}
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoAssemblyWorkLastMapper.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoAssemblyWorkLastMapper.java
deleted file mode 100644
index 6deb275..0000000
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoAssemblyWorkLastMapper.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.dy.pmsGlobal.daoWo;
-
-import com.dy.pmsGlobal.pojoWo.WoAssemblyWorkLast;
-
-/**
-
-* @description 閽堝琛ㄣ�恮o_assembly_work_last(鐢熶骇绾跨敓浜т换鍔¤棰嗚〃)銆戠殑鏁版嵁搴撴搷浣淢apper
-* @createDate 2024-06-19 10:21:40
-* @Entity com.dy.pmsGlobal.pojoWo.WoAssemblyWorkLast
-*/
-public interface WoAssemblyWorkLastMapper {
-
- int deleteByPrimaryKey(Long id);
-
- int insert(WoAssemblyWorkLast record);
-
- int insertSelective(WoAssemblyWorkLast record);
-
- WoAssemblyWorkLast selectByPrimaryKey(Long id);
-
- int updateByPrimaryKeySelective(WoAssemblyWorkLast record);
-
- int updateByPrimaryKey(WoAssemblyWorkLast record);
-
-}
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoDevOpsTaskClaimInfoMapper.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoDevOpsTaskClaimInfoMapper.java
deleted file mode 100644
index 3743842..0000000
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoDevOpsTaskClaimInfoMapper.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.dy.pmsGlobal.daoWo;
-
-import com.dy.pmsGlobal.pojoWo.WoDevOpsTaskClaimInfo;
-
-/**
-
-* @description 閽堝琛ㄣ�恮o_dev_ops_task_claim_info(瀹夎杩愮淮浠诲姟璁ら琛�)銆戠殑鏁版嵁搴撴搷浣淢apper
-* @createDate 2024-06-19 10:21:40
-* @Entity com.dy.pmsGlobal.pojoWo.WoDevOpsTaskClaimInfo
-*/
-public interface WoDevOpsTaskClaimInfoMapper {
-
- int deleteByPrimaryKey(Long id);
-
- int insert(WoDevOpsTaskClaimInfo record);
-
- int insertSelective(WoDevOpsTaskClaimInfo record);
-
- WoDevOpsTaskClaimInfo selectByPrimaryKey(Long id);
-
- int updateByPrimaryKeySelective(WoDevOpsTaskClaimInfo record);
-
- int updateByPrimaryKey(WoDevOpsTaskClaimInfo record);
-
-}
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoDeviceLastMapper.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoDeviceLastMapper.java
deleted file mode 100644
index bf3dbe8..0000000
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoDeviceLastMapper.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.dy.pmsGlobal.daoWo;
-
-import com.dy.pmsGlobal.pojoWo.WoDeviceLast;
-
-/**
-
-* @description 閽堝琛ㄣ�恮o_device_last(璁惧鏈�鏂扮姸鎬佽〃)銆戠殑鏁版嵁搴撴搷浣淢apper
-* @createDate 2024-06-19 10:21:40
-* @Entity com.dy.pmsGlobal.pojoWo.WoDeviceLast
-*/
-public interface WoDeviceLastMapper {
-
- int deleteByPrimaryKey(Long id);
-
- int insert(WoDeviceLast record);
-
- int insertSelective(WoDeviceLast record);
-
- WoDeviceLast selectByPrimaryKey(Long id);
-
- int updateByPrimaryKeySelective(WoDeviceLast record);
-
- int updateByPrimaryKey(WoDeviceLast record);
-
-}
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoDeviceLifeMapper.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoDeviceLifeMapper.java
deleted file mode 100644
index 7ed6ac2..0000000
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoDeviceLifeMapper.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.dy.pmsGlobal.daoWo;
-
-import com.dy.pmsGlobal.pojoWo.WoDeviceLife;
-
-/**
-
-* @description 閽堝琛ㄣ�恮o_device_life(璁惧鐢熷懡鍛ㄦ湡琛�)銆戠殑鏁版嵁搴撴搷浣淢apper
-* @createDate 2024-06-19 10:21:40
-* @Entity com.dy.pmsGlobal.pojoWo.WoDeviceLife
-*/
-public interface WoDeviceLifeMapper {
-
- int deleteByPrimaryKey(Long id);
-
- int insert(WoDeviceLife record);
-
- int insertSelective(WoDeviceLife record);
-
- WoDeviceLife selectByPrimaryKey(Long id);
-
- int updateByPrimaryKeySelective(WoDeviceLife record);
-
- int updateByPrimaryKey(WoDeviceLife record);
-
-}
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoDeviceProductionLogMapper.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoDeviceProductionLogMapper.java
deleted file mode 100644
index df33d99..0000000
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoDeviceProductionLogMapper.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.dy.pmsGlobal.daoWo;
-
-import com.dy.pmsGlobal.pojoWo.WoDeviceProductionLog;
-
-/**
-
-* @description 閽堝琛ㄣ�恮o_device_production_log(璁惧鐢熶骇鏃ュ織琛�)銆戠殑鏁版嵁搴撴搷浣淢apper
-* @createDate 2024-06-19 10:21:40
-* @Entity com.dy.pmsGlobal.pojoWo.WoDeviceProductionLog
-*/
-public interface WoDeviceProductionLogMapper {
-
- int deleteByPrimaryKey(Long id);
-
- int insert(WoDeviceProductionLog record);
-
- int insertSelective(WoDeviceProductionLog record);
-
- WoDeviceProductionLog selectByPrimaryKey(Long id);
-
- int updateByPrimaryKeySelective(WoDeviceProductionLog record);
-
- int updateByPrimaryKey(WoDeviceProductionLog record);
-
-}
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoRepairInfoMapper.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoRepairInfoMapper.java
deleted file mode 100644
index b7e7b91..0000000
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoRepairInfoMapper.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.dy.pmsGlobal.daoWo;
-
-import com.dy.pmsGlobal.pojoWo.WoRepairInfo;
-
-/**
-
-* @description 閽堝琛ㄣ�恮o_repair_info銆戠殑鏁版嵁搴撴搷浣淢apper
-* @createDate 2024-06-19 10:21:40
-* @Entity com.dy.pmsGlobal.pojoWo.WoRepairInfo
-*/
-public interface WoRepairInfoMapper {
-
- int deleteByPrimaryKey(Long id);
-
- int insert(WoRepairInfo record);
-
- int insertSelective(WoRepairInfo record);
-
- WoRepairInfo selectByPrimaryKey(Long id);
-
- int updateByPrimaryKeySelective(WoRepairInfo record);
-
- int updateByPrimaryKey(WoRepairInfo record);
-
-}
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoWipSnExMapper.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoWipSnExMapper.java
deleted file mode 100644
index c5ae0b2..0000000
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoWo/WoWipSnExMapper.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.dy.pmsGlobal.daoWo;
-
-import com.dy.pmsGlobal.pojoWo.WoWipSnEx;
-
-/**
-* @description 閽堝琛ㄣ�恮o_wip_sn_ex(璁惧鍏宠仈琛�)銆戠殑鏁版嵁搴撴搷浣淢apper
-* @createDate 2024-06-19 10:21:40
-* @Entity com.dy.pmsGlobal.pojoWo.WoWipSnEx
-*/
-public interface WoWipSnExMapper {
-
- int deleteByPrimaryKey(Long id);
-
- int insert(WoWipSnEx record);
-
- int insertSelective(WoWipSnEx record);
-
- WoWipSnEx selectByPrimaryKey(Long id);
-
- int updateByPrimaryKeySelective(WoWipSnEx record);
-
- int updateByPrimaryKey(WoWipSnEx record);
-
-}
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoAssemblyWorkLast.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkHistory.java
similarity index 95%
rename from pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoAssemblyWorkLast.java
rename to pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkHistory.java
index f03249c..067539d 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoAssemblyWorkLast.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkHistory.java
@@ -1,4 +1,4 @@
-package com.dy.pmsGlobal.pojoWo;
+package com.dy.pmsGlobal.pojoSta;
import java.io.Serializable;
import java.util.Date;
@@ -6,10 +6,10 @@
/**
* 鐢熶骇绾跨敓浜т换鍔¤棰嗚〃
- * @TableName wo_assembly_work_last
+ * @TableName sta_assembly_work_history
*/
@Data
-public class WoAssemblyWorkLast implements Serializable {
+public class StaAssemblyWorkHistory implements Serializable {
/**
*
*/
@@ -83,7 +83,7 @@
if (getClass() != that.getClass()) {
return false;
}
- WoAssemblyWorkLast other = (WoAssemblyWorkLast) that;
+ StaAssemblyWorkHistory other = (StaAssemblyWorkHistory) that;
return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
&& (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId()))
&& (this.getLineId() == null ? other.getLineId() == null : this.getLineId().equals(other.getLineId()))
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoAssemblyWorkLast.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java
similarity index 95%
copy from pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoAssemblyWorkLast.java
copy to pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java
index f03249c..73fb711 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoAssemblyWorkLast.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaAssemblyWorkLast.java
@@ -1,4 +1,4 @@
-package com.dy.pmsGlobal.pojoWo;
+package com.dy.pmsGlobal.pojoSta;
import java.io.Serializable;
import java.util.Date;
@@ -6,10 +6,10 @@
/**
* 鐢熶骇绾跨敓浜т换鍔¤棰嗚〃
- * @TableName wo_assembly_work_last
+ * @TableName sta_assembly_work_last
*/
@Data
-public class WoAssemblyWorkLast implements Serializable {
+public class StaAssemblyWorkLast implements Serializable {
/**
*
*/
@@ -83,7 +83,7 @@
if (getClass() != that.getClass()) {
return false;
}
- WoAssemblyWorkLast other = (WoAssemblyWorkLast) that;
+ StaAssemblyWorkLast other = (StaAssemblyWorkLast) that;
return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
&& (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId()))
&& (this.getLineId() == null ? other.getLineId() == null : this.getLineId().equals(other.getLineId()))
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoDevOpsTaskClaimInfo.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDevOpsTaskClaimInfo.java
similarity index 91%
rename from pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoDevOpsTaskClaimInfo.java
rename to pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDevOpsTaskClaimInfo.java
index f94b201..beb6954 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoDevOpsTaskClaimInfo.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDevOpsTaskClaimInfo.java
@@ -1,4 +1,4 @@
-package com.dy.pmsGlobal.pojoWo;
+package com.dy.pmsGlobal.pojoSta;
import java.io.Serializable;
import java.util.Date;
@@ -6,10 +6,10 @@
/**
* 瀹夎杩愮淮浠诲姟璁ら琛�
- * @TableName wo_dev_ops_task_claim_info
+ * @TableName sta_dev_ops_task_claim_info
*/
@Data
-public class WoDevOpsTaskClaimInfo implements Serializable {
+public class StaDevOpsTaskClaimInfo implements Serializable {
/**
*
*/
@@ -48,7 +48,7 @@
if (getClass() != that.getClass()) {
return false;
}
- WoDevOpsTaskClaimInfo other = (WoDevOpsTaskClaimInfo) that;
+ StaDevOpsTaskClaimInfo other = (StaDevOpsTaskClaimInfo) that;
return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
&& (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId()))
&& (this.getPlanId() == null ? other.getPlanId() == null : this.getPlanId().equals(other.getPlanId()))
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoDeviceLast.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLast.java
similarity index 96%
rename from pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoDeviceLast.java
rename to pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLast.java
index 80a134e..b4ba4e4 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoDeviceLast.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLast.java
@@ -1,4 +1,4 @@
-package com.dy.pmsGlobal.pojoWo;
+package com.dy.pmsGlobal.pojoSta;
import java.io.Serializable;
import java.util.Date;
@@ -6,10 +6,10 @@
/**
* 璁惧鏈�鏂扮姸鎬佽〃
- * @TableName wo_device_last
+ * @TableName sta_device_last
*/
@Data
-public class WoDeviceLast implements Serializable {
+public class StaDeviceLast implements Serializable {
/**
*
*/
@@ -98,7 +98,7 @@
if (getClass() != that.getClass()) {
return false;
}
- WoDeviceLast other = (WoDeviceLast) that;
+ StaDeviceLast other = (StaDeviceLast) that;
return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
&& (this.getEquipNo() == null ? other.getEquipNo() == null : this.getEquipNo().equals(other.getEquipNo()))
&& (this.getPlanId() == null ? other.getPlanId() == null : this.getPlanId().equals(other.getPlanId()))
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoDeviceProductionLog.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLife.java
similarity index 95%
copy from pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoDeviceProductionLog.java
copy to pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLife.java
index ac5c64c..7dd25aa 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoDeviceProductionLog.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLife.java
@@ -1,15 +1,15 @@
-package com.dy.pmsGlobal.pojoWo;
+package com.dy.pmsGlobal.pojoSta;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
- * 璁惧鐢熶骇鏃ュ織琛�
- * @TableName wo_device_production_log
+ * 璁惧鐢熷懡鍛ㄦ湡琛�
+ * @TableName sta_device_life
*/
@Data
-public class WoDeviceProductionLog implements Serializable {
+public class StaDeviceLife implements Serializable {
/**
*
*/
@@ -36,7 +36,7 @@
private String currNode;
/**
- *
+ * 涓嬩竴鑺傜偣
*/
private String nextNode;
@@ -56,7 +56,7 @@
private Integer result;
/**
- *
+ * 缁翠慨鑺傜偣杩斿洖鐨勯敊璇爜
*/
private String errorCode;
@@ -103,7 +103,7 @@
if (getClass() != that.getClass()) {
return false;
}
- WoDeviceProductionLog other = (WoDeviceProductionLog) that;
+ StaDeviceLife other = (StaDeviceLife) that;
return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
&& (this.getEquipNo() == null ? other.getEquipNo() == null : this.getEquipNo().equals(other.getEquipNo()))
&& (this.getPlanId() == null ? other.getPlanId() == null : this.getPlanId().equals(other.getPlanId()))
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoDeviceProductionLog.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceProductionLog.java
similarity index 96%
rename from pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoDeviceProductionLog.java
rename to pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceProductionLog.java
index ac5c64c..0d5e3fd 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoDeviceProductionLog.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceProductionLog.java
@@ -1,4 +1,4 @@
-package com.dy.pmsGlobal.pojoWo;
+package com.dy.pmsGlobal.pojoSta;
import java.io.Serializable;
import java.util.Date;
@@ -6,10 +6,10 @@
/**
* 璁惧鐢熶骇鏃ュ織琛�
- * @TableName wo_device_production_log
+ * @TableName sta_device_production_log
*/
@Data
-public class WoDeviceProductionLog implements Serializable {
+public class StaDeviceProductionLog implements Serializable {
/**
*
*/
@@ -103,7 +103,7 @@
if (getClass() != that.getClass()) {
return false;
}
- WoDeviceProductionLog other = (WoDeviceProductionLog) that;
+ StaDeviceProductionLog other = (StaDeviceProductionLog) that;
return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
&& (this.getEquipNo() == null ? other.getEquipNo() == null : this.getEquipNo().equals(other.getEquipNo()))
&& (this.getPlanId() == null ? other.getPlanId() == null : this.getPlanId().equals(other.getPlanId()))
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoRepairInfo.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaRepairInfo.java
similarity index 95%
rename from pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoRepairInfo.java
rename to pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaRepairInfo.java
index b13371c..0464d0d 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoRepairInfo.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaRepairInfo.java
@@ -1,4 +1,4 @@
-package com.dy.pmsGlobal.pojoWo;
+package com.dy.pmsGlobal.pojoSta;
import java.io.Serializable;
import java.util.Date;
@@ -6,10 +6,10 @@
/**
*
- * @TableName wo_repair_info
+ * @TableName sta_repair_info
*/
@Data
-public class WoRepairInfo implements Serializable {
+public class StaRepairInfo implements Serializable {
/**
*
*/
@@ -68,7 +68,7 @@
if (getClass() != that.getClass()) {
return false;
}
- WoRepairInfo other = (WoRepairInfo) that;
+ StaRepairInfo other = (StaRepairInfo) that;
return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
&& (this.getEquipNo() == null ? other.getEquipNo() == null : this.getEquipNo().equals(other.getEquipNo()))
&& (this.getFromNode() == null ? other.getFromNode() == null : this.getFromNode().equals(other.getFromNode()))
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoWipSnEx.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaWipSnEx.java
similarity index 94%
rename from pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoWipSnEx.java
rename to pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaWipSnEx.java
index b2ae789..7c078d4 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoWipSnEx.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaWipSnEx.java
@@ -1,4 +1,4 @@
-package com.dy.pmsGlobal.pojoWo;
+package com.dy.pmsGlobal.pojoSta;
import java.io.Serializable;
import java.util.Date;
@@ -6,10 +6,10 @@
/**
* 璁惧鍏宠仈琛�
- * @TableName wo_wip_sn_ex
+ * @TableName sta_wip_sn_ex
*/
@Data
-public class WoWipSnEx implements Serializable {
+public class StaWipSnEx implements Serializable {
/**
*
*/
@@ -58,7 +58,7 @@
if (getClass() != that.getClass()) {
return false;
}
- WoWipSnEx other = (WoWipSnEx) that;
+ StaWipSnEx other = (StaWipSnEx) that;
return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
&& (this.getDeviceNo() == null ? other.getDeviceNo() == null : this.getDeviceNo().equals(other.getDeviceNo()))
&& (this.getProductId() == null ? other.getProductId() == null : this.getProductId().equals(other.getProductId()))
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoAssemblyWorkHistory.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoAssemblyWorkHistory.java
deleted file mode 100644
index 37e155c..0000000
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoAssemblyWorkHistory.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package com.dy.pmsGlobal.pojoWo;
-
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Data;
-
-/**
- * 鐢熶骇绾跨敓浜т换鍔¤棰嗚〃
- * @TableName wo_assembly_work_history
- */
-@Data
-public class WoAssemblyWorkHistory implements Serializable {
- /**
- *
- */
- private Long id;
-
- /**
- * 鐢ㄦ埛瀹炰綋缂栧彿
- */
- private Long userId;
-
- /**
- * 鐢熶骇绾垮疄浣撶紪鍙�
- */
- private Long lineId;
-
- /**
- * 宸ョ珯瀹炰綋缂栧彿
- */
- private Long stationId;
-
- /**
- * 缁勮鐢熶骇浠诲姟瀹炰綋缂栧彿
- */
- private Long planId;
-
- /**
- * 鐢熶骇娴佺▼瀹炰綋缂栧彿
- */
- private Long processId;
-
- /**
- * 鐢熶骇娴佺▼鑺傜偣瀹炰綋缂栧彿
- */
- private Long nodeId;
-
- /**
- * 浠诲姟璁ら鏃堕棿
- */
- private Date dt;
-
- /**
- * 鐘舵��:姝ｅ父(1)銆佺粨鏉�(0)
- */
- private Integer status;
-
- /**
- * 寮�濮嬫椂闂�
- */
- private Date startTime;
-
- /**
- * 缁撴潫鏃堕棿
- */
- private Date endTime;
-
- /**
- * 杈呭姪浜哄憳:杈呭姪鍛樺伐id,浠ラ�楀彿闅斿紑
- */
- private String assistants;
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public boolean equals(Object that) {
- if (this == that) {
- return true;
- }
- if (that == null) {
- return false;
- }
- if (getClass() != that.getClass()) {
- return false;
- }
- WoAssemblyWorkHistory other = (WoAssemblyWorkHistory) that;
- return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
- && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId()))
- && (this.getLineId() == null ? other.getLineId() == null : this.getLineId().equals(other.getLineId()))
- && (this.getStationId() == null ? other.getStationId() == null : this.getStationId().equals(other.getStationId()))
- && (this.getPlanId() == null ? other.getPlanId() == null : this.getPlanId().equals(other.getPlanId()))
- && (this.getProcessId() == null ? other.getProcessId() == null : this.getProcessId().equals(other.getProcessId()))
- && (this.getNodeId() == null ? other.getNodeId() == null : this.getNodeId().equals(other.getNodeId()))
- && (this.getDt() == null ? other.getDt() == null : this.getDt().equals(other.getDt()))
- && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
- && (this.getStartTime() == null ? other.getStartTime() == null : this.getStartTime().equals(other.getStartTime()))
- && (this.getEndTime() == null ? other.getEndTime() == null : this.getEndTime().equals(other.getEndTime()))
- && (this.getAssistants() == null ? other.getAssistants() == null : this.getAssistants().equals(other.getAssistants()));
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
- result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode());
- result = prime * result + ((getLineId() == null) ? 0 : getLineId().hashCode());
- result = prime * result + ((getStationId() == null) ? 0 : getStationId().hashCode());
- result = prime * result + ((getPlanId() == null) ? 0 : getPlanId().hashCode());
- result = prime * result + ((getProcessId() == null) ? 0 : getProcessId().hashCode());
- result = prime * result + ((getNodeId() == null) ? 0 : getNodeId().hashCode());
- result = prime * result + ((getDt() == null) ? 0 : getDt().hashCode());
- result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
- result = prime * result + ((getStartTime() == null) ? 0 : getStartTime().hashCode());
- result = prime * result + ((getEndTime() == null) ? 0 : getEndTime().hashCode());
- result = prime * result + ((getAssistants() == null) ? 0 : getAssistants().hashCode());
- return result;
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName());
- sb.append(" [");
- sb.append("Hash = ").append(hashCode());
- sb.append(", id=").append(id);
- sb.append(", userId=").append(userId);
- sb.append(", lineId=").append(lineId);
- sb.append(", stationId=").append(stationId);
- sb.append(", planId=").append(planId);
- sb.append(", processId=").append(processId);
- sb.append(", nodeId=").append(nodeId);
- sb.append(", dt=").append(dt);
- sb.append(", status=").append(status);
- sb.append(", startTime=").append(startTime);
- sb.append(", endTime=").append(endTime);
- sb.append(", assistants=").append(assistants);
- sb.append(", serialVersionUID=").append(serialVersionUID);
- sb.append("]");
- return sb.toString();
- }
-}
\ No newline at end of file
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoDeviceLife.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoDeviceLife.java
deleted file mode 100644
index 739335d..0000000
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoWo/WoDeviceLife.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package com.dy.pmsGlobal.pojoWo;
-
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Data;
-
-/**
- * 璁惧鐢熷懡鍛ㄦ湡琛�
- * @TableName wo_device_life
- */
-@Data
-public class WoDeviceLife implements Serializable {
- /**
- *
- */
- private Long id;
-
- /**
- * 璁惧鐮�
- */
- private String equipNo;
-
- /**
- * 璁″垝id
- */
- private String planId;
-
- /**
- * 宸ョ珯id
- */
- private String stationId;
-
- /**
- * 褰撳墠鑺傜偣
- */
- private String currNode;
-
- /**
- * 涓嬩竴鑺傜偣
- */
- private String nextNode;
-
- /**
- * 鎶曞叆鏃堕棿
- */
- private Date inLineTime;
-
- /**
- * 鐘舵��: 1:缁勮涓�,2:瀹屾垚,3:缁翠慨,4:鎶ュ簾
- */
- private Integer status;
-
- /**
- * 1:鎴愬姛,2:澶辫触
- */
- private Integer result;
-
- /**
- * 缁翠慨鑺傜偣杩斿洖鐨勯敊璇爜
- */
- private String errorCode;
-
- /**
- * 澶囨敞
- */
- private String memo;
-
- /**
- * 杈呭姪浜哄憳:杈呭姪鍛樺伐id,浠ラ�楀彿闅斿紑
- */
- private String assistants;
-
- /**
- *
- */
- private Date updatedDate;
-
- /**
- * 鎿嶄綔鍛榠d
- */
- private String updatedBy;
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public boolean equals(Object that) {
- if (this == that) {
- return true;
- }
- if (that == null) {
- return false;
- }
- if (getClass() != that.getClass()) {
- return false;
- }
- WoDeviceLife other = (WoDeviceLife) that;
- return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
- && (this.getEquipNo() == null ? other.getEquipNo() == null : this.getEquipNo().equals(other.getEquipNo()))
- && (this.getPlanId() == null ? other.getPlanId() == null : this.getPlanId().equals(other.getPlanId()))
- && (this.getStationId() == null ? other.getStationId() == null : this.getStationId().equals(other.getStationId()))
- && (this.getCurrNode() == null ? other.getCurrNode() == null : this.getCurrNode().equals(other.getCurrNode()))
- && (this.getNextNode() == null ? other.getNextNode() == null : this.getNextNode().equals(other.getNextNode()))
- && (this.getInLineTime() == null ? other.getInLineTime() == null : this.getInLineTime().equals(other.getInLineTime()))
- && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
- && (this.getResult() == null ? other.getResult() == null : this.getResult().equals(other.getResult()))
- && (this.getErrorCode() == null ? other.getErrorCode() == null : this.getErrorCode().equals(other.getErrorCode()))
- && (this.getMemo() == null ? other.getMemo() == null : this.getMemo().equals(other.getMemo()))
- && (this.getAssistants() == null ? other.getAssistants() == null : this.getAssistants().equals(other.getAssistants()))
- && (this.getUpdatedDate() == null ? other.getUpdatedDate() == null : this.getUpdatedDate().equals(other.getUpdatedDate()))
- && (this.getUpdatedBy() == null ? other.getUpdatedBy() == null : this.getUpdatedBy().equals(other.getUpdatedBy()));
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
- result = prime * result + ((getEquipNo() == null) ? 0 : getEquipNo().hashCode());
- result = prime * result + ((getPlanId() == null) ? 0 : getPlanId().hashCode());
- result = prime * result + ((getStationId() == null) ? 0 : getStationId().hashCode());
- result = prime * result + ((getCurrNode() == null) ? 0 : getCurrNode().hashCode());
- result = prime * result + ((getNextNode() == null) ? 0 : getNextNode().hashCode());
- result = prime * result + ((getInLineTime() == null) ? 0 : getInLineTime().hashCode());
- result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
- result = prime * result + ((getResult() == null) ? 0 : getResult().hashCode());
- result = prime * result + ((getErrorCode() == null) ? 0 : getErrorCode().hashCode());
- result = prime * result + ((getMemo() == null) ? 0 : getMemo().hashCode());
- result = prime * result + ((getAssistants() == null) ? 0 : getAssistants().hashCode());
- result = prime * result + ((getUpdatedDate() == null) ? 0 : getUpdatedDate().hashCode());
- result = prime * result + ((getUpdatedBy() == null) ? 0 : getUpdatedBy().hashCode());
- return result;
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName());
- sb.append(" [");
- sb.append("Hash = ").append(hashCode());
- sb.append(", id=").append(id);
- sb.append(", equipNo=").append(equipNo);
- sb.append(", planId=").append(planId);
- sb.append(", stationId=").append(stationId);
- sb.append(", currNode=").append(currNode);
- sb.append(", nextNode=").append(nextNode);
- sb.append(", inLineTime=").append(inLineTime);
- sb.append(", status=").append(status);
- sb.append(", result=").append(result);
- sb.append(", errorCode=").append(errorCode);
- sb.append(", memo=").append(memo);
- sb.append(", assistants=").append(assistants);
- sb.append(", updatedDate=").append(updatedDate);
- sb.append(", updatedBy=").append(updatedBy);
- sb.append(", serialVersionUID=").append(serialVersionUID);
- sb.append("]");
- return sb.toString();
- }
-}
\ No newline at end of file
diff --git a/pms-parent/pms-global/src/main/resources/application-global.yml b/pms-parent/pms-global/src/main/resources/application-global.yml
index 2ed36f2..fc0bb2f 100644
--- a/pms-parent/pms-global/src/main/resources/application-global.yml
+++ b/pms-parent/pms-global/src/main/resources/application-global.yml
@@ -69,7 +69,7 @@
other:
webPort: 12348
idSuffix: 5
- work:
+ station:
webPort: 12349
idSuffix: 6
file:
diff --git a/pms-parent/pms-global/src/main/resources/mapper/WoAssemblyWorkHistoryMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkHistoryMapper.xml
similarity index 90%
rename from pms-parent/pms-global/src/main/resources/mapper/WoAssemblyWorkHistoryMapper.xml
rename to pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkHistoryMapper.xml
index 6b50167..f428bda 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/WoAssemblyWorkHistoryMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkHistoryMapper.xml
@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dy.pmsGlobal.daoWo.WoAssemblyWorkHistoryMapper">
+<mapper namespace="com.dy.pmsGlobal.daoSta.StaAssemblyWorkHistoryMapper">
- <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoWo.WoAssemblyWorkHistory">
+ <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkHistory">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="userId" column="user_id" jdbcType="BIGINT"/>
<result property="lineId" column="line_id" jdbcType="BIGINT"/>
@@ -29,16 +29,16 @@
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
- from wo_assembly_work_history
+ from sta_assembly_work_history
where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
- delete from wo_assembly_work_history
+ delete from sta_assembly_work_history
where id = #{id,jdbcType=BIGINT}
</delete>
- <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoWo.WoAssemblyWorkHistory" useGeneratedKeys="true">
- insert into wo_assembly_work_history
+ <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkHistory" useGeneratedKeys="true">
+ insert into sta_assembly_work_history
( id,user_id,line_id
,station_id,plan_id,process_id
,node_id,dt,status
@@ -50,8 +50,8 @@
,#{startTime,jdbcType=TIMESTAMP},#{endTime,jdbcType=TIMESTAMP},#{assistants,jdbcType=VARCHAR}
)
</insert>
- <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoWo.WoAssemblyWorkHistory" useGeneratedKeys="true">
- insert into wo_assembly_work_history
+ <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkHistory" useGeneratedKeys="true">
+ insert into sta_assembly_work_history
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="userId != null">user_id,</if>
@@ -81,8 +81,8 @@
<if test="assistants != null">#{assistants,jdbcType=VARCHAR},</if>
</trim>
</insert>
- <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoWo.WoAssemblyWorkHistory">
- update wo_assembly_work_history
+ <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkHistory">
+ update sta_assembly_work_history
<set>
<if test="userId != null">
user_id = #{userId,jdbcType=BIGINT},
@@ -120,8 +120,8 @@
</set>
where id = #{id,jdbcType=BIGINT}
</update>
- <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoWo.WoAssemblyWorkHistory">
- update wo_assembly_work_history
+ <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkHistory">
+ update sta_assembly_work_history
set
user_id = #{userId,jdbcType=BIGINT},
line_id = #{lineId,jdbcType=BIGINT},
diff --git a/pms-parent/pms-global/src/main/resources/mapper/WoAssemblyWorkHistoryMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml
similarity index 90%
copy from pms-parent/pms-global/src/main/resources/mapper/WoAssemblyWorkHistoryMapper.xml
copy to pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml
index 6b50167..c307fd9 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/WoAssemblyWorkHistoryMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaAssemblyWorkLastMapper.xml
@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dy.pmsGlobal.daoWo.WoAssemblyWorkHistoryMapper">
+<mapper namespace="com.dy.pmsGlobal.daoSta.StaAssemblyWorkLastMapper">
- <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoWo.WoAssemblyWorkHistory">
+ <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="userId" column="user_id" jdbcType="BIGINT"/>
<result property="lineId" column="line_id" jdbcType="BIGINT"/>
@@ -29,16 +29,16 @@
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
- from wo_assembly_work_history
+ from sta_assembly_work_last
where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
- delete from wo_assembly_work_history
+ delete from sta_assembly_work_last
where id = #{id,jdbcType=BIGINT}
</delete>
- <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoWo.WoAssemblyWorkHistory" useGeneratedKeys="true">
- insert into wo_assembly_work_history
+ <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast" useGeneratedKeys="true">
+ insert into sta_assembly_work_last
( id,user_id,line_id
,station_id,plan_id,process_id
,node_id,dt,status
@@ -50,8 +50,8 @@
,#{startTime,jdbcType=TIMESTAMP},#{endTime,jdbcType=TIMESTAMP},#{assistants,jdbcType=VARCHAR}
)
</insert>
- <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoWo.WoAssemblyWorkHistory" useGeneratedKeys="true">
- insert into wo_assembly_work_history
+ <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast" useGeneratedKeys="true">
+ insert into sta_assembly_work_last
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="userId != null">user_id,</if>
@@ -81,8 +81,8 @@
<if test="assistants != null">#{assistants,jdbcType=VARCHAR},</if>
</trim>
</insert>
- <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoWo.WoAssemblyWorkHistory">
- update wo_assembly_work_history
+ <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast">
+ update sta_assembly_work_last
<set>
<if test="userId != null">
user_id = #{userId,jdbcType=BIGINT},
@@ -120,8 +120,8 @@
</set>
where id = #{id,jdbcType=BIGINT}
</update>
- <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoWo.WoAssemblyWorkHistory">
- update wo_assembly_work_history
+ <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast">
+ update sta_assembly_work_last
set
user_id = #{userId,jdbcType=BIGINT},
line_id = #{lineId,jdbcType=BIGINT},
diff --git a/pms-parent/pms-global/src/main/resources/mapper/WoDevOpsTaskClaimInfoMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaDevOpsTaskClaimInfoMapper.xml
similarity index 81%
rename from pms-parent/pms-global/src/main/resources/mapper/WoDevOpsTaskClaimInfoMapper.xml
rename to pms-parent/pms-global/src/main/resources/mapper/StaDevOpsTaskClaimInfoMapper.xml
index 06e5bd9..5317d88 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/WoDevOpsTaskClaimInfoMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaDevOpsTaskClaimInfoMapper.xml
@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dy.pmsGlobal.daoWo.WoDevOpsTaskClaimInfoMapper">
+<mapper namespace="com.dy.pmsGlobal.daoSta.StaDevOpsTaskClaimInfoMapper">
- <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoWo.WoDevOpsTaskClaimInfo">
+ <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoSta.StaDevOpsTaskClaimInfo">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="userId" column="user_id" jdbcType="BIGINT"/>
<result property="planId" column="plan_id" jdbcType="BIGINT"/>
@@ -20,23 +20,23 @@
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
- from wo_dev_ops_task_claim_info
+ from sta_dev_ops_task_claim_info
where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
- delete from wo_dev_ops_task_claim_info
+ delete from sta_dev_ops_task_claim_info
where id = #{id,jdbcType=BIGINT}
</delete>
- <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoWo.WoDevOpsTaskClaimInfo" useGeneratedKeys="true">
- insert into wo_dev_ops_task_claim_info
+ <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDevOpsTaskClaimInfo" useGeneratedKeys="true">
+ insert into sta_dev_ops_task_claim_info
( id,user_id,plan_id
,dt,status)
values (#{id,jdbcType=BIGINT},#{userId,jdbcType=BIGINT},#{planId,jdbcType=BIGINT}
,#{dt,jdbcType=TIMESTAMP},#{status,jdbcType=TINYINT})
</insert>
- <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoWo.WoDevOpsTaskClaimInfo" useGeneratedKeys="true">
- insert into wo_dev_ops_task_claim_info
+ <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDevOpsTaskClaimInfo" useGeneratedKeys="true">
+ insert into sta_dev_ops_task_claim_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="userId != null">user_id,</if>
@@ -52,8 +52,8 @@
<if test="status != null">#{status,jdbcType=TINYINT},</if>
</trim>
</insert>
- <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoWo.WoDevOpsTaskClaimInfo">
- update wo_dev_ops_task_claim_info
+ <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaDevOpsTaskClaimInfo">
+ update sta_dev_ops_task_claim_info
<set>
<if test="userId != null">
user_id = #{userId,jdbcType=BIGINT},
@@ -70,8 +70,8 @@
</set>
where id = #{id,jdbcType=BIGINT}
</update>
- <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoWo.WoDevOpsTaskClaimInfo">
- update wo_dev_ops_task_claim_info
+ <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoSta.StaDevOpsTaskClaimInfo">
+ update sta_dev_ops_task_claim_info
set
user_id = #{userId,jdbcType=BIGINT},
plan_id = #{planId,jdbcType=BIGINT},
diff --git a/pms-parent/pms-global/src/main/resources/mapper/WoDeviceLastMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml
similarity index 93%
rename from pms-parent/pms-global/src/main/resources/mapper/WoDeviceLastMapper.xml
rename to pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml
index e3f8ed2..e7b002b 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/WoDeviceLastMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLastMapper.xml
@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dy.pmsGlobal.daoWo.WoDeviceLastMapper">
+<mapper namespace="com.dy.pmsGlobal.daoSta.StaDeviceLastMapper">
- <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoWo.WoDeviceLast">
+ <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoSta.StaDeviceLast">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="equipNo" column="equip_no" jdbcType="VARCHAR"/>
<result property="planId" column="plan_id" jdbcType="VARCHAR"/>
@@ -33,16 +33,16 @@
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
- from wo_device_last
+ from sta_device_last
where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
- delete from wo_device_last
+ delete from sta_device_last
where id = #{id,jdbcType=BIGINT}
</delete>
- <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoWo.WoDeviceLast" useGeneratedKeys="true">
- insert into wo_device_last
+ <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLast" useGeneratedKeys="true">
+ insert into sta_device_last
( id,equip_no,plan_id
,station_id,curr_node,next_node
,status,result,error_code
@@ -56,8 +56,8 @@
,#{updatedDate,jdbcType=TIMESTAMP},#{updatedBy,jdbcType=VARCHAR},#{inStationTime,jdbcType=TIMESTAMP}
)
</insert>
- <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoWo.WoDeviceLast" useGeneratedKeys="true">
- insert into wo_device_last
+ <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLast" useGeneratedKeys="true">
+ insert into sta_device_last
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="equipNo != null">equip_no,</if>
@@ -93,8 +93,8 @@
<if test="inStationTime != null">#{inStationTime,jdbcType=TIMESTAMP},</if>
</trim>
</insert>
- <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoWo.WoDeviceLast">
- update wo_device_last
+ <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLast">
+ update sta_device_last
<set>
<if test="equipNo != null">
equip_no = #{equipNo,jdbcType=VARCHAR},
@@ -141,8 +141,8 @@
</set>
where id = #{id,jdbcType=BIGINT}
</update>
- <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoWo.WoDeviceLast">
- update wo_device_last
+ <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLast">
+ update sta_device_last
set
equip_no = #{equipNo,jdbcType=VARCHAR},
plan_id = #{planId,jdbcType=VARCHAR},
diff --git a/pms-parent/pms-global/src/main/resources/mapper/WoDeviceProductionLogMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeMapper.xml
similarity index 92%
rename from pms-parent/pms-global/src/main/resources/mapper/WoDeviceProductionLogMapper.xml
rename to pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeMapper.xml
index eb2f6d9..21d5a69 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/WoDeviceProductionLogMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceLifeMapper.xml
@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dy.pmsGlobal.daoWo.WoDeviceProductionLogMapper">
+<mapper namespace="com.dy.pmsGlobal.daoSta.StaDeviceLifeMapper">
- <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoWo.WoDeviceProductionLog">
+ <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoSta.StaDeviceLife">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="equipNo" column="equip_no" jdbcType="VARCHAR"/>
<result property="planId" column="plan_id" jdbcType="VARCHAR"/>
@@ -35,16 +35,16 @@
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
- from wo_device_production_log
+ from sta_device_life
where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
- delete from wo_device_production_log
+ delete from sta_device_life
where id = #{id,jdbcType=BIGINT}
</delete>
- <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoWo.WoDeviceProductionLog" useGeneratedKeys="true">
- insert into wo_device_production_log
+ <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLife" useGeneratedKeys="true">
+ insert into sta_device_life
( id,equip_no,plan_id
,station_id,curr_node,next_node
,in_line_time,status,result
@@ -58,8 +58,8 @@
,#{updatedDate,jdbcType=TIMESTAMP},#{updatedBy,jdbcType=VARCHAR},#{claimId,jdbcType=BIGINT}
,#{repairId,jdbcType=BIGINT})
</insert>
- <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoWo.WoDeviceProductionLog" useGeneratedKeys="true">
- insert into wo_device_production_log
+ <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLife" useGeneratedKeys="true">
+ insert into sta_device_life
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="equipNo != null">equip_no,</if>
@@ -97,8 +97,8 @@
<if test="repairId != null">#{repairId,jdbcType=BIGINT},</if>
</trim>
</insert>
- <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoWo.WoDeviceProductionLog">
- update wo_device_production_log
+ <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLife">
+ update sta_device_life
<set>
<if test="equipNo != null">
equip_no = #{equipNo,jdbcType=VARCHAR},
@@ -148,8 +148,8 @@
</set>
where id = #{id,jdbcType=BIGINT}
</update>
- <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoWo.WoDeviceProductionLog">
- update wo_device_production_log
+ <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceLife">
+ update sta_device_life
set
equip_no = #{equipNo,jdbcType=VARCHAR},
plan_id = #{planId,jdbcType=VARCHAR},
diff --git a/pms-parent/pms-global/src/main/resources/mapper/WoDeviceProductionLogMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml
similarity index 92%
copy from pms-parent/pms-global/src/main/resources/mapper/WoDeviceProductionLogMapper.xml
copy to pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml
index eb2f6d9..e68e809 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/WoDeviceProductionLogMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaDeviceProductionLogMapper.xml
@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dy.pmsGlobal.daoWo.WoDeviceProductionLogMapper">
+<mapper namespace="com.dy.pmsGlobal.daoSta.StaDeviceProductionLogMapper">
- <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoWo.WoDeviceProductionLog">
+ <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="equipNo" column="equip_no" jdbcType="VARCHAR"/>
<result property="planId" column="plan_id" jdbcType="VARCHAR"/>
@@ -35,16 +35,16 @@
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
- from wo_device_production_log
+ from sta_device_production_log
where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
- delete from wo_device_production_log
+ delete from sta_device_production_log
where id = #{id,jdbcType=BIGINT}
</delete>
- <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoWo.WoDeviceProductionLog" useGeneratedKeys="true">
- insert into wo_device_production_log
+ <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog" useGeneratedKeys="true">
+ insert into sta_device_production_log
( id,equip_no,plan_id
,station_id,curr_node,next_node
,in_line_time,status,result
@@ -58,8 +58,8 @@
,#{updatedDate,jdbcType=TIMESTAMP},#{updatedBy,jdbcType=VARCHAR},#{claimId,jdbcType=BIGINT}
,#{repairId,jdbcType=BIGINT})
</insert>
- <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoWo.WoDeviceProductionLog" useGeneratedKeys="true">
- insert into wo_device_production_log
+ <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog" useGeneratedKeys="true">
+ insert into sta_device_production_log
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="equipNo != null">equip_no,</if>
@@ -97,8 +97,8 @@
<if test="repairId != null">#{repairId,jdbcType=BIGINT},</if>
</trim>
</insert>
- <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoWo.WoDeviceProductionLog">
- update wo_device_production_log
+ <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog">
+ update sta_device_production_log
<set>
<if test="equipNo != null">
equip_no = #{equipNo,jdbcType=VARCHAR},
@@ -148,8 +148,8 @@
</set>
where id = #{id,jdbcType=BIGINT}
</update>
- <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoWo.WoDeviceProductionLog">
- update wo_device_production_log
+ <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoSta.StaDeviceProductionLog">
+ update sta_device_production_log
set
equip_no = #{equipNo,jdbcType=VARCHAR},
plan_id = #{planId,jdbcType=VARCHAR},
diff --git a/pms-parent/pms-global/src/main/resources/mapper/WoRepairInfoMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaRepairInfoMapper.xml
similarity index 90%
rename from pms-parent/pms-global/src/main/resources/mapper/WoRepairInfoMapper.xml
rename to pms-parent/pms-global/src/main/resources/mapper/StaRepairInfoMapper.xml
index 3200601..c7417e8 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/WoRepairInfoMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaRepairInfoMapper.xml
@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dy.pmsGlobal.daoWo.WoRepairInfoMapper">
+<mapper namespace="com.dy.pmsGlobal.daoSta.StaRepairInfoMapper">
- <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoWo.WoRepairInfo">
+ <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoSta.StaRepairInfo">
<id property="id" column="id" jdbcType="BIGINT"/>
<result property="equipNo" column="equip_no" jdbcType="VARCHAR"/>
<result property="fromNode" column="from_node" jdbcType="VARCHAR"/>
@@ -25,16 +25,16 @@
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
- from wo_repair_info
+ from sta_repair_info
where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
- delete from wo_repair_info
+ delete from sta_repair_info
where id = #{id,jdbcType=BIGINT}
</delete>
- <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoWo.WoRepairInfo" useGeneratedKeys="true">
- insert into wo_repair_info
+ <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaRepairInfo" useGeneratedKeys="true">
+ insert into sta_repair_info
( id,equip_no,from_node
,repair_reason,to_node,repair_by
,repair_time,create_time,create_by
@@ -44,8 +44,8 @@
,#{repairTime,jdbcType=TIMESTAMP},#{createTime,jdbcType=TIMESTAMP},#{createBy,jdbcType=BIGINT}
)
</insert>
- <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoWo.WoRepairInfo" useGeneratedKeys="true">
- insert into wo_repair_info
+ <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaRepairInfo" useGeneratedKeys="true">
+ insert into sta_repair_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="equipNo != null">equip_no,</if>
@@ -69,8 +69,8 @@
<if test="createBy != null">#{createBy,jdbcType=BIGINT},</if>
</trim>
</insert>
- <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoWo.WoRepairInfo">
- update wo_repair_info
+ <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaRepairInfo">
+ update sta_repair_info
<set>
<if test="equipNo != null">
equip_no = #{equipNo,jdbcType=VARCHAR},
@@ -99,8 +99,8 @@
</set>
where id = #{id,jdbcType=BIGINT}
</update>
- <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoWo.WoRepairInfo">
- update wo_repair_info
+ <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoSta.StaRepairInfo">
+ update sta_repair_info
set
equip_no = #{equipNo,jdbcType=VARCHAR},
from_node = #{fromNode,jdbcType=VARCHAR},
diff --git a/pms-parent/pms-global/src/main/resources/mapper/WoWipSnExMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/StaWipSnExMapper.xml
similarity index 88%
rename from pms-parent/pms-global/src/main/resources/mapper/WoWipSnExMapper.xml
rename to pms-parent/pms-global/src/main/resources/mapper/StaWipSnExMapper.xml
index a816f56..f66bc70 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/WoWipSnExMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/StaWipSnExMapper.xml
@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dy.pmsGlobal.daoWo.WoWipSnExMapper">
+<mapper namespace="com.dy.pmsGlobal.daoSta.StaWipSnExMapper">
- <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoWo.WoWipSnEx">
+ <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoSta.StaWipSnEx">
<id property="id" column="id" jdbcType="VARCHAR"/>
<result property="deviceNo" column="device_no" jdbcType="VARCHAR"/>
<result property="productId" column="product_id" jdbcType="INTEGER"/>
@@ -23,16 +23,16 @@
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
- from wo_wip_sn_ex
+ from sta_wip_sn_ex
where id = #{id,jdbcType=VARCHAR}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
- delete from wo_wip_sn_ex
+ delete from sta_wip_sn_ex
where id = #{id,jdbcType=VARCHAR}
</delete>
- <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoWo.WoWipSnEx" useGeneratedKeys="true">
- insert into wo_wip_sn_ex
+ <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaWipSnEx" useGeneratedKeys="true">
+ insert into sta_wip_sn_ex
( id,device_no,product_id
,product_name,product_no,create_time
,create_by)
@@ -40,8 +40,8 @@
,#{productName,jdbcType=VARCHAR},#{productNo,jdbcType=VARCHAR},#{createTime,jdbcType=TIMESTAMP}
,#{createBy,jdbcType=VARCHAR})
</insert>
- <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoWo.WoWipSnEx" useGeneratedKeys="true">
- insert into wo_wip_sn_ex
+ <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoSta.StaWipSnEx" useGeneratedKeys="true">
+ insert into sta_wip_sn_ex
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="deviceNo != null">device_no,</if>
@@ -61,8 +61,8 @@
<if test="createBy != null">#{createBy,jdbcType=VARCHAR},</if>
</trim>
</insert>
- <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoWo.WoWipSnEx">
- update wo_wip_sn_ex
+ <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoSta.StaWipSnEx">
+ update sta_wip_sn_ex
<set>
<if test="deviceNo != null">
device_no = #{deviceNo,jdbcType=VARCHAR},
@@ -85,8 +85,8 @@
</set>
where id = #{id,jdbcType=VARCHAR}
</update>
- <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoWo.WoWipSnEx">
- update wo_wip_sn_ex
+ <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoSta.StaWipSnEx">
+ update sta_wip_sn_ex
set
device_no = #{deviceNo,jdbcType=VARCHAR},
product_id = #{productId,jdbcType=INTEGER},
diff --git a/pms-parent/pms-global/src/main/resources/mapper/WoAssemblyWorkLastMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/WoAssemblyWorkLastMapper.xml
deleted file mode 100644
index 5c1ea61..0000000
--- a/pms-parent/pms-global/src/main/resources/mapper/WoAssemblyWorkLastMapper.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dy.pmsGlobal.daoWo.WoAssemblyWorkLastMapper">
-
- <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoWo.WoAssemblyWorkLast">
- <id property="id" column="id" jdbcType="BIGINT"/>
- <result property="userId" column="user_id" jdbcType="BIGINT"/>
- <result property="lineId" column="line_id" jdbcType="BIGINT"/>
- <result property="stationId" column="station_id" jdbcType="BIGINT"/>
- <result property="planId" column="plan_id" jdbcType="BIGINT"/>
- <result property="processId" column="process_id" jdbcType="BIGINT"/>
- <result property="nodeId" column="node_id" jdbcType="BIGINT"/>
- <result property="dt" column="dt" jdbcType="TIMESTAMP"/>
- <result property="status" column="status" jdbcType="TINYINT"/>
- <result property="startTime" column="start_time" jdbcType="TIMESTAMP"/>
- <result property="endTime" column="end_time" jdbcType="TIMESTAMP"/>
- <result property="assistants" column="assistants" jdbcType="VARCHAR"/>
- </resultMap>
-
- <sql id="Base_Column_List">
- id,user_id,line_id,
- station_id,plan_id,process_id,
- node_id,dt,status,
- start_time,end_time,assistants
- </sql>
-
- <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List" />
- from wo_assembly_work_last
- where id = #{id,jdbcType=BIGINT}
- </select>
-
- <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
- delete from wo_assembly_work_last
- where id = #{id,jdbcType=BIGINT}
- </delete>
- <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoWo.WoAssemblyWorkLast" useGeneratedKeys="true">
- insert into wo_assembly_work_last
- ( id,user_id,line_id
- ,station_id,plan_id,process_id
- ,node_id,dt,status
- ,start_time,end_time,assistants
- )
- values (#{id,jdbcType=BIGINT},#{userId,jdbcType=BIGINT},#{lineId,jdbcType=BIGINT}
- ,#{stationId,jdbcType=BIGINT},#{planId,jdbcType=BIGINT},#{processId,jdbcType=BIGINT}
- ,#{nodeId,jdbcType=BIGINT},#{dt,jdbcType=TIMESTAMP},#{status,jdbcType=TINYINT}
- ,#{startTime,jdbcType=TIMESTAMP},#{endTime,jdbcType=TIMESTAMP},#{assistants,jdbcType=VARCHAR}
- )
- </insert>
- <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoWo.WoAssemblyWorkLast" useGeneratedKeys="true">
- insert into wo_assembly_work_last
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">id,</if>
- <if test="userId != null">user_id,</if>
- <if test="lineId != null">line_id,</if>
- <if test="stationId != null">station_id,</if>
- <if test="planId != null">plan_id,</if>
- <if test="processId != null">process_id,</if>
- <if test="nodeId != null">node_id,</if>
- <if test="dt != null">dt,</if>
- <if test="status != null">status,</if>
- <if test="startTime != null">start_time,</if>
- <if test="endTime != null">end_time,</if>
- <if test="assistants != null">assistants,</if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="id != null">#{id,jdbcType=BIGINT},</if>
- <if test="userId != null">#{userId,jdbcType=BIGINT},</if>
- <if test="lineId != null">#{lineId,jdbcType=BIGINT},</if>
- <if test="stationId != null">#{stationId,jdbcType=BIGINT},</if>
- <if test="planId != null">#{planId,jdbcType=BIGINT},</if>
- <if test="processId != null">#{processId,jdbcType=BIGINT},</if>
- <if test="nodeId != null">#{nodeId,jdbcType=BIGINT},</if>
- <if test="dt != null">#{dt,jdbcType=TIMESTAMP},</if>
- <if test="status != null">#{status,jdbcType=TINYINT},</if>
- <if test="startTime != null">#{startTime,jdbcType=TIMESTAMP},</if>
- <if test="endTime != null">#{endTime,jdbcType=TIMESTAMP},</if>
- <if test="assistants != null">#{assistants,jdbcType=VARCHAR},</if>
- </trim>
- </insert>
- <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoWo.WoAssemblyWorkLast">
- update wo_assembly_work_last
- <set>
- <if test="userId != null">
- user_id = #{userId,jdbcType=BIGINT},
- </if>
- <if test="lineId != null">
- line_id = #{lineId,jdbcType=BIGINT},
- </if>
- <if test="stationId != null">
- station_id = #{stationId,jdbcType=BIGINT},
- </if>
- <if test="planId != null">
- plan_id = #{planId,jdbcType=BIGINT},
- </if>
- <if test="processId != null">
- process_id = #{processId,jdbcType=BIGINT},
- </if>
- <if test="nodeId != null">
- node_id = #{nodeId,jdbcType=BIGINT},
- </if>
- <if test="dt != null">
- dt = #{dt,jdbcType=TIMESTAMP},
- </if>
- <if test="status != null">
- status = #{status,jdbcType=TINYINT},
- </if>
- <if test="startTime != null">
- start_time = #{startTime,jdbcType=TIMESTAMP},
- </if>
- <if test="endTime != null">
- end_time = #{endTime,jdbcType=TIMESTAMP},
- </if>
- <if test="assistants != null">
- assistants = #{assistants,jdbcType=VARCHAR},
- </if>
- </set>
- where id = #{id,jdbcType=BIGINT}
- </update>
- <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoWo.WoAssemblyWorkLast">
- update wo_assembly_work_last
- set
- user_id = #{userId,jdbcType=BIGINT},
- line_id = #{lineId,jdbcType=BIGINT},
- station_id = #{stationId,jdbcType=BIGINT},
- plan_id = #{planId,jdbcType=BIGINT},
- process_id = #{processId,jdbcType=BIGINT},
- node_id = #{nodeId,jdbcType=BIGINT},
- dt = #{dt,jdbcType=TIMESTAMP},
- status = #{status,jdbcType=TINYINT},
- start_time = #{startTime,jdbcType=TIMESTAMP},
- end_time = #{endTime,jdbcType=TIMESTAMP},
- assistants = #{assistants,jdbcType=VARCHAR}
- where id = #{id,jdbcType=BIGINT}
- </update>
-</mapper>
diff --git a/pms-parent/pms-global/src/main/resources/mapper/WoDeviceLifeMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/WoDeviceLifeMapper.xml
deleted file mode 100644
index 13abc6a..0000000
--- a/pms-parent/pms-global/src/main/resources/mapper/WoDeviceLifeMapper.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.dy.pmsGlobal.daoWo.WoDeviceLifeMapper">
-
- <resultMap id="BaseResultMap" type="com.dy.pmsGlobal.pojoWo.WoDeviceLife">
- <id property="id" column="id" jdbcType="BIGINT"/>
- <result property="equipNo" column="equip_no" jdbcType="VARCHAR"/>
- <result property="planId" column="plan_id" jdbcType="VARCHAR"/>
- <result property="stationId" column="station_id" jdbcType="VARCHAR"/>
- <result property="currNode" column="curr_node" jdbcType="VARCHAR"/>
- <result property="nextNode" column="next_node" jdbcType="VARCHAR"/>
- <result property="inLineTime" column="in_line_time" jdbcType="TIMESTAMP"/>
- <result property="status" column="status" jdbcType="TINYINT"/>
- <result property="result" column="result" jdbcType="TINYINT"/>
- <result property="errorCode" column="error_code" jdbcType="VARCHAR"/>
- <result property="memo" column="memo" jdbcType="VARCHAR"/>
- <result property="assistants" column="assistants" jdbcType="VARCHAR"/>
- <result property="updatedDate" column="updated_date" jdbcType="TIMESTAMP"/>
- <result property="updatedBy" column="updated_by" jdbcType="VARCHAR"/>
- </resultMap>
-
- <sql id="Base_Column_List">
- id,equip_no,plan_id,
- station_id,curr_node,next_node,
- in_line_time,status,result,
- error_code,memo,assistants,
- updated_date,updated_by
- </sql>
-
- <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List" />
- from wo_device_life
- where id = #{id,jdbcType=BIGINT}
- </select>
-
- <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
- delete from wo_device_life
- where id = #{id,jdbcType=BIGINT}
- </delete>
- <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoWo.WoDeviceLife" useGeneratedKeys="true">
- insert into wo_device_life
- ( id,equip_no,plan_id
- ,station_id,curr_node,next_node
- ,in_line_time,status,result
- ,error_code,memo,assistants
- ,updated_date,updated_by)
- values (#{id,jdbcType=BIGINT},#{equipNo,jdbcType=VARCHAR},#{planId,jdbcType=VARCHAR}
- ,#{stationId,jdbcType=VARCHAR},#{currNode,jdbcType=VARCHAR},#{nextNode,jdbcType=VARCHAR}
- ,#{inLineTime,jdbcType=TIMESTAMP},#{status,jdbcType=TINYINT},#{result,jdbcType=TINYINT}
- ,#{errorCode,jdbcType=VARCHAR},#{memo,jdbcType=VARCHAR},#{assistants,jdbcType=VARCHAR}
- ,#{updatedDate,jdbcType=TIMESTAMP},#{updatedBy,jdbcType=VARCHAR})
- </insert>
- <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoWo.WoDeviceLife" useGeneratedKeys="true">
- insert into wo_device_life
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">id,</if>
- <if test="equipNo != null">equip_no,</if>
- <if test="planId != null">plan_id,</if>
- <if test="stationId != null">station_id,</if>
- <if test="currNode != null">curr_node,</if>
- <if test="nextNode != null">next_node,</if>
- <if test="inLineTime != null">in_line_time,</if>
- <if test="status != null">status,</if>
- <if test="result != null">result,</if>
- <if test="errorCode != null">error_code,</if>
- <if test="memo != null">memo,</if>
- <if test="assistants != null">assistants,</if>
- <if test="updatedDate != null">updated_date,</if>
- <if test="updatedBy != null">updated_by,</if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="id != null">#{id,jdbcType=BIGINT},</if>
- <if test="equipNo != null">#{equipNo,jdbcType=VARCHAR},</if>
- <if test="planId != null">#{planId,jdbcType=VARCHAR},</if>
- <if test="stationId != null">#{stationId,jdbcType=VARCHAR},</if>
- <if test="currNode != null">#{currNode,jdbcType=VARCHAR},</if>
- <if test="nextNode != null">#{nextNode,jdbcType=VARCHAR},</if>
- <if test="inLineTime != null">#{inLineTime,jdbcType=TIMESTAMP},</if>
- <if test="status != null">#{status,jdbcType=TINYINT},</if>
- <if test="result != null">#{result,jdbcType=TINYINT},</if>
- <if test="errorCode != null">#{errorCode,jdbcType=VARCHAR},</if>
- <if test="memo != null">#{memo,jdbcType=VARCHAR},</if>
- <if test="assistants != null">#{assistants,jdbcType=VARCHAR},</if>
- <if test="updatedDate != null">#{updatedDate,jdbcType=TIMESTAMP},</if>
- <if test="updatedBy != null">#{updatedBy,jdbcType=VARCHAR},</if>
- </trim>
- </insert>
- <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoWo.WoDeviceLife">
- update wo_device_life
- <set>
- <if test="equipNo != null">
- equip_no = #{equipNo,jdbcType=VARCHAR},
- </if>
- <if test="planId != null">
- plan_id = #{planId,jdbcType=VARCHAR},
- </if>
- <if test="stationId != null">
- station_id = #{stationId,jdbcType=VARCHAR},
- </if>
- <if test="currNode != null">
- curr_node = #{currNode,jdbcType=VARCHAR},
- </if>
- <if test="nextNode != null">
- next_node = #{nextNode,jdbcType=VARCHAR},
- </if>
- <if test="inLineTime != null">
- in_line_time = #{inLineTime,jdbcType=TIMESTAMP},
- </if>
- <if test="status != null">
- status = #{status,jdbcType=TINYINT},
- </if>
- <if test="result != null">
- result = #{result,jdbcType=TINYINT},
- </if>
- <if test="errorCode != null">
- error_code = #{errorCode,jdbcType=VARCHAR},
- </if>
- <if test="memo != null">
- memo = #{memo,jdbcType=VARCHAR},
- </if>
- <if test="assistants != null">
- assistants = #{assistants,jdbcType=VARCHAR},
- </if>
- <if test="updatedDate != null">
- updated_date = #{updatedDate,jdbcType=TIMESTAMP},
- </if>
- <if test="updatedBy != null">
- updated_by = #{updatedBy,jdbcType=VARCHAR},
- </if>
- </set>
- where id = #{id,jdbcType=BIGINT}
- </update>
- <update id="updateByPrimaryKey" parameterType="com.dy.pmsGlobal.pojoWo.WoDeviceLife">
- update wo_device_life
- set
- equip_no = #{equipNo,jdbcType=VARCHAR},
- plan_id = #{planId,jdbcType=VARCHAR},
- station_id = #{stationId,jdbcType=VARCHAR},
- curr_node = #{currNode,jdbcType=VARCHAR},
- next_node = #{nextNode,jdbcType=VARCHAR},
- in_line_time = #{inLineTime,jdbcType=TIMESTAMP},
- status = #{status,jdbcType=TINYINT},
- result = #{result,jdbcType=TINYINT},
- error_code = #{errorCode,jdbcType=VARCHAR},
- memo = #{memo,jdbcType=VARCHAR},
- assistants = #{assistants,jdbcType=VARCHAR},
- updated_date = #{updatedDate,jdbcType=TIMESTAMP},
- updated_by = #{updatedBy,jdbcType=VARCHAR}
- where id = #{id,jdbcType=BIGINT}
- </update>
-</mapper>
diff --git a/pms-parent/pms-web-work/pom.xml b/pms-parent/pms-web-station/pom.xml
similarity index 98%
rename from pms-parent/pms-web-work/pom.xml
rename to pms-parent/pms-web-station/pom.xml
index bab6796..650211e 100644
--- a/pms-parent/pms-web-work/pom.xml
+++ b/pms-parent/pms-web-station/pom.xml
@@ -12,9 +12,9 @@
<packaging>jar</packaging>
<groupId>com.dy</groupId>
- <artifactId>pms-web-work</artifactId>
+ <artifactId>pms-web-station</artifactId>
<version>1.0.0</version>
- <name>pms-web-work</name>
+ <name>pms-web-station</name>
<description>鍏嶇櫥褰曟ā鍧�</description>
diff --git a/pms-parent/pms-web-work/src/main/java/com/dy/pmsWork/PmsWorkApplication.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/PmsStationApplication.java
similarity index 76%
rename from pms-parent/pms-web-work/src/main/java/com/dy/pmsWork/PmsWorkApplication.java
rename to pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/PmsStationApplication.java
index da5f9b7..a945ed1 100644
--- a/pms-parent/pms-web-work/src/main/java/com/dy/pmsWork/PmsWorkApplication.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/PmsStationApplication.java
@@ -1,4 +1,4 @@
-package com.dy.pmsWork;
+package com.dy.pmsStation;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
@@ -8,10 +8,10 @@
@SpringBootApplication
@EnableAspectJAutoProxy
-@ComponentScan(basePackages = {"com.dy.common", "com.dy.pmsGlobal", "com.dy.pmsWork"})
+@ComponentScan(basePackages = {"com.dy.common", "com.dy.pmsGlobal", "com.dy.pmsStation"})
@MapperScan(basePackages={"com.dy.pmsGlobal.dao*"})
-public class PmsWorkApplication {
+public class PmsStationApplication {
public static void main(String[] args) {
- SpringApplication.run(PmsWorkApplication.class, args);
+ SpringApplication.run(PmsStationApplication.class, args);
}
}
diff --git a/pms-parent/pms-web-work/src/main/java/com/dy/pmsWork/assemblyStep/AssemblyStepCtrl.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepCtrl.java
similarity index 87%
rename from pms-parent/pms-web-work/src/main/java/com/dy/pmsWork/assemblyStep/AssemblyStepCtrl.java
rename to pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepCtrl.java
index 01c3eec..353bbd1 100644
--- a/pms-parent/pms-web-work/src/main/java/com/dy/pmsWork/assemblyStep/AssemblyStepCtrl.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/assemblyStep/AssemblyStepCtrl.java
@@ -1,4 +1,4 @@
-package com.dy.pmsWork.assemblyStep;
+package com.dy.pmsStation.assemblyStep;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/pms-parent/pms-web-work/src/main/java/com/dy/pmsWork/workOrder/WorkOrderCtrl.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java
similarity index 93%
rename from pms-parent/pms-web-work/src/main/java/com/dy/pmsWork/workOrder/WorkOrderCtrl.java
rename to pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java
index b098174..5bfd573 100644
--- a/pms-parent/pms-web-work/src/main/java/com/dy/pmsWork/workOrder/WorkOrderCtrl.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java
@@ -1,4 +1,4 @@
-package com.dy.pmsWork.workOrder;
+package com.dy.pmsStation.workOrder;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
diff --git a/pms-parent/pms-web-work/src/main/resources/application.yml b/pms-parent/pms-web-station/src/main/resources/application.yml
similarity index 70%
rename from pms-parent/pms-web-work/src/main/resources/application.yml
rename to pms-parent/pms-web-station/src/main/resources/application.yml
index d864348..615c7a2 100644
--- a/pms-parent/pms-web-work/src/main/resources/application.yml
+++ b/pms-parent/pms-web-station/src/main/resources/application.yml
@@ -4,11 +4,11 @@
#web鏈嶅姟绔彛锛宼omcat榛樿鏄�8080
server:
- port: ${pms.work.webPort}
+ port: ${pms.station.webPort}
servlet:
- context-path: /work #web璁块棶涓婁笅鏂囪矾寰�
+ context-path: /station #web璁块棶涓婁笅鏂囪矾寰�
context-parameters:
#GenerateIdSetSuffixListener涓簲鐢紝鍙栧�艰寖鍥存槸0-99
- idSuffix: ${pms.work.idSuffix}
+ idSuffix: ${pms.station.idSuffix}
#ConfigListener涓簲鐢�
#configFileNames: config-global.xml,config-demo.xml
diff --git a/pms-parent/pms-web-work/src/main/resources/log4j2.yml b/pms-parent/pms-web-station/src/main/resources/log4j2.yml
similarity index 98%
rename from pms-parent/pms-web-work/src/main/resources/log4j2.yml
rename to pms-parent/pms-web-station/src/main/resources/log4j2.yml
index 33ab326..3c5b3de 100644
--- a/pms-parent/pms-web-work/src/main/resources/log4j2.yml
+++ b/pms-parent/pms-web-station/src/main/resources/log4j2.yml
@@ -9,7 +9,7 @@
value: ./logs
#鏃ュ織鏂囦欢瀛樺偍鍚嶇О
- name: project.name
- value: pmsWork
+ value: pmsStation
#瀹氫箟杈撳嚭鍣紝鍙互杈撳嚭鍒版帶鍒跺彴鍜屾枃浠�.
Appenders:
--
Gitblit v1.8.0