Yangwl
/
LanJu_Mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

工单编码

Browse Source
highway
zhaoxiaolin 1 year ago
parent 6a14a48c97
commit 9bea4d9d6c
19 changed files with 91 additions and 101 deletions
Show Stats Download Patch File Download Diff File

11
op-auth/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -17,14 +17,15 @@ spring:
# 服务注册地址 # 服务注册地址
#--spring.cloud.nacos.discovery.namespace=chj --spring.cloud.nacos.config.namespace=chj #--spring.cloud.nacos.discovery.namespace=chj --spring.cloud.nacos.config.namespace=chj
namespace: lanju-op namespace: lanju-op
group: prod-new group: zxl
server-addr: 192.168.202.20:8848 # 服务注册地址
server-addr: 140.249.53.142:8848
config: config:
#命名空间 #命名空间
namespace: lanju-op namespace: lanju-op
group: prod-new group: zxl
# 配置中心地址 # 服务注册地址
server-addr: 192.168.202.20:8848 server-addr: 140.249.53.142:8848
# 配置文件格式 # 配置文件格式
file-extension: yml file-extension: yml
# 共享配置 # 共享配置

2
op-common/op-common-core/src/main/java/com/op/common/core/utils/DateUtils.java
Unescape Escape View File

@ -23,7 +23,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
public static String YYYY_MM_DD = "yyyy-MM-dd"; public static String YYYY_MM_DD = "yyyy-MM-dd";
public static String YYYYMMDD="yyMMdd"; public static String YYYYMMDD="yyyyMMdd";
public static String YYYYMMDDHHMMSS = "yyyyMMddHHmmss"; public static String YYYYMMDDHHMMSS = "yyyyMMddHHmmss";
public static String YYYYMMDDHHMMSSsss = "yyyyMMddHHmmssSSS"; public static String YYYYMMDDHHMMSSsss = "yyyyMMddHHmmssSSS";

12
op-gateway/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -17,15 +17,15 @@ spring:
# password: sfnacos2023 # password: sfnacos2023
# namespace: lanju-op # namespace: lanju-op
namespace: lanju-op namespace: lanju-op
group: prod-new group: zxl
# 服务注册地址 # 服务注册地址
server-addr: 192.168.202.20:8848 server-addr: 140.249.53.142:8848
config: config:
#命名空间 #命名空间
namespace: lanju-op namespace: lanju-op
group: prod-new group: zxl
# 配置中心地址 # 服务注册地址
server-addr: 192.168.202.20:8848 server-addr: 140.249.53.142:8848
# 配置文件格式 # 配置文件格式
file-extension: yml file-extension: yml
# 共享配置 # 共享配置
@ -41,7 +41,7 @@ spring:
datasource: datasource:
ds1: ds1:
nacos: nacos:
server-addr: 192.168.202.20:8848 server-addr: 140.249.53.142:8848
dataId: sentinel-op-gateway dataId: sentinel-op-gateway
groupId: DEFAULT_GROUP groupId: DEFAULT_GROUP
data-type: json data-type: json

12
op-modules/op-device/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -14,16 +14,14 @@ spring:
nacos: nacos:
discovery: discovery:
namespace: lanju-op namespace: lanju-op
group: prod-new group: zxl
# 服务注册地址 # 服务注册地址
server-addr: 192.168.202.20:8848 server-addr: 140.249.53.142:8848
config: config:
namespace: lanju-op namespace: lanju-op
group: prod-new group: zxl
#命名空间 # 服务注册地址
#group: local server-addr: 140.249.53.142:8848
# 配置中心地址
server-addr: 192.168.202.20:8848
# 配置文件格式 # 配置文件格式
file-extension: yml file-extension: yml
# 共享配置 # 共享配置

12
op-modules/op-energy/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -14,16 +14,14 @@ spring:
nacos: nacos:
discovery: discovery:
namespace: lanju-op namespace: lanju-op
group: prod-new group: zxl
# 服务注册地址 # 服务注册地址
server-addr: 192.168.202.20:8848 server-addr: 140.249.53.142:8848
config: config:
namespace: lanju-op namespace: lanju-op
group: prod-new group: zxl
#命名空间 # 服务注册地址
#group: local server-addr: 140.249.53.142:8848
# 配置中心地址
server-addr: 192.168.202.20:8848
# 配置文件格式 # 配置文件格式
file-extension: yml file-extension: yml
# 共享配置 # 共享配置

8
op-modules/op-file/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -15,15 +15,15 @@ spring:
discovery: discovery:
# 服务注册地址 # 服务注册地址
namespace: lanju-op namespace: lanju-op
group: prod-new group: zxl
# 服务注册地址 # 服务注册地址
server-addr: 192.168.202.20:8848 server-addr: 140.249.53.142:8848
config: config:
# 配置中心地址 # 配置中心地址
namespace: lanju-op namespace: lanju-op
group: prod-new group: zxl
# 服务注册地址 # 服务注册地址
server-addr: 192.168.202.20:8848 server-addr: 140.249.53.142:8848
# 配置文件格式 # 配置文件格式
file-extension: yml file-extension: yml
# 共享配置 # 共享配置

10
op-modules/op-gen/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -14,15 +14,15 @@ spring:
nacos: nacos:
discovery: discovery:
namespace: lanju-op namespace: lanju-op
group: prod-new group: zxl
# 服务注册地址 # 服务注册地址
server-addr: 192.168.202.20:8848 server-addr: 140.249.53.142:8848
config: config:
#命名空间 #命名空间
namespace: lanju-op namespace: lanju-op
group: prod-new group: zxl
# 配置中心地址 # 服务注册地址
server-addr: 192.168.202.20:8848 server-addr: 140.249.53.142:8848
# 配置文件格式 # 配置文件格式
file-extension: yml file-extension: yml
# 共享配置 # 共享配置

12
op-modules/op-job/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -14,16 +14,14 @@ spring:
nacos: nacos:
discovery: discovery:
namespace: lanju-op namespace: lanju-op
group: prod-new group: zxl
# 服务注册地址 # 服务注册地址
server-addr: 192.168.202.20:8848 server-addr: 140.249.53.142:8848
config: config:
namespace: lanju-op namespace: lanju-op
group: prod-new group: zxl
#命名空间 # 服务注册地址
#group: local server-addr: 140.249.53.142:8848
# 配置中心地址
server-addr: 192.168.202.20:8848
# 配置文件格式 # 配置文件格式
file-extension: yml file-extension: yml
# 共享配置 # 共享配置

12
op-modules/op-mes/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -14,16 +14,14 @@ spring:
nacos: nacos:
discovery: discovery:
namespace: lanju-op namespace: lanju-op
group: prod-new group: zxl
# 服务注册地址 # 服务注册地址
server-addr: 192.168.202.20:8848 server-addr: 140.249.53.142:8848
config: config:
namespace: lanju-op namespace: lanju-op
group: prod-new group: zxl
#命名空间 # 服务注册地址
#group: local server-addr: 140.249.53.142:8848
# 配置中心地址
server-addr: 192.168.202.20:8848
# 配置文件格式 # 配置文件格式
file-extension: yml file-extension: yml
# 共享配置 # 共享配置

1
op-modules/op-plan/src/main/java/com/op/plan/mapper/ProWhiteOrderMapper.java
Unescape Escape View File

@ -82,4 +82,5 @@ public interface ProWhiteOrderMapper {
*/ */
List<ProShift> selectProShift(); List<ProShift> selectProShift();
Integer getTodayMaxNum();
} }

10
op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProWhiteOrderServiceImpl.java
Unescape Escape View File

@ -97,7 +97,10 @@ public class ProWhiteOrderServiceImpl implements IProWhiteOrderService {
proOrder.setStatus("o0"); proOrder.setStatus("o0");
proOrder.setQuantitySplit(0L); proOrder.setQuantitySplit(0L);
proOrder.setOrderType(proOrder.getProdType()); proOrder.setOrderType(proOrder.getProdType());
proOrder.setOrderCode("DD" + DateUtils.parseDateToStr(DateUtils.YYYYMMDDHHMMSSsss, DateUtils.getNowDate())); String bpDD = "DD" + DateUtils.parseDateToStr(DateUtils.YYYYMMDD, DateUtils.getNowDate());
int liushuiNum = proWhiteOrderMapper.getTodayMaxNum();
String liushuiStr = String.format("%04d", liushuiNum);
proOrder.setOrderCode(bpDD+liushuiStr);
proOrder.setCreateBy(SecurityContextHolder.getUserName()); proOrder.setCreateBy(SecurityContextHolder.getUserName());
proOrder.setCreateTime(DateUtils.getNowDate()); proOrder.setCreateTime(DateUtils.getNowDate());
proOrder.setUpdateBy(SecurityContextHolder.getUserName()); proOrder.setUpdateBy(SecurityContextHolder.getUserName());
@ -342,5 +345,8 @@ public class ProWhiteOrderServiceImpl implements IProWhiteOrderService {
proOrderWorkorder.setChildren(childWorkorders); // 设置子工单列表 proOrderWorkorder.setChildren(childWorkorders); // 设置子工单列表
} }
} }
public static void main(String args[]){
String formatted = String.format("%04d", 7);
System.out.println(formatted);
}
} }

12
op-modules/op-plan/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -14,16 +14,14 @@ spring:
nacos: nacos:
discovery: discovery:
namespace: lanju-op namespace: lanju-op
group: prod-new group: zxl
# 服务注册地址 # 服务注册地址
server-addr: 192.168.202.20:8848 server-addr: 140.249.53.142:8848
config: config:
namespace: lanju-op namespace: lanju-op
group: prod-new group: zxl
#命名空间 # 服务注册地址
#group: local server-addr: 140.249.53.142:8848
# 配置中心地址
server-addr: 192.168.202.20:8848
# 配置文件格式 # 配置文件格式
file-extension: yml file-extension: yml
# 共享配置 # 共享配置

