Commit Graph

831 Commits

Author SHA1 Message Date
zhangzq
1b72b702c2 Merge remote-tracking branch 'origin/master' 2024-01-20 21:41:46 +08:00
zhangzq
9817f2dcc6 opt:优化日志打印 2024-01-20 21:41:30 +08:00
7fc203205d rev:粉料到货需求:后续需求量修改 2024-01-19 10:51:13 +08:00
zhangzq
d0f23c77f7 opt:日志内容优化 2024-01-17 17:49:03 +08:00
zhangzq
a4dee0902d opt:优化sql日志打印 2024-01-12 16:31:08 +08:00
zhangzq
5040ca0b04 rev:物料设置不u更新自动开单问题 2024-01-04 15:33:12 +08:00
zhangzq
07044ad6e1 add:配方同步hcp球磨时间 2024-01-04 14:27:31 +08:00
zhangzq
0a34f8336e opt:日志优化 2024-01-02 13:34:42 +08:00
zhangzq
956cb03886 opt:日志优化 2024-01-02 09:55:01 +08:00
zhangzq
806c399860 opt:日志优化 2023-12-28 14:00:05 +08:00
zhangzq
8a9628a2d0 opt:质检单确认接口优化 2023-12-25 13:59:23 +08:00
zhangzq
ec7d09ccfc rev:球磨下料加锁 2023-12-21 14:45:44 +08:00
zhangzq
7ebd65b2f3 rev:查询仓位不生效 2023-12-21 08:47:44 +08:00
c01a367876 rev:1.合同台账修改 2.混合料质检喷雾工序加质检抽样标签打印 2023-12-19 16:57:25 +08:00
zhangzq
c2b0f2e5ad add:新增配粉开单检测结果导入功能 2023-12-15 13:48:52 +08:00
53ea6feb4f rev:注释 2023-12-15 10:09:00 +08:00
zhangzq
edda1898c8 Merge remote-tracking branch 'origin/master' 2023-12-14 11:14:28 +08:00
zhangzq
42dac28ab6 rev:配方作业acs回调重量小数点4位导致出库残留任务 2023-12-14 11:14:20 +08:00
b93ee60918 add:新增预排量维护功能 rev:粉料到货需求--加入预排量、待检入库量弹出页面加到货时间、明细加所属组织 2023-12-13 17:18:29 +08:00
zhangzq
dbd03302eb rev:任务与单据:下发任务更新单据与acs反馈任务更新单据 互斥导致超时 拼盘 2023-12-12 11:02:39 +08:00
zhangzq
48adfaf13d Merge remote-tracking branch 'origin/master' 2023-12-12 10:59:53 +08:00
zhangzq
0de57810b9 rev:任务与单据:下发任务更新单据与acs反馈任务更新单据 互斥导致超时 2023-12-12 10:59:43 +08:00
3318817a4a rev:等级修改 2023-12-12 08:59:39 +08:00
32719c4dd2 Merge branch 'master' of http://121.40.234.130:8899/root/wuHanXinRui 2023-12-12 08:58:16 +08:00
35790c46a6 rev:等级修改 2023-12-12 08:57:59 +08:00
zhangzq
146d4a453f rev:修改 suo 2023-12-11 16:58:09 +08:00
zhangzq
20c01e934d rev:修改手动叫料 2023-12-11 15:42:33 +08:00
zhangzq
2bb22a03fa rev:修改newcode 2023-12-07 16:58:16 +08:00
zhangzq
d61db365fd rev:修改newcode 2023-12-07 14:53:55 +08:00
zhangzq
ff0f5e0269 opt:配粉开单优化:原料根据质检时间 2023-12-05 17:31:18 +08:00
zhangzq
34007d3b24 rev:修改货位分配代码 2023-12-04 15:30:05 +08:00
zhangzq
cf2b72496c rev:修改回库锁范围 2023-11-27 14:30:43 +08:00
zhangzhiqiang
8fe6902917 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/FlourworkService.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java
2023-11-04 16:02:38 +08:00
zhangzhiqiang
e0e784ce85 rev:修改自动叫料逻辑判断 2023-11-04 16:02:21 +08:00
zhangzhiqiang
9240622351 rev:修改自动叫料逻辑判断 2023-10-31 09:10:51 +08:00
a341854361 fix:配粉作业接口优化 2023-10-27 14:14:58 +08:00
zhangzhiqiang
6907f62d6b rev:型材出库修改/加锁;日志清除 2023-10-12 17:15:23 +08:00
1dd594a843 rev:报修新增条件去掉 2023-09-18 14:53:17 +08:00
3619b08443 rev:球磨工艺参数设置 2023-09-15 09:55:26 +08:00
eebbc0beff rev:工艺路线修改 2023-09-08 17:07:38 +08:00
0dbf8c8e29 rev:产能模板修改 2023-09-08 16:43:43 +08:00
973099a002 rev:型材出库点位解锁 2023-09-01 16:01:06 +08:00
1a9f831aa5 rev:修改作废按钮位置 2023-08-24 09:20:04 +08:00
a9722cf663 rev:滚动条修改 2023-07-26 16:28:37 +08:00
2bb73dd0e1 rev:粉料计划原料到货需求 列表高光 2023-07-26 14:13:11 +08:00
e00d4e8da2 rev:查询压制单号匹配修改,软废默认压制软废 2023-07-25 18:03:07 +08:00
cd3c5a0457 rev:物料参数设置pgf物料参数保存 2023-07-20 09:23:51 +08:00
baa28b5530 rev:解决冲突 2023-07-18 17:28:35 +08:00
80a50ee4bd fix:代码找回 2023-07-18 16:58:30 +08:00
dda223d20a Merge branch 'master' of http://121.40.234.130:8899/root/wuHanXinRui 2023-07-18 16:15:43 +08:00