 曾贞一
|
5ebb5cbf20
|
【修改 TSET-pom.xml】
|
6 years ago |
 王杰
|
068a0956db
|
解决冲突
|
6 years ago |
|
王杰
|
b77d3065a4
|
Merge branch 'test' into dev
|
6 years ago |
|
王杰
|
cd19bfb429
|
ptlpcn
|
6 years ago |
joke lin
|
cb09776bdb
|
[任务：1435 计划管理]
|
6 years ago |
宋军超
|
ac4a8b0ab4
|
修改ptl数据清除功能
|
6 years ago |
陆卫豪
|
e43aee2e82
|
Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev
|
6 years ago |
|
王杰
|
01c5bb59e1
|
Merge branch 'dev' into test
|
6 years ago |
|
宋军超
|
4d701aa9c4
|
添加ptl数据删除定时任务
|
6 years ago |
zcg
|
5e78985247
|
【task 1436 工步-关键件绑定校验并转过程条码 】解决冲突
|
6 years ago |
|
zcg
|
7aecf9dcc0
|
【task 1436 工步-关键件绑定校验并转过程条码】
|
6 years ago |
|
joke lin
|
ccf2817788
|
[计划管理]
|
6 years ago |
|
曾贞一
|
0acf2dc0ae
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
 钮海涛
|
35c1114230
|
Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into dev
|
6 years ago |
|
钮海涛
|
ca6e094271
|
Merge branch 'dev' of joke.wang/joke-i3plus-pojo into dev
|
6 years ago |
puxiao.liao
|
50d3de9b77
|
7600 二维码零件标签打印功能修改。
7565 收货分组功能要求。
7633 条码明细中，点击导出，日生产计划产生的条码无法被导出，界面上的导出应该是查到什么就导出什么，不需要再加其他额外的条件
7628 库存调整盘点时，扫描库位后的提示增加一个库位
7640 解冻扫描条码后的提示没有显示条码，冻结是有的。需要统一都显示
7536 没库存时领料与发运的提示修改为下列
7659 创建盘点单冻结条码时条码is_vaild=2
7617 出库单明细中的打印客户标签按钮，需要检测单据明细有没有提交，状态为创建的才可以打印，并且只能打印一次。
7652 在条码状态报表中增加组号字段显示，查询框也需要增加
7454 需要一个配料撤销（针对单个条码，而不是单据）的功能，已经配料的条码需要被撤回到仓库中，需要考虑各种库存移动单状态。
7631 在盘点明细中的盘点范围界面增加一个字段，把数据库中的src_order_no显示出来，字段取名为原始单号
7526 发运单接收时，在主表中增加一个字段，在讲单据信息写入数据库时，如果该单据条码中只存在一步法的零件号，则该字段需要在前台显示为一步法，如果存在两步法的零件号，则显示为两步法。
7617 出库单明细中的打印客户标签按钮，需要检测单据明细有没有提交，状态为创建的才可以打印，并且只能打印一次。
|
6 years ago |
|
王杰
|
880d449dfb
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
b10ddbc958
|
ptl enum
|
6 years ago |
joke
|
531596d2d4
|
[mes: 49 JIT计划与管理]
|
6 years ago |
|
王杰
|
e0a018b871
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
dd1e5778a9
|
ptl enum
|
6 years ago |
|
王杰
|
fa9c02705b
|
ptl enum
|
6 years ago |
|
王杰
|
cd8dea1814
|
ptl
|
6 years ago |
 Administrator
|
797f3b3433
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
许心洁
|
906576cb52
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
1e0d88fb0e
|
动态查询：开窗和时间查询优化+3D仓库基础数据校验优化
|
6 years ago |
|
钮海涛
|
de73821fc7
|
Merge branch 'dev' of puxiao.liao/i3plus-pojo-lpx into test
|
6 years ago |
|
joke
|
a7e8e1095d
|
Merge remote-tracking branch 'i3plus-pojo/dev' into dev
|
6 years ago |
|
joke
|
aa403e9691
|
[ptl-pcn:39 校验物料号]
|
6 years ago |
qianhs
|
1fc4ae1ff9
|
1,回退代码
|
6 years ago |
|
宋军超
|
e15c2b6065
|
添加PTL数据同步功能
|
6 years ago |
|
王杰
|
1428b5f0aa
|
ptl
|
6 years ago |
|
曾贞一
|
9cc001fd17
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
fe72dc26d9
|
【 bug 7581 1.在同批次条码提示中增加一个库位。2.同批次按钮做全局变量属性'单库位'，'单人'，如果为'单库位'保持现在逻辑不变，如果为'单人'则显示当前用户责任区下所有同批次条码(不限制库位)】
|
6 years ago |
|
luweihao
|
dd6007656c
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
abb737f265
|
ptl
|
6 years ago |
|
王杰
|
cde65d0e7a
|
Merge branch 'dev' of gragon.xu/i3plus-pojo into dev
|
6 years ago |
|
王杰
|
37d032ca24
|
ptl反馈信息枚举
|
6 years ago |
|
王杰
|
5610a25ab7
|
ptl反馈信息枚举
|
6 years ago |
汪云昊
|
31a8a7705a
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
0471038b9b
|
sqlserver数据库适配
|
6 years ago |
|
许心洁
|
a49b747c18
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
cc98e84ba4
|
动态查询：增加开窗功能
|
6 years ago |
|
宋军超
|
80d9852dd6
|
添加数据同步和定时任务功能
|
6 years ago |
|
钮海涛
|
85dff1fde9
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
王杰
|
e1d133de61
|
ptl enum
|
6 years ago |
|
宋军超
|
96c5b35f83
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
王杰
|
0a0318d639
|
ptl
|
6 years ago |
|
宋军超
|
51d666b5bc
|
开发PTL--PCN节点维护,同步配置和对象映射功能
|
6 years ago |
|
luweihao
|
f67dd06cd4
|
Merge branch 'dev' into test
|
6 years ago |
|
puxiao.liao
|
05d0a0a375
|
【 1423 拣货-更新FIFO推荐组件、更新FIFO检查组件
】拣货-更新FIFO推荐组件、更新FIFO检查组件
|
6 years ago |
|
王杰
|
644af42dfe
|
ptl enum
|
6 years ago |
|
joke
|
d871869f3a
|
[ptl-pcn: 32 亮灯作业]
|
6 years ago |
|
joke
|
ccd62f8d31
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
joke
|
d212b5cd30
|
[ptl-pcn: 32 亮灯作业]
|
6 years ago |
|
luweihao
|
66f7121975
|
Merge branch 'dev' into test
|
6 years ago |
陈思洁
|
f8d4e7f1fd
|
【PTL_标签打印pojo新增】
|
6 years ago |
|
陈思洁
|
faaf184e01
|
【PTL_增加主任务状态的枚举】
|
6 years ago |
|
luweihao
|
51152656cc
|
Merge branch 'dev' into test
|
6 years ago |
|
joke
|
3c408dd194
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
joke
|
ab9e9a8638
|
解决冲突
|
6 years ago |
|
王杰
|
35efadd243
|
ptl枚举
|
6 years ago |
|
joke
|
f362f9931f
|
[ptl:32 亮灯作业]
|
6 years ago |
|
joke
|
c73cd26574
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
joke
|
f01b3664c2
|
[ptl: 32 亮灯作业程序]
|
6 years ago |
|
宋军超
|
464c8b68cc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
宋军超
|
d56756e9e5
|
添加主任务、区域、区段枚举
|
6 years ago |
|
陈思洁
|
728f46b43d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
2c305e0ca6
|
【修改枚举类名大写（部分）】
|
6 years ago |
|
许心洁
|
2a09c009f3
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
宋军超
|
0fe0abff63
|
新增区域、区段、标签控制器、标签信息、BOM和物料 基础数据
|
6 years ago |
|
宋军超
|
896bd9b35b
|
添加基础数据枚举
|
6 years ago |
jenkins
|
1ada447069
|
Jenkins自动合并
|
6 years ago |
|
qianhs
|
91b43823c9
|
【 日生产计划生成的条码在条码打印界面只能补打，不能打印】【bug7514】
|
6 years ago |
|
jenkins
|
9fc85191fe
|
Jenkins自动合并
|
6 years ago |
|
王杰
|
748ef11ccf
|
ptl-pcn标签控制器枚举
|
6 years ago |
|
jenkins
|
499a5ed894
|
Jenkins自动合并
|
6 years ago |
|
luweihao
|
1ec56edcdc
|
task `1295` mes添加索引
|
6 years ago |
|
jenkins
|
1e2029fbbb
|
Jenkins自动合并
|
6 years ago |
|
luweihao
|
0d212df73a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
luweihao
|
b6477202e7
|
新增枚举调用类
|
6 years ago |
|
jenkins
|
83a9b74c43
|
Jenkins自动合并
|
6 years ago |
|
汪云昊
|
6d1d41a4a7
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
jenkins
|
7decc606cb
|
Jenkins自动合并
|
6 years ago |
|
luweihao
|
5afcf20a9e
|
ptlpcn 添加界面信号枚举
|
6 years ago |
|
汪云昊
|
05d6f132ce
|
表单拾取
任务检查功能优化
|
6 years ago |
|
luweihao
|
f358c13b04
|
ptl迁移4
|
6 years ago |
|
jenkins
|
a9d94ecff7
|
Jenkins自动合并
|
6 years ago |
|
luweihao
|
bbfcdfdd64
|
ptl pojo 提交
|
6 years ago |
|
jenkins
|
1a2b706e24
|
Jenkins自动合并
|
6 years ago |
|
luweihao
|
3bed5974f6
|
ptl pojo init
|
6 years ago |
|
jenkins
|
8c5020b098
|
Jenkins自动合并
|
6 years ago |
|
曾贞一
|
9607c91582
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
44648e4218
|
【1396 亚太-领料任务明细看板】
|
6 years ago |
|
jenkins
|
f45a0d69b0
|
Jenkins自动合并
|
6 years ago |
|
jokelone
|
54cd3cfc45
|
业务表增加唯一索引
|
6 years ago |
|
luweihao
|
b27bbb6158
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
3f77135a17
|
枚举
|
6 years ago |
|
jenkins
|
138b2cf7b7
|
Jenkins自动合并
|
6 years ago |
|
jokelone
|
30cb7f7b9d
|
工单类型去除JIT类型
|
6 years ago |
|
jenkins
|
521973a2f5
|
Jenkins自动合并
|
6 years ago |
|
zcg
|
db3b06071d
|
【枚举修改】
|
6 years ago |
|
zcg
|
8a04ca4e3d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
zcg
|
bc1825fd35
|
【mes枚举修改，mesModel修改,pcn枚举修改】
|
6 years ago |
|
jenkins
|
cf44b8866a
|
Jenkins自动合并
|
6 years ago |
|
钮海涛
|
9e0158e749
|
修改test分支POM配置
|
6 years ago |
|
jenkins
|
c90df4e96a
|
Jenkins自动合并
|
6 years ago |
|
许心洁
|
28ce8615fd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
51d60a107a
|
SAP指令锁定逻辑修改：
根据单号查询(之前：任务明细;现在：单据明细)获取行号记录到sap_order_lock表；
原因：SAP要的是单据的行号，任务明细可能是单据明细的拆分或者合并所得，行号不一定准；
|
6 years ago |
|
jenkins
|
f927ee21ac
|
Jenkins自动合并
|
6 years ago |
|
王杰
|
bf71cd07d0
|
JIS发运
|
6 years ago |
|
jenkins
|
134757c92b
|
Jenkins自动合并
|
6 years ago |
wei.peng
|
32d715a29c
|
APS 调用失败bug 修复
动态报表 下拉问题修复
|
6 years ago |
|
宋军超
|
964afe73cd
|
2020-01-16 16:42 添加自定义列枚举
|
6 years ago |
|
宋军超
|
851067b8d2
|
2020-01-16 16:37 自定义列表优化
|
6 years ago |
|
jenkins
|
d790bcf355
|
Jenkins自动合并
|
6 years ago |
袁津哲
|
67ef5c5516
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
袁津哲
|
89a7cafee4
|
Wms动态搜索与自定义列表，表单开发
|
6 years ago |
|
jenkins
|
33e68b7e9f
|
Jenkins自动合并
|
6 years ago |
|
wei.peng
|
cb68f62e46
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
8a4974f369
|
自定义报表 调用调整
|
6 years ago |
|
jenkins
|
6371e8df60
|
Jenkins自动合并
|
6 years ago |
|
袁津哲
|
f7c98e3982
|
Wms动态搜索与自定义列表，表单开发
|
6 years ago |
|
jenkins
|
69ff58a67e
|
Jenkins自动合并
|
6 years ago |
|
qianhs
|
61303a9f38
|
【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】
|
6 years ago |
|
jenkins
|
002ce795f4
|
Jenkins自动合并
|
6 years ago |
|
luweihao
|
01a694be70
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
luweihao
|
6baeeee71e
|
task `1392` 调整工步 错误处理实现
|
6 years ago |
|
jenkins
|
458137d216
|
Jenkins自动合并
|
6 years ago |
|
许心洁
|
fff79a7846
|
GROUP_COMMIT_MODE枚举漏提交
|
6 years ago |
|
许心洁
|
0e54d9a5b6
|
任务#1403 流程isCommitRefMove属性改为commitMode
|
6 years ago |
|
jenkins
|
c1609539cf
|
Jenkins自动合并
|
6 years ago |
|
许心洁
|
de0d57179c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
35839db806
|
BUG#7359 任务列表分组字段和移动单赋值逻辑更改
|
6 years ago |
|
jenkins
|
8f6b53c5ea
|
Jenkins自动合并
|
6 years ago |
|
wei.peng
|
3e31641b20
|
PTL 项目初始化
PTL PCN 项目初始化
|
6 years ago |
|
jenkins
|
a0b67a3723
|
Jenkins自动合并
|
6 years ago |
|
袁津哲
|
8285c87624
|
Wms动态搜索与自定义列表，表单开发
|
6 years ago |
|
jenkins
|
7057c685cc
|
Jenkins自动合并
|
6 years ago |
|
zcg
|
2396863bab
|
【任务:1383 数据监听定时数据抓取】
|
6 years ago |
|
jenkins
|
64438ac61c
|
Jenkins自动合并
|
6 years ago |
|
qianhs
|
41047a17c1
|
【盘点--调差后库存对不上(C202001070020，C202001070021)】【bug7314 】
|
6 years ago |
|
jenkins
|
8e168c5109
|
Jenkins自动合并
|
6 years ago |
|
wei.peng
|
503f3cd7a3
|
自定义表单功能优化
|
6 years ago |
|
曾贞一
|
5c841c706b
|
【7201 收货BOP移库流程图】
|
6 years ago |
|
jenkins
|
56e53906ec
|
Jenkins自动合并
|
6 years ago |
|
jokelone
|
f1096e9ec5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
51839d7be5
|
【任务：1381】
|
6 years ago |
|
zcg
|
add40a27e3
|
【任务：1382，数据监听基础模块开发】
|
6 years ago |
|
汪云昊
|
536200cf2b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
gcj
|
cbe87c6bd7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
gcj
|
c14d6c6916
|
【宁德问题清单】
|
6 years ago |
|
袁津哲
|
7d4ba10449
|
Wms初始化扫描实体字段新增逻辑优化
|
6 years ago |
|
jenkins
|
75dc17f4c4
|
Jenkins自动合并
|
6 years ago |
|
jokelone
|
d0cd9d03b9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
0d7aca73a8
|
【需求：7315 生产工单变更】
|
6 years ago |
|
王杰
|
54bdf8f6a0
|
JIS
|
6 years ago |
e-jiawentao1
|
9fbc120666
|
动态搜索与自定义列表初始化扫描Bean字段
|
6 years ago |
|
王杰
|
685d7949bf
|
Merge branch 'dev' into test
|
6 years ago |
|
zcg
|
b84a305b26
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jenkins
|
497b963f60
|
Jenkins自动合并
|
6 years ago |
|
王杰
|
bf62494236
|
JIS
|
6 years ago |
|
jenkins
|
fa4cc8610f
|
Jenkins自动合并
|
6 years ago |
|
puxiao.liao
|
8584946ce5
|
【 条码状态报表，导出时下列三个字段为中文
】bug7196
|
6 years ago |
|
zcg
|
c86f3e280e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
王杰
|
f88041df1e
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
3fe50125ae
|
JIS
|
6 years ago |
|
jokelone
|
c226e61acf
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
zcg
|
d9990f0cb8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
823f818abf
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
44af186f2f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
af6083ddff
|
日志存储优化
|
6 years ago |
|
jokelone
|
68eb60c6cb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
zcg
|
f38e54e496
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jenkins
|
422aa1835f
|
Jenkins自动合并
|
6 years ago |
|
钮海涛
|
4013ed776b
|
修复炉资源排程问题
|
6 years ago |
|
jenkins
|
dfb06def2b
|
Jenkins自动合并
|
6 years ago |
|
曾贞一
|
9e9d3e2afa
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
5a4510cedb
|
【7168 对于发运单标签补打功能，根据发运单中的ship-to获取标签模板进行打印】
|
6 years ago |
|
qianhs
|
81bab75132
|
【库存调整盘点需要修改为，扫描新的库位时就对上一个库位中的数据做调整（更新条码状态），每个库位的扫描数据还是存在同一张盘点单内，点击提交时该张盘点单关闭。去除页面上的未盘移库按钮，未盘条码直接做移库。】【bug7148 】
|
6 years ago |
WYnneaoapc
|
adb4bd2a1c
|
Merge branch 'dev' into test
|
6 years ago |
|
许心洁
|
7594b3d515
|
SAP取消指令：按行取消函数逻辑从软删明细和条码变为更新单据明细和条码的状态为行取消
|
6 years ago |
|
jenkins
|
688d976683
|
Jenkins自动合并
|
6 years ago |
|
王杰
|
8a4aa9fed2
|
jis发运
|
6 years ago |
|
jokelone
|
ebe34e4ba9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
zcg
|
ad08ff21bb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
WYnneaoapc
|
569c2613fe
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
f768247c4f
|
代码合并 2019-12-30 15:59:52
|
6 years ago |
|
jokelone
|
39790fd50b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
d47a097c53
|
【任务：1344 通用接口增加批量数据处理】
|
6 years ago |
|
zcg
|
1230906c3e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
3b7b374b23
|
自定报表对象模型调整
|
6 years ago |
|
汪云昊
|
b12f67e34b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
6b02d9969a
|
数据源批量写入优化
|
6 years ago |
|
王杰
|
7287aaeb77
|
其他组未提交的代码
|
6 years ago |
|
jenkins
|
471016b345
|
Jenkins自动合并
|
6 years ago |
|
汪云昊
|
20ccf65c5c
|
资源加载优化
|
6 years ago |
|
汪云昊
|
d89ed44bcc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
1d9ab80ae8
|
数据源适配器 - 批量写入优化
|
6 years ago |
|
zcg
|
192034152b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
王杰
|
3ddadad142
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
019cb91a4c
|
【需求：1329】
|
6 years ago |
|
zcg
|
dbe2d32bb6
|
[需求：1322，枚举修改]
|
6 years ago |
|
王杰
|
91ab421d5e
|
Merge branch 'dev' into test
|
6 years ago |
|
jokelone
|
f857a4065d
|
【任务：1327JIT生产】
|
6 years ago |
E
|
e5452056b6
|
【bug7083 KT器具管理】新增业务类型和作业类型
|
6 years ago |
|
puxiao.liao
|
794992d687
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
puxiao.liao
|
734b54d1b2
|
【 领料上线扫描时，在扫描完条码后将目标库位带出。
】bug7024
|
6 years ago |
|
王杰
|
06afd98334
|
Merge branch 'dev' into test
|
6 years ago |
|
jokelone
|
0e84990f3c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
20f6961daf
|
【任务：1327JIT生产】
|
6 years ago |
|
jenkins
|
6a19a07fce
|
Jenkins自动合并
|
6 years ago |
|
汪云昊
|
d5c1f7a7a3
|
资源模块数据
模板软删除
软适配list传参
|
6 years ago |
|
jenkins
|
1fbd9c4357
|
Jenkins自动合并
|
6 years ago |
|
zcg
|
dccd104fdd
|
[需求：1324，excel导出]
|
6 years ago |
|
jenkins
|
4e8ee475b4
|
Jenkins自动合并
|
6 years ago |
|
gcj
|
99eaa8b8ca
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Conflicts:
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java
|
6 years ago |
|
gcj
|
fc9b8629ab
|
【采购收货】
|
6 years ago |
|
jenkins
|
cc45dbc2cb
|
Jenkins自动合并
|
6 years ago |
|
E
|
996526ac7c
|
【bug7088 物料信息中的导入功能】
|
6 years ago |
|
王杰
|
90de0f7df6
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
b0709aca97
|
枚举
|
6 years ago |
|
王杰
|
ab68895760
|
test分支修改pom
|
6 years ago |
|
王杰
|
c87b00756f
|
dev分支修改pom
|
6 years ago |
|
qianhs
|
a2ac02aa47
|
【VDA静态盘点-盘点调差-实时库存未解冻】【bug7009】
|
6 years ago |
|
E
|
7ef04dd824
|
【1320 KT物料信息--需要维护物料的类型：器具】
|
6 years ago |
|
gcj
|
a7d1ec785b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
qianhs
|
5c28c8344c
|
【VDA静态盘点-盘点调差-实时库存未解冻】【bug7009】
|
6 years ago |
|
汪云昊
|
4705b77a7e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
b674087ffc
|
资源导入优化
|
6 years ago |
|
王杰
|
339f1a86c2
|
删除枚举代码中间的注释
|
6 years ago |
|
puxiao.liao
|
0453363336
|
【发运配料界面显示将单据数量改为剩余配料数量。
】bug7063
|
6 years ago |
|
jokelone
|
e2c9d9e569
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
54fe0ce760
|
【bug：6360 工厂初始化】
|
6 years ago |
|
gcj
|
49134cc5b3
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
钮海涛
|
81b84d86e5
|
新增KPI接口
|
6 years ago |
|
WYnneaoapc
|
0191a17a4d
|
Merge branch 'dev' into test
|
6 years ago |
|
WYnneaoapc
|
0103c64247
|
task `1316` 1 拆分job任务
|
6 years ago |
|
WYnneaoapc
|
e206057aba
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jenkins
|
5513e95884
|
Jenkins自动合并
|
6 years ago |
|
gcj
|
01e5919349
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
E
|
b5006a88f1
|
【#1302 器具管理-新增器具规则检查组件】【#1303 器具管理-修改更新箱条码组件】
|
6 years ago |
|
WYnneaoapc
|
50f77a5081
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
gcj
|
0e1599789d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
gcj
|
d92850c1a4
|
【运输管理】
|
6 years ago |
|
WYnneaoapc
|
a38dc051ac
|
task `1308` 1 PCN国际化资源
|
6 years ago |
|
jenkins
|
03051f4fd1
|
Jenkins自动合并
|
6 years ago |
|
许心洁
|
773f56b577
|
TASK_INO_STATUS 20和30的枚举类名严重错误，容易误导开发
|
6 years ago |
|
汪云昊
|
1318c6ef56
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
WYnneaoapc
|
129c84d4a8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |