Commit Graph

2478 Commits

Author SHA1 Message Date
yanps
0b9b990262 opt: 烘箱行架监控大屏优化 2024-03-20 16:59:08 +08:00
7a50c3c230 Merge remote-tracking branch 'origin/master' 2024-03-20 15:01:19 +08:00
bb012a2c40 fix: 堆垛机 2024-03-20 15:00:59 +08:00
yanps
6da0f596bc add: 增加二楼NDC日志 2024-03-20 14:26:44 +08:00
ea9cb45a3a fix: 现场联调行家 2024-03-20 13:42:36 +08:00
773a951f1f rev:修改确认子卷木箱规格页面能;
add:增加数据库字段执行sql;
2024-03-20 13:40:26 +08:00
yanps
72c9717169 fix: 解决日志信号变化为null的问题 2024-03-20 10:54:46 +08:00
eba9ebf754 feat: 分切的部分注释、魔法值提取 2024-03-20 09:06:02 +08:00
e228808ebd rev:代码合并 2024-03-20 09:05:42 +08:00
79bc126d39 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2024-03-20 09:05:13 +08:00
2f4e488f2c rev:出库分配页面 优化 2024-03-20 09:04:49 +08:00
d99c0d8437 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
2024-03-20 09:04:32 +08:00
2eac4ea4e3 fix: 现场联调 2024-03-20 09:01:40 +08:00
yanps
c9fb151de5 fix: 解决连续创建多个指令 2024-03-19 18:23:10 +08:00
3e808280ad rev:成品报废审核新增字段 2024-03-19 15:26:52 +08:00
7b7d4d542a rev:成品报废导入 2024-03-19 15:00:05 +08:00
d0b46cc42a Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-03-19 14:49:14 +08:00
22d7a97b27 rev:样式修改 2024-03-19 14:49:05 +08:00
e42fdec93a rev:代码合并 2024-03-19 14:30:43 +08:00
9f5eb3914f Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2024-03-19 14:30:09 +08:00
565878bde3 rev:1.发货出库不能强控优化2.出库实际重量显示真是发货重量3.B开头子卷保质期为180天优化4.发货信息回传sap优化5.库存报表字段优化6.一键新增仓位优化 2024-03-19 14:29:56 +08:00
461781c5d8 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2024-03-19 14:20:49 +08:00
080fd348e3 rev:页面优化 2024-03-19 14:20:41 +08:00
yanps
ecbf9077c7 opt: 自动门优化 2024-03-19 13:08:35 +08:00
6903bdfa6d add: 行架缓存为页面 2024-03-18 11:03:09 +08:00
2fa7a54247 add: 行架缓存为页面 2024-03-18 10:59:44 +08:00
5303bf4828 Merge remote-tracking branch 'origin/master' 2024-03-18 08:46:07 +08:00
0783af09c2 fix: 堆垛机联调 2024-03-18 08:45:37 +08:00
3f44cb3043 rev:成品出库报表导出新增管件编码、管件描述 2024-03-15 16:16:51 +08:00
00c520344a add:仓储手持功能 2024-03-15 15:59:24 +08:00
yanps
c83881410f opt: 流量限制优化 2024-03-15 09:11:49 +08:00
5ad7a02093 rev:解决联调问题 2024-03-14 18:02:00 +08:00
cabcd9d233 rev:出入库异常任务 2024-03-14 17:50:04 +08:00
7b9c7ea911 opt: 分切 2024-03-14 17:39:06 +08:00
e4caec2918 Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2024-03-14 14:14:27 +08:00
f2817ff5b6 rev:时间BUG修改 2024-03-14 14:14:20 +08:00
e1a6524fa9 rev:向飞书推送图片:增加排序、占比 2024-03-14 11:24:21 +08:00
d949018c11 rev:出入库异常任务 2024-03-14 10:21:58 +08:00
b0c711d5cc Merge branch 'b_lms' of http://121.40.234.130:8899/root/lanzhouhailiang_one into b_lms 2024-03-14 09:31:56 +08:00
83cf6a3928 rev:表处逻辑修改 2024-03-14 09:31:47 +08:00
2968905d15 rev:提示修改 2024-03-13 17:50:50 +08:00
2a9cd7b3d0 rev:调式更新 2024-03-13 17:07:29 +08:00
83d45da5c3 add:新增需求 2024-03-13 09:08:53 +08:00
b5efde54cc add: 废箔称重 2024-03-12 18:06:58 +08:00
036bc71e08 rev:向飞书推送图片:增加客户限制 2024-03-12 16:18:24 +08:00
598b91733c opt: 分切任务代码 2024-03-12 15:35:41 +08:00
25b5ed048c feat: 分切业务 2024-03-12 11:28:33 +08:00
57d571d5fa rev:向飞书推送图片 加锁 2024-03-12 11:15:06 +08:00
e6241ada4d Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one 2024-03-12 09:24:42 +08:00
59b40b6174 dev:EXCEL定时器问题修改 2024-03-12 09:24:34 +08:00