mengjiao
|
1266436fc8
|
wms成品销售出库bug修改
|
5 months ago |
zhaoxiaolin
|
468feefe18
|
烘房和成型机小时产量报表
|
5 months ago |
|
mengjiao
|
36cf3ed508
|
wms成品销售出库生成备货单修改，前端选择一个单子，生成所以项，并且根据对应的库存，没有库存的进行提示，限制无限生成，添加配置数量字段
|
5 months ago |
|
mengjiao
|
ef441a5676
|
wms成品库存明细页面，加成品销售手持提交改动添加出库字段
|
5 months ago |
|
mengjiao
|
02b96ef6c7
|
wms成品出库页面接口1
|
5 months ago |
|
zhaoxiaolin
|
e548314080
|
烘房统计报表+产品追溯
|
6 months ago |
|
zhaoxiaolin
|
2cf6bef0ef
|
烘房统计报表+产品追溯
|
6 months ago |
元气满满(jgy)
|
0aafe49643
|
2025-1-9 DEVICE - 设备审核问题 -提醒不存在设备
|
6 months ago |
|
mengjiao
|
9811f49946
|
wms手持接口bug3和前端页面的线体框问题
|
6 months ago |
|
mengjiao
|
11688cc09c
|
wms手持接口bug2
|
6 months ago |
|
mengjiao
|
7993dc9582
|
Merge remote-tracking branch 'origin/master'
|
6 months ago |
|
mengjiao
|
53359c9556
|
wms手持接口bug
|
6 months ago |
|
zhaoxiaolin
|
0b142e0711
|
Merge remote-tracking branch 'origin/master'
|
6 months ago |
|
zhaoxiaolin
|
1062ae3f8e
|
烘房统计报表+产品追溯
|
6 months ago |
|
元气满满(jgy)
|
bb68edc6bb
|
2025-1-8 MES-完产清线点检
|
6 months ago |
|
zhaoxiaolin
|
501ca0b094
|
烘房统计报表+产品追溯
|
6 months ago |
 Yangwl
|
db16cdcfb7
|
Merge remote-tracking branch 'origin/master'
|
6 months ago |
|
Yangwl
|
1ab7051672
|
月度报表权限修改
|
6 months ago |
|
元气满满(jgy)
|
2cdae7a0fa
|
2025-1-7 MES-产品首检记录表、自检互检记录表
|
6 months ago |
|
mengjiao
|
a2ff4b3ecd
|
wms手持批条件筛选
|
6 months ago |
|
mengjiao
|
8e093d7a30
|
wms手持批条件筛选
|
6 months ago |
|
mengjiao
|
fc48d69276
|
Merge remote-tracking branch 'origin/master'
|
6 months ago |
|
mengjiao
|
a1caec6ae3
|
wms白胚原材料库存查询，如果amount_real为null就查询为0
|
6 months ago |
|
Yangwl
|
704fc3a920
|
Merge remote-tracking branch 'origin/master'
|
6 months ago |
|
Yangwl
|
5ae3401253
|
看板接口更改
|
6 months ago |
|
mengjiao
|
b195472f0d
|
wms冲销bug2
|
6 months ago |
|
mengjiao
|
2ea82a3b29
|
Merge remote-tracking branch 'origin/master'
|
6 months ago |
|
mengjiao
|
255677abf4
|
wms冲销bug
|
6 months ago |
|
Yangwl
|
e486f8b0c1
|
增加白坯成型、收坯数据接口
|
6 months ago |
|
mengjiao
|
91bf322f6b
|
wms成品装运单相同的是要生成相同的备货单
|
6 months ago |
|
mengjiao
|
dfe5847d6f
|
wms成品入库，加上返回的年凭证
|
6 months ago |
|
mengjiao
|
0f577038e4
|
Merge remote-tracking branch 'origin/master'
|
6 months ago |
|
mengjiao
|
945f73a84e
|
wms补打关联库区
|
6 months ago |
|
zhaoxiaolin
|
10919af34a
|
Merge remote-tracking branch 'origin/master'
|
6 months ago |
|
zhaoxiaolin
|
94e7b7bf2c
|
权限问题修正
|
6 months ago |
|
mengjiao
|
a5fbdb51ef
|
Merge remote-tracking branch 'origin/master'
|
6 months ago |
|
mengjiao
|
dbeac951fc
|
wms生成备货单其中一个分支修改插入的对象
|
6 months ago |
|
zhaoxiaolin
|
29b045759f
|
Merge remote-tracking branch 'origin/master'
|
6 months ago |
|
zhaoxiaolin
|
1578c1a8b3
|
权限问题修正
|
6 months ago |
|
mengjiao
|
18788fd557
|
wms排序
|
6 months ago |
|
mengjiao
|
f753248d11
|
Merge remote-tracking branch 'origin/master'
|
6 months ago |
|
mengjiao
|
7dec1b6c8f
|
wms成品报错问题
|
6 months ago |
|
zhaoxiaolin
|
f80f4634d8
|
领料单数量*2问题修正
|
6 months ago |
|
元气满满(jgy)
|
b0e278f6d0
|
2024-12-20 设备模块-维修审核问题
|
6 months ago |
|
mengjiao
|
386dbbb273
|
Merge remote-tracking branch 'origin/master'
|
6 months ago |
|
mengjiao
|
7f0f20a47f
|
wms冲销BUG2
|
6 months ago |
|
zhaoxiaolin
|
9ae60f7b4e
|
产品主键跟踪
|
6 months ago |
|
zhaoxiaolin
|
7355106bd5
|
Merge remote-tracking branch 'origin/master'
|
6 months ago |
|
zhaoxiaolin
|
80974120a8
|
产品主键跟踪
|
6 months ago |
|
mengjiao
|
73bc19174f
|
wms冲销查询rawOrderInId改为ID
|
6 months ago |
|
mengjiao
|
8cd2b82f04
|
wms冲销bug
|
6 months ago |
|
zhaoxiaolin
|
8d7c9c10ee
|
Merge remote-tracking branch 'origin/master'
|
6 months ago |
|
zhaoxiaolin
|
4e71868a76
|
产品主键跟踪
|
6 months ago |
|
mengjiao
|
4d06ca0e40
|
Merge remote-tracking branch 'origin/master'
|
7 months ago |
|
mengjiao
|
758f9505f9
|
wms补打功能的查询物料改为模糊查询
|
7 months ago |
|
zhaoxiaolin
|
a79b8b7c63
|
问题修复24
|
7 months ago |
|
zhaoxiaolin
|
2006f9145a
|
问题修复24
|
7 months ago |
|
zhaoxiaolin
|
4f6a3514d4
|
问题修复24
|
7 months ago |
|
zhaoxiaolin
|
1eaaf46109
|
问题修复24
|
7 months ago |
|
zhaoxiaolin
|
8a531dd2fd
|
问题修复24
|
7 months ago |
|
元气满满(jgy)
|
972ab962cc
|
2024-12-11 质量上传照片
|
7 months ago |
|
zhaoxiaolin
|
ab9dd8eb5d
|
Merge remote-tracking branch 'origin/master'
|
7 months ago |
|
zhaoxiaolin
|
6770999e8a
|
问题修复24
|
7 months ago |
|
mengjiao
|
4152a51a9d
|
Merge remote-tracking branch 'origin/master'
|
7 months ago |
|
mengjiao
|
9529c14ba7
|
wms质检修改3
|
7 months ago |
|
zhaoxiaolin
|
16fbc0eeff
|
修复2
|
7 months ago |
|
zhaoxiaolin
|
cb3a8810ae
|
Merge remote-tracking branch 'origin/master'
|
7 months ago |
|
zhaoxiaolin
|
d376da1957
|
问题修复24
|
7 months ago |
|
mengjiao
|
1e95415fa8
|
wms质检修改2
|
7 months ago |
|
mengjiao
|
6c53998b20
|
Merge remote-tracking branch 'origin/master'
|
7 months ago |
|
mengjiao
|
e1806718ae
|
wms质检修改
|
7 months ago |
|
Yangwl
|
024a293bee
|
Merge remote-tracking branch 'origin/master'
|
7 months ago |
|
Yangwl
|
190116c425
|
单耗数据增加工时统计
|
7 months ago |
|
mengjiao
|
b250e7146f
|
Merge remote-tracking branch 'origin/master'
|
7 months ago |
|
mengjiao
|
d6a3865f2a
|
wms工序汇总报表
|
7 months ago |
|
zhaoxiaolin
|
6ac3800606
|
问题修复23
|
7 months ago |
|
zhaoxiaolin
|
a68f69ad9a
|
问题修复23
|
7 months ago |
|
zhaoxiaolin
|
ccfbf80a28
|
问题修复22
|
7 months ago |
|
mengjiao
|
54e8525ebc
|
Merge remote-tracking branch 'origin/master'
|
7 months ago |
|
mengjiao
|
a480e5c566
|
wms修改补打不插入到库存里面。和补打不需要选择仓库和库区，根据配置的物料附属信息获取仓库和库区
|
7 months ago |
|
zhaoxiaolin
|
4b3f067c89
|
问题修复21
|
7 months ago |
|
zhaoxiaolin
|
27be79c807
|
问题修复20
|
7 months ago |
|
mengjiao
|
70142e8e62
|
wms白胚原材料查询bug
|
7 months ago |
陈恒杰
|
c0f35d9c33
|
白坯原材料入库优化
|
7 months ago |
|
zhaoxiaolin
|
a5db9cd88b
|
Merge remote-tracking branch 'origin/master'
|
7 months ago |
|
zhaoxiaolin
|
d79301f588
|
问题修复19
|
7 months ago |
|
mengjiao
|
fbb0bf5e12
|
wms成品入库的批次bug--批次字符串上可能会多个空格，导致判断有误--所以去除空格
|
7 months ago |
|
mengjiao
|
1c683f8dfd
|
wms标识卡扫描小bug
|
7 months ago |
|
mengjiao
|
b76b9bddd4
|
wms冲销bug修改
|
7 months ago |
|
mengjiao
|
78c4cba12b
|
wms测试后又提的需求要收货时对应标识卡可以进行修改
|
7 months ago |
|
mengjiao
|
ed9146112d
|
wms标识卡查询添加字段
|
7 months ago |
|
mengjiao
|
0fe5bd2afc
|
wms105过账bug2
|
7 months ago |
|
mengjiao
|
84ab36e7c7
|
wms105过账bug
|
7 months ago |
|
mengjiao
|
af915c1845
|
wms新的收货优化2和生产领料bug
|
7 months ago |
|
mengjiao
|
2107dd5da5
|
wms新的收货优化
|
7 months ago |
|
Yangwl
|
61d3b1beb3
|
Merge remote-tracking branch 'origin/master'
|
7 months ago |
|
Yangwl
|
86fd98b6db
|
箱型改单表，生产日报表导出修改。
|
7 months ago |
|
mengjiao
|
c27f446a8f
|
Merge remote-tracking branch 'origin/master'
|
7 months ago |
|
mengjiao
|
1ab20ef427
|
wms问题1
|
7 months ago |
|
Yangwl
|
59b032d6b5
|
Merge remote-tracking branch 'origin/master'
|
7 months ago |
|
Yangwl
|
8bd1b45747
|
生产日报表导出，查询修改
|
7 months ago |
|
mengjiao
|
18d5844879
|
Merge remote-tracking branch 'origin/master'
|
7 months ago |
|
mengjiao
|
72d547a265
|
wms补打和冲销的问题完善和一些比如过账批次的小问题修改
|
7 months ago |
|
zhaoxiaolin
|
98765a6df7
|
问题修复19
|
7 months ago |
|
zhaoxiaolin
|
672b84d4a8
|
问题修复18
|
7 months ago |
|
zhaoxiaolin
|
8b9f201515
|
问题修复17
|
7 months ago |
|
zhaoxiaolin
|
802c4c565e
|
问题修复17
|
7 months ago |
|
Yangwl
|
19ec79005c
|
报表看板修改，导出数据修改。
|
7 months ago |
|
zhaoxiaolin
|
247240ddda
|
问题修复17
|
7 months ago |
|
陈恒杰
|
b294a02e60
|
Merge remote-tracking branch 'origin/master'
|
7 months ago |
|
陈恒杰
|
76b11c8451
|
白坯原材料入库优化
|
7 months ago |
|
zhaoxiaolin
|
6c258b0a54
|
问题修复16
|
8 months ago |
|
zhaoxiaolin
|
1175a6ad5c
|
问题修复15
|
8 months ago |
|
mengjiao
|
67f3cdde9c
|
wms白胚问题部分接口，和出库过账成功后的明细修改
|
8 months ago |
|
zhaoxiaolin
|
8d62084045
|
问题修复14
|
8 months ago |
|
zhaoxiaolin
|
97a2b159ec
|
问题修复15
|
8 months ago |
|
陈恒杰
|
cc4d3f5ca1
|
自动生成采购单号
|
8 months ago |
|
mengjiao
|
223d3cf056
|
wms白坯原材料手持接口2
|
8 months ago |
|
mengjiao
|
1cfd4b450d
|
wms白坯原材料手持接口
|
8 months ago |
|
陈恒杰
|
6095efa114
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
陈恒杰
|
9cdb893322
|
白坯原材料采购单修改
|
8 months ago |
|
mengjiao
|
cf88a94e26
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
mengjiao
|
d4f7452e7f
|
wms修改3特殊类型
|
8 months ago |
|
陈恒杰
|
e20cb5ed9b
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
陈恒杰
|
6bc77433bc
|
白坯原材料
|
8 months ago |
|
元气满满(jgy)
|
e31986dd44
|
2024-11-8 设备-切线调拨、工单切线 - 微信提醒调整
|
8 months ago |
|
Yangwl
|
e0f6e198ca
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
Yangwl
|
3e7339cc3e
|
单耗修改
|
8 months ago |
|
zhaoxiaolin
|
93105ec308
|
问题修复14
|
8 months ago |
|
zhaoxiaolin
|
f32aa42ba7
|
问题修复14
|
8 months ago |
|
zhaoxiaolin
|
036e690fad
|
问题修复14
|
8 months ago |
|
zhaoxiaolin
|
c88726d580
|
问题修复13
|
8 months ago |
|
元气满满(jgy)
|
0284c08961
|
2024-11-06 MES+sys API+Device 三个模块 生产工单切线、切线调拨产生新设备点检任务
|
8 months ago |
|
mengjiao
|
3535c84db7
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
mengjiao
|
0aa30108d6
|
wms修改2
|
8 months ago |
|
zhaoxiaolin
|
303ecdb66b
|
问题修复13
|
8 months ago |
|
Yangwl
|
70b7e13878
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
Yangwl
|
b2539af219
|
生产日报表看板
|
8 months ago |
|
zhaoxiaolin
|
37bef6b180
|
问题修复12
|
8 months ago |
|
Yangwl
|
c8006b88c0
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
Yangwl
|
7376533d62
|
H5报表，4楼看板
|
8 months ago |
|
元气满满(jgy)
|
8ef8eb43d1
|
2024-11-05 Device设备 - 查询点检产线-工单状态应为w1
|
8 months ago |
|
元气满满(jgy)
|
979fba0209
|
2024-11-5 Device设备 - 点检 -只生成当日计划生产的产线
|
8 months ago |
|
mengjiao
|
9ced49d488
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# op-modules/op-wms/src/main/java/com/op/wms/controller/BpProcureOrderController.java
|
8 months ago |
|
mengjiao
|
3d08918ac0
|
wms修改重复过账测试bug
|
8 months ago |
|
zhaoxiaolin
|
84f2290dcd
|
修复2
|
8 months ago |
|
zhaoxiaolin
|
f22f64e54a
|
修复2
|
8 months ago |
|
zhaoxiaolin
|
d773d44507
|
问题修复11
|
8 months ago |
|
陈恒杰
|
c5d8552506
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
陈恒杰
|
5cb2adad8f
|
白坯原材料采购单
|
8 months ago |
|
mengjiao
|
497514647d
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
mengjiao
|
5c49d63444
|
wms修改1
|
8 months ago |
|
zhaoxiaolin
|
8c81e1d64c
|
问题修复10
|
8 months ago |
|
zhaoxiaolin
|
897a9e83a5
|
问题修复9
|
8 months ago |
|
mengjiao
|
561d15680c
|
wms和打印机做对接
|
8 months ago |
|
mengjiao
|
fbad45bd59
|
wms采购到货（SRM）到货登记界面改进，重点加上“整张送货单一键报检”，不用选择和修改数字 加标识卡的打印顺序，如：7张标识卡的话，就是7-1、7-2、7-3这样
|
8 months ago |
|
Yangwl
|
2ae296d681
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
Yangwl
|
fa04d66dff
|
白坯业务看板
|
8 months ago |
|
zhaoxiaolin
|
040785982e
|
问题修复8
|
8 months ago |
|
zhaoxiaolin
|
e4a97da59a
|
问题修复7
|
8 months ago |
|
陈恒杰
|
6c629a4d84
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
陈恒杰
|
17a2ec19f3
|
白坯原材料入库
|
8 months ago |
|
mengjiao
|
f07749eafb
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
mengjiao
|
d89016e4fe
|
wms白胚部分修改
|
8 months ago |
|
Yangwl
|
a52a4eab62
|
白坯需求实体
|
8 months ago |
|
Yangwl
|
4893ed8ac8
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
Yangwl
|
df21d00b98
|
SAP白坯需求数量接口
|
8 months ago |
|
陈恒杰
|
89c8973cac
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
陈恒杰
|
0b22b0542c
|
白坯原材料入库
|
8 months ago |
|
zhaoxiaolin
|
21818265fc
|
问题修复6
|
8 months ago |
|
mengjiao
|
761e5b97aa
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
mengjiao
|
f1d3595e79
|
wms页面修改
|
8 months ago |
|
zhaoxiaolin
|
6504f975a4
|
问题修复5
|
8 months ago |
|
Yangwl
|
04aff0d8f9
|
报表推送修改
|
8 months ago |
|
zhaoxiaolin
|
235955dce2
|
问题修复4
|
8 months ago |
|
zhaoxiaolin
|
b0c5d5e8c6
|
问题修复4
|
8 months ago |
|
zhaoxiaolin
|
71c2c09b2f
|
问题修复3
|
8 months ago |
|
zhaoxiaolin
|
a4b0ec81da
|
问题修复2
|
8 months ago |
|
zhaoxiaolin
|
92f7cf7741
|
问题修复
|
8 months ago |
|
zhaoxiaolin
|
09b3795c50
|
问题修复
|
8 months ago |
|
zhaoxiaolin
|
bed8f9a353
|
问题修复
|
8 months ago |
|
mengjiao
|
991307491a
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
mengjiao
|
ccf6e9303b
|
wms部分修改3
|
8 months ago |
|
陈恒杰
|
6495ff8292
|
来料检验物料号模糊查询
|
8 months ago |
|
zhaoxiaolin
|
5fad84018d
|
问题修复
|
8 months ago |
|
zhaoxiaolin
|
7c8e7dc38e
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
zhaoxiaolin
|
954170a6cb
|
问题修复
|
8 months ago |
|
mengjiao
|
f0f7b81534
|
wms部分修改2.1
|
8 months ago |
|
mengjiao
|
818d395e3d
|
wms部分修改2
|
8 months ago |
|
mengjiao
|
1872a8d7ba
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
mengjiao
|
707130bbae
|
wms部分修改
|
8 months ago |
|
zhaoxiaolin
|
b3efa8d1bf
|
问题修复
|
8 months ago |
|
zhaoxiaolin
|
7a80d9dc30
|
问题修复
|
8 months ago |
|
元气满满(jgy)
|
85bec1c62d
|
2024-10-18 设备-运行记录-导出
|
8 months ago |
|
mengjiao
|
76983c9df4
|
Merge remote-tracking branch 'origin/master'
|
8 months ago |
|
mengjiao
|
9763eb4408
|
wms过账加过账批次
|
8 months ago |
|
zhaoxiaolin
|
335226b2dc
|
问题修复
|
8 months ago |
|
zhaoxiaolin
|
36e7c1427e
|
问题修复
|
8 months ago |
|
mengjiao
|
8fa1a90af5
|
wmsSap收货过账字段生产时间的修改
|
8 months ago |
|
mengjiao
|
ded3c3ec2c
|
wms批次的截取规则修改
|
8 months ago |