Commit Graph

785 Commits

Author SHA1 Message Date
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
3e59139e0c rev:配粉开单时,软废库存选择根据产品对应PG粉维护的库存等级去选择 2023-07-18 16:15:37 +08:00
abd8de964c rev:货位分配重复问题 2023-07-18 11:24:16 +08:00
84e4ce7af3 rev: 物料参数设置-软废碳平衡同步 2023-07-17 17:22:31 +08:00
zhangzhiqiang
73eb90d929 rev:球磨时间维护 2023-07-17 16:45:36 +08:00
1d0ed56797 add:混合料生产报表 2023-07-17 15:03:27 +08:00
0e37af66a3 rev:软废等级处理 2023-07-12 14:20:11 +08:00
71edee2319 rev:软废碳平衡修正维护,袋标签打印,分配货位重复,球磨工艺酒精计算,入库删除 2023-07-10 17:18:48 +08:00
zhangzhiqiang
bd7489ca0c rev:同步按钮添加spring获取 2023-06-14 10:52:05 +08:00
01980f65df rev:配粉开单合批模式球磨时间计算 2023-06-09 13:58:10 +08:00
c172453084 rev:生产配粉出库精度修改 保留3位小数 2023-06-08 11:12:13 +08:00
975bd75f65 rev:物料参数保存报错、软废库存是否可用不一致、入库分配删除桶不生效 2023-06-07 18:40:55 +08:00
zhangzhiqiang
3c34900441 rev:修改bug入库 2023-06-03 17:14:04 +08:00
zhangzhiqiang
e495271f23 rev:移库操作添加任务校验 2023-06-02 17:10:16 +08:00
zhangzhiqiang
09cbc18898 rev:修改日志 2023-06-02 15:05:22 +08:00
zhangzhiqiang
e75fb3216c rev:es日志查询 2023-06-02 11:26:57 +08:00
zhangzhiqiang
9c590599d6 rev:bom修改 2023-06-01 13:55:06 +08:00
zhangzhiqiang
a6204571be add:添加组盘物料校验 2023-06-01 13:40:10 +08:00
dbf5bc9b93 rev:修改查询压制单据、生产员信息视图sql 2023-05-05 10:36:20 +08:00
zhangzhiqiang
541ffd5bca rev:合批球磨时间 2023-05-04 17:52:50 +08:00
2b0d367303 add:新增查询erp视图接口 2023-05-04 17:49:26 +08:00
3b5f98eca7 add:PDA配粉工序查询过滤,PDA球磨工序上料查询过滤,新增型材区域,手持喷雾工序增加按钮‘入原材料库’,外协发货增加逻辑,PDA增加内部软废入库功能 2023-05-03 10:19:54 +08:00
zhangzhiqiang
58f7c89bb8 add:修改软废维护未字典表配置:涉及软废配置表->软费系数;合批球磨时间->合批开单 2023-05-02 18:17:54 +08:00
f08a7c6273 add:新增PC袋标签新增打印按钮 2023-04-26 08:46:13 +08:00
zhangzhiqiang
0112e723c7 fix:状态变更添加等待锁 2023-04-20 11:18:52 +08:00
zhangzhiqiang
9fd1a1e6dd fix:合同在途供应商列表 2023-04-13 21:21:03 +08:00
zhangzhiqiang
bd2d272b68 rev:注释 2023-04-13 16:40:00 +08:00
zhangzhiqiang
e7e55249af rev:合同在途修改为下拉框 2023-04-13 16:38:03 +08:00
zhangzhiqiang
1e30a0441f rev:拼盘精度问题;移库任务点位添加校验 2023-04-09 20:40:54 +08:00
zhangzhiqiang
e9cced47d4 fix:合同在途sql 2023-04-03 19:42:33 +08:00
zhangzhiqiang
db4ba29b36 fix:1.配粉槽分配重复2.合同在途供应商查询sql 2023-04-03 18:22:27 +08:00
zhangzhiqiang
239ff311cf rev:采购订单同步 2023-04-03 08:37:05 +08:00
zhangzhiqiang
9523165dc5 fix:sql 2023-03-21 11:13:06 +08:00
zhangzhiqiang
938c829f05 fex:合同在途查询条件修改 2023-03-20 10:52:41 +08:00
zhangzhiqiang
71af2168fd fix:合同在途sql修改 2023-03-20 10:50:10 +08:00
zhangzhiqiang
c36cb73bcf add:日常需求迭代 2023-03-17 19:08:22 +08:00
zhangzhiqiang
4b1ef310fc mdf:修改日志范围 2023-03-05 13:03:52 +08:00
zhangzhiqiang
a2f3e4f170 mdf:修改日志范围 2023-03-03 16:52:43 +08:00
zhangzhiqiang
e5fb957b33 add:生产环境配置 2023-03-01 15:23:54 +08:00
zhangzhiqiang
c30d6ea551 add:添加日志系统 2023-03-01 11:20:26 +08:00
zhangzhiqiang
bc04927b56 启动环境 2023-03-01 10:25:01 +08:00
zhangzhiqiang
d56efb2621 fix:日志查询 2023-03-01 10:14:06 +08:00
1fdb9d4911 更新 2023-03-01 04:45:06 +08:00
zhangzhiqiang
80537b08e5 es日志前端 2023-02-28 14:39:09 +08:00
zhangzhiqiang
ba2e33c41e add:es日志,接入未测试
todo:添加日志删除按钮及日志条数显示
2023-02-28 10:46:09 +08:00
zhangzhiqiang
12578868f8 add:粉料计划添加3个导出功能 2023-02-27 08:32:09 +08:00
zhangzhiqiang
d3d71f995f add:粉料计划添加3个导出功能 2023-02-26 23:07:59 +08:00