6
op-modules/op-plan/src/main/resources/mapper/plan/ProWhiteOrderMapper.xml
Unescape Escape View File

@ -88,7 +88,11 @@
SELECT bst.Shift_Id shiftId,bst.Shift_Desc_Global shiftDesc SELECT bst.Shift_Id shiftId,bst.Shift_Desc_Global shiftDesc
FROM base_shifts_t bst FROM base_shifts_t bst
</select> </select>
<select id="getTodayMaxNum" resultType="java.lang.Integer">
select count(0)+1
from pro_order
where order_type = 'white' and plan_pro_date = CONVERT(varchar(10),GETDATE(), 120)
</select>
<insert id="insertProOrder" parameterType="ProOrder"> <insert id="insertProOrder" parameterType="ProOrder">
insert into pro_order insert into pro_order
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">

12
op-modules/op-quality/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -14,16 +14,14 @@ spring:
nacos: nacos:
discovery: discovery:
namespace: lanju-op namespace: lanju-op
group: prod-new group: zxl
# 服务注册地址 # 服务注册地址
server-addr: 192.168.202.20:8848 server-addr: 140.249.53.142:8848
config: config:
namespace: lanju-op namespace: lanju-op
group: prod-new group: zxl
#命名空间 # 服务注册地址
#group: local server-addr: 140.249.53.142:8848
# 配置中心地址
server-addr: 192.168.202.20:8848
# 配置文件格式 # 配置文件格式
file-extension: yml file-extension: yml
# 共享配置 # 共享配置

12
op-modules/op-sap/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -14,16 +14,14 @@ spring:
nacos: nacos:
discovery: discovery:
namespace: lanju-op namespace: lanju-op
group: prod-new group: zxl
# 服务注册地址 # 服务注册地址
server-addr: 192.168.202.20:8848 server-addr: 140.249.53.142:8848
config: config:
namespace: lanju-op namespace: lanju-op
group: prod-new group: zxl
#命名空间 # 服务注册地址
#group: local server-addr: 140.249.53.142:8848
# 配置中心地址
server-addr: 192.168.202.20:8848
# 配置文件格式 # 配置文件格式
file-extension: yml file-extension: yml
# 共享配置 # 共享配置

12
op-modules/op-security/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -14,16 +14,14 @@ spring:
nacos: nacos:
discovery: discovery:
namespace: lanju-op namespace: lanju-op
group: prod-new group: zxl
# 服务注册地址 # 服务注册地址
server-addr: 192.168.202.20:8848 server-addr: 140.249.53.142:8848
config: config:
namespace: lanju-op namespace: lanju-op
group: prod-new group: zxl
#命名空间 # 服务注册地址
#group: local server-addr: 140.249.53.142:8848
# 配置中心地址
server-addr: 192.168.202.20:8848
# 配置文件格式 # 配置文件格式
file-extension: yml file-extension: yml
# 共享配置 # 共享配置

12
op-modules/op-system/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -14,16 +14,14 @@ spring:
nacos: nacos:
discovery: discovery:
namespace: lanju-op namespace: lanju-op
group: prod-new group: zxl
# 服务注册地址 # 服务注册地址
server-addr: 192.168.202.20:8848 server-addr: 140.249.53.142:8848
config: config:
namespace: lanju-op namespace: lanju-op
group: prod-new group: zxl
#命名空间 # 服务注册地址
#group: local server-addr: 140.249.53.142:8848
# 配置中心地址
server-addr: 192.168.202.20:8848
# 配置文件格式 # 配置文件格式
file-extension: yml file-extension: yml
# 共享配置 # 共享配置

12
op-modules/op-technology/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -14,16 +14,14 @@ spring:
nacos: nacos:
discovery: discovery:
namespace: lanju-op namespace: lanju-op
group: prod-new group: zxl
# 服务注册地址 # 服务注册地址
server-addr: 192.168.202.20:8848 server-addr: 140.249.53.142:8848
config: config:
namespace: lanju-op namespace: lanju-op
group: prod-new group: zxl
#命名空间 # 服务注册地址
#group: local server-addr: 140.249.53.142:8848
# 配置中心地址
server-addr: 192.168.202.20:8848
# 配置文件格式 # 配置文件格式
file-extension: yml file-extension: yml
# 共享配置 # 共享配置

12
op-modules/op-wms/src/main/resources/bootstrap.yml
Unescape Escape View File

@ -14,16 +14,14 @@ spring:
nacos: nacos:
discovery: discovery:
namespace: lanju-op namespace: lanju-op
group: prod-new group: zxl
# 服务注册地址 # 服务注册地址
server-addr: 192.168.202.20:8848 server-addr: 140.249.53.142:8848
config: config:
namespace: lanju-op namespace: lanju-op
group: prod-new group: zxl
#命名空间 # 服务注册地址
#group: local server-addr: 140.249.53.142:8848
# 配置中心地址
server-addr: 192.168.202.20:8848
# 配置文件格式 # 配置文件格式
file-extension: yml file-extension: yml
# 共享配置 # 共享配置

Write Preview
Loading…
Cancel
Save