simon.song
|
fa9a989cbd
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
simon.song
|
23bbde2057
|
13315 20027-返修记录报表增加显示产品二维码-202012-26
|
4 years ago |
shun
|
c067c671a9
|
无锡喜德
|
4 years ago |
|
simon.song
|
ade9053502
|
13325 20027--过程追溯报表--筛选条件物料编码输入GTB2A268000P1点击查询表单显示GTB2A268000P1A物料编号的数据-2020-12-18
|
4 years ago |
Dominic_Xiao
|
97e919552a
|
修改基础模块的描述名
|
4 years ago |
|
shun
|
6f9d4b4342
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
 王杰
|
d089d0fba8
|
Merge branch 'test' into dev
|
4 years ago |
陈思洁
|
107f3828f9
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
陈思洁
|
cc99971690
|
【13140 20027-管理端增加包装箱条码与产品二维码的数据信息界面--20201221】
|
4 years ago |
许心洁
|
1595f68723
|
任务#3036
|
4 years ago |
|
王杰
|
7e8970f3e2
|
数据复核
|
4 years ago |
|
shun
|
fb4e79b899
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
shun
|
2fd1b89425
|
无锡喜德WMS看板
|
4 years ago |
|
王杰
|
cd5b882e1f
|
dev merge test pom 冲突解决
|
4 years ago |
|
simon.song
|
0b1ef2290d
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
simon.song
|
d648228b18
|
13300 20027-控制计划--点击生效没有响应--2020-12-16
|
4 years ago |
joke.wang
|
95e92168d9
|
物料追溯批次model
|
4 years ago |
|
joke.wang
|
c0d3eb807f
|
物料批次追溯报表
|
4 years ago |
廖普小
|
c45d4e8aaf
|
Merge branch 'test' of channing.zhang/i3plus-pojo into test
|
4 years ago |
 钮海涛
|
4116dc6b91
|
修复坤泰问题
|
4 years ago |
liangyao
|
9f1312e906
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
liangyao
|
ae2469e463
|
北京领料任务提交
|
4 years ago |
|
许心洁
|
3d1d05ef1c
|
1.天津委外发运库存移动单打印
|
4 years ago |
|
许心洁
|
1474be7486
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
许心洁
|
30a6ef7ba5
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
许心洁
|
3467893051
|
1.解决天津麦格纳库存不准问题，将所有stockquan更新的地方改为set qty+=newQty形式，避免并发执行导致脏读
2.更正生产计划对象属性woekorderNo->workOrderNo
3.将脚本异常往外抛
4.优化通用脚本接口
|
4 years ago |
 曾贞一
|
15452dfa0e
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
曾贞一
|
b695ab2fc3
|
【10202 20011--发运一步法配料时】
|
4 years ago |
|
王杰
|
08a458cee2
|
unpack
|
4 years ago |
|
钮海涛
|
56876e8cba
|
修复天津麦格纳问题
|
4 years ago |
|
钮海涛
|
cfcde79f1f
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
钮海涛
|
230895c243
|
修复天津麦格纳问题
|
4 years ago |
puxiao.liao
|
45201c42d3
|
盘点优化
|
4 years ago |
wynne1005
|
b7c4e76163
|
增加joined注解
|
4 years ago |
|
puxiao.liao
|
eb56d52e17
|
盘点优化
|
4 years ago |
|
钮海涛
|
7a7169386a
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
钮海涛
|
c4023d4bac
|
坤泰问题修复
|
4 years ago |
|
joke.wang
|
ef971201e3
|
泰国新条码生成
|
4 years ago |
|
puxiao.liao
|
0bb69b6505
|
优化盘点
|
4 years ago |
|
钮海涛
|
3b700e722c
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
wynne1005
|
b438735172
|
Merge branch 'test' into ext-dev
|
4 years ago |
rock.yu
|
2f912b2334
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
rock.yu
|
fe23cab34b
|
增加实体扩展注解
|
4 years ago |
|
钮海涛
|
231c4b015a
|
修复坤泰采购收货卡控包装物料，二次判定库存条码库位，存储区，仓库信息未更新问题
|
4 years ago |
|
wynne1005
|
78d86be2f5
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
wynne1005
|
8741facd02
|
中航BI修改 数据同步打印错误日志
|
4 years ago |
|
joke.wang
|
b37456b227
|
删除错误提交
|
4 years ago |
|
joke.wang
|
85c22ea8bd
|
电泳上线
|
4 years ago |
|
陈思洁
|
1643d57b99
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
陈思洁
|
a014d8ceaa
|
【13137 19048 安灯类型没有在看板中展示 20201209】
|
4 years ago |
|
simon.song
|
6acd271c31
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
simon.song
|
4a120ca375
|
12736 20027-管理端-控制计划--按照导入模板导入控制计划数据时提示成功，但是无法看到导入的数据-20201124
|
4 years ago |
汪云昊
|
23e1eb13a1
|
Merge remote-tracking branch 'origin/dev' into test
|
4 years ago |
|
汪云昊
|
23f24d297d
|
fix(core):单号生成未正常重置
|
4 years ago |
|
wynne1005
|
fd7ef3285f
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
wynne1005
|
6472ebddba
|
mes枚举格式优化
|
4 years ago |
|
puxiao.liao
|
9cd011c6ca
|
修复盘点BUG
|
4 years ago |
|
wynne1005
|
9242285b4c
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
wynne1005
|
b09a09f70b
|
修改mes工位监控 异常停止不能复位问题 bi相关问题
|
4 years ago |
|
joke.wang
|
c286c3d319
|
容器扫描工步逻辑修改
|
4 years ago |
|
liangyao
|
88aea83c1a
|
北京领料任务提交
|
4 years ago |
|
陈思洁
|
981438c2a2
|
【12997 19048-条码补打查询不到二检箱标签-20201204】
|
4 years ago |
|
simon.song
|
effc34f74d
|
Merge remote-tracking branch 'remotes/origin/test' into ext-dev
# Conflicts:
# modules/i3plus-pojo-mes-pcn/pom.xml
|
4 years ago |
|
许心洁
|
d4696b54a3
|
墨西哥WMS报工业务新增功能：通用脚本定制业务+生产计划主表添加单据类型和产线名称+添加生产工单类型枚举
|
4 years ago |
|
simon.song
|
4f593ea352
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
liangyao
|
4b79ab806e
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
puxiao.liao
|
4eef481c90
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
puxiao.liao
|
0c50abaea8
|
修复条码状态查询异常
|
4 years ago |
|
钮海涛
|
8c7da1c65a
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
钮海涛
|
3b3f0c98db
|
修复坤泰问题~
|
4 years ago |
|
simon.song
|
4676a84b07
|
删除mes-pcn包，后续引入类以mes包为主
|
4 years ago |
|
wynne1005
|
80b5cca624
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
wynne1005
|
b1e09f09a3
|
mes添加stationwebsocket 的busiType类型 强制下线
|
4 years ago |
|
liangyao
|
6142d26ee9
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
liangyao
|
d176895a5d
|
北京领料任务提交
|
4 years ago |
|
陈思洁
|
9478267dd8
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
陈思洁
|
4cfee2dc9c
|
【12591 20027-BI-生产经理BI报表-调角器工厂生产线产出情况-浮窗解释不清晰-2020-12-04】
|
4 years ago |
|
liangyao
|
46f56540ca
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
liangyao
|
e5c7432093
|
北京领料任务提交
|
4 years ago |
|
Dominic_Xiao
|
387131bba1
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
钮海涛
|
95ba4d807b
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
钮海涛
|
0923584955
|
Sweb问题修复
|
4 years ago |
|
Dominic_Xiao
|
ae9978a3bb
|
新增serialNumber字段
|
4 years ago |
|
汪云昊
|
9556c525d9
|
Merge remote-tracking branch 'origin/dev' into test
|
4 years ago |
|
汪云昊
|
d2fd06cb2b
|
fix(core):单号生成规则没有清除缓存
|
4 years ago |
|
王杰
|
f9ce9641de
|
增加索引
|
4 years ago |
|
joke.wang
|
da293141cd
|
oee bug修复
|
4 years ago |
|
廖普小
|
4b0c9b927f
|
Merge branch 'test' of channing.zhang/i3plus-pojo into test
|
4 years ago |
|
许心洁
|
de9578d439
|
墨西哥WMS报工业务新增功能：通用脚本导入接口+生产版本DAO层+生产计划主表计划状态FINISH(25, "FINISH", "已完成")
|
4 years ago |
|
许心洁
|
02decfe9c4
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
许心洁
|
5c1164a938
|
墨西哥WMS报工业务新增功能：通用脚本导入接口+生产版本DAO层+生产计划主表计划状态FINISH(25, "FINISH", "已完成")
|
4 years ago |
小梁不胖
|
9508bd41ac
|
北京领料任务提交
|
4 years ago |
|
小梁不胖
|
f744b94e87
|
北京领料报表提交
|
4 years ago |
|
puxiao.liao
|
a62b10dc9d
|
修复合并异常
|
4 years ago |
|
钮海涛
|
dfc18cc9b2
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
钮海涛
|
ffbc5d605e
|
喜德增加将PO及ASN订单的库存条码打印状态置为已打印的JOB
|
4 years ago |
|
钮海涛
|
6e6a9f7526
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
钮海涛
|
b5c994a18b
|
sweb同一供应商编码命名为VendorNo
|
4 years ago |
|
simon.song
|
8dcb1703c9
|
首检返回值字段调整
|
4 years ago |
|
simon.song
|
d0e1fcd440
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
simon.song
|
56989acba2
|
12362 20027-管理端-首检检验结果报表状态已完成的对应的数量和已检数量显示有问题-20201115
|
5 years ago |
|
汪云昊
|
bad1234d0e
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
joke.wang
|
14c47545e7
|
查询备件库存修改
|
5 years ago |
|
汪云昊
|
7348d78238
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
王杰
|
2b522ca15d
|
工步参数 增加字段
|
5 years ago |
|
王杰
|
183111cf65
|
Merge remote-tracking branch 'i3plus-pojo/test' into test
|
5 years ago |
|
王杰
|
d64a8fd31c
|
工步参数 增加字段
|
5 years ago |
|
陈思洁
|
7e37a6e22d
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
28da49aa29
|
【12422 19048 增加喷涂抛光条码查询报表 20201112】
|
5 years ago |
|
王杰
|
13868d5cd1
|
producesn 增加索引
|
5 years ago |
|
王杰
|
02d002b958
|
package detail 增加 联合索引
|
5 years ago |
|
puxiao.liao
|
c20922a455
|
Fix bug#12879
COGI调账支持出库单模式
|
5 years ago |
|
simon.song
|
9b57f47af6
|
修改pom文件
|
5 years ago |
|
simon.song
|
3917408421
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
陈思洁
|
d8d2dea922
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
陈思洁
|
a4093d18d1
|
【12420 19048 喷涂二检增加UNPACK功能 20201112】
|
5 years ago |
|
rock.yu
|
785152dbfa
|
接口同步状态赋予默认值
|
5 years ago |
|
王杰
|
a94b5dd0b0
|
看板产线配置
|
5 years ago |
|
陈思洁
|
fd166bc0ff
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
47e6a86ecd
|
【天津bug修改】
|
5 years ago |
|
Dominic_Xiao
|
0deb9b4733
|
中航襄阳滑道工厂需求:新增容器编号字段
|
5 years ago |
|
王杰
|
e1783e5e46
|
pom
|
5 years ago |
|
joke.wang
|
d5b2f4a4cd
|
生产队列增加分组号字段
|
5 years ago |
|
Dominic_Xiao
|
86f9faa01d
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |
|
Dominic_Xiao
|
7b17ecbb29
|
补全代码
|
5 years ago |
|
汪云昊
|
7f2e2189c8
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
汪云昊
|
7ecbed2cda
|
fix(order):未固定单号生成长度
|
5 years ago |
|
puxiao.liao
|
ca18bb40cd
|
修复天津单据明细查询对应条码：单据条码增加行号查询条件
|
5 years ago |
|
许心洁
|
5e6af26b9f
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
4a38aab5b6
|
任务#2989
|
5 years ago |
|
陈思洁
|
b0df747d22
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
陈思洁
|
19636e308e
|
【12645 19048-喷涂质检报表用开始和结束工单查询无反应-20201123】
|
5 years ago |
|
wynne1005
|
d9b4a8eb4d
|
修改包扫描路径
|
5 years ago |
|
王杰
|
7be62a939b
|
TJ看板
|
5 years ago |
|
joke.wang
|
970f75f8cf
|
队列表增加分组号字段
|
5 years ago |
|
Dominic_Xiao
|
2a94ce3e0e
|
包装条码绑定解绑
|
5 years ago |
|
puxiao.liao
|
ad0325f7df
|
修复天津BUG
|
5 years ago |
|
wynne1005
|
d893e76ab4
|
merge
|
5 years ago |
|
wynne1005
|
aa450c10e4
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
wynne1005
|
bdf8e0d782
|
错误pojo修改
|
5 years ago |
|
Dominic_Xiao
|
167b0dad0c
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |
|
puxiao.liao
|
46cc056a43
|
修复天津BUG
|
5 years ago |
|
simon
|
55188db083
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |
|
simon
|
e0ee86ab73
|
删除mes-pcn包，后续引入类以mes包为准
|
5 years ago |
|
钮海涛
|
af732b7a4f
|
合并test代码
|
5 years ago |
|
许心洁
|
6005e2ab66
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
许心洁
|
7aa7738a59
|
BUG#12600
|
5 years ago |
duan.yang
|
a38be26538
|
采购订单表-主表添加同步标识、接口映射方向类型添加
Signed-off-by: duan.yang <994300880@qq.com>
|
5 years ago |
宋双双
|
b188123ab4
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
Dominic_Xiao
|
fd7799b943
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |