陈思洁
|
29d62c4334
|
【3484 20063-待处理报工基础数据-20210610】
|
4 years ago |
Dominic_Xiao
|
35e41f94e1
|
卡斯马锁定记录表锁定状态赋默认值
|
4 years ago |
|
Dominic_Xiao
|
dbdcbec032
|
产品工序过程报表新增料架号字段
|
4 years ago |
|
Dominic_Xiao
|
e82043a798
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
Dominic_Xiao
|
aa78fd8bd5
|
卡斯马异常锁定
|
4 years ago |
puxiao.liao
|
9333bfc996
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
puxiao.liao
|
fe3416a736
|
查询条件的新增
|
4 years ago |
|
Dominic_Xiao
|
27ceea4113
|
16147 20135-不良品处理扫条码点击报废去掉报废原因这个选择框--2021-06-18
|
4 years ago |
 钮海涛
|
7150f1c51f
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
eeb9ab500b
|
排程结果优化
|
4 years ago |
|
puxiao.liao
|
93906742a6
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
陈思洁
|
ee42edc94c
|
【3484 20063-待处理报工基础数据-20210610】
|
4 years ago |
|
puxiao.liao
|
66fb8e5894
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
puxiao.liao
|
9cfcb2a59d
|
查询条件的增加&PO增加库存地字段
|
4 years ago |
wynne1005
|
321209f2b4
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
wynne1005
|
e7df36d3e9
|
还原merge pom
|
4 years ago |
|
wynne1005
|
69d872be7e
|
Merge branch 'dev' into test
|
4 years ago |
|
wynne1005
|
7aa3d4bddf
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
4 years ago |
|
wynne1005
|
2b0a7198a5
|
fix(impp-framework core block): 统一提交
还原pom
添加界面 icloud
升级mysql 驱动版本
添加松下日志切面
|
4 years ago |
|
puxiao.liao
|
2acc57e72d
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
joke.wang
|
470b05ebf0
|
北京ptl亮灯
|
4 years ago |
rock.yu
|
38126d9812
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Conflicts:
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java
|
4 years ago |
|
rock.yu
|
40fc186ed6
|
BOM, Locate POJO 增加索引
|
4 years ago |
 王杰
|
a321a28759
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
Dominic_Xiao
|
5bf2121c92
|
Merge remote-tracking branch 'origin/test' into test
|
4 years ago |
|
Dominic_Xiao
|
778df56d2e
|
16217 20135--增加料架需要跟生产线绑定关系--2021-06-08
16162 20135--自动操作增加工号扫码（在每一个工位第一步扫码工号，每操作一次需要扫描一次工号）--2021-06-28
16152 20135--异常锁定，解锁和解锁记录--2021-06-25
|
4 years ago |
|
王杰
|
4fe445e4c3
|
test merge dev
|
4 years ago |
|
陈思洁
|
ce8a66d83a
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
陈思洁
|
4d5cdc710e
|
【16023 19081-部分工位安灯呼叫没有反应、呼叫成功无法取消和处理-20210525】
|
4 years ago |
|
puxiao.liao
|
582f4ba81a
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
puxiao.liao
|
7125556090
|
盘点查询增加状态查询
|
4 years ago |
 曾贞一
|
561717b7a3
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
曾贞一
|
8b4bd8d8ab
|
【中航-优化委外发运业务】
|
4 years ago |
|
puxiao.liao
|
4d5888ae36
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
puxiao.liao
|
1835890e4c
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
puxiao.liao
|
d952e7a8e9
|
采购收货进度报表增加列查询，窗口开始时间，窗口结束时间
|
4 years ago |
|
puxiao.liao
|
2f903e07fa
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
puxiao.liao
|
224e3a9a51
|
字段和枚举的新增
|
4 years ago |
|
puxiao.liao
|
de75b43008
|
增加质检枚举信息
|
4 years ago |
|
puxiao.liao
|
590c433b89
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
Dominic_Xiao
|
c67f263e5d
|
卡斯马不良品处理格式化代码
|
4 years ago |
|
joke.wang
|
cda0f670eb
|
16198 19081-工位工时统计
|
4 years ago |
|
joke.wang
|
110cc85b6e
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
wynne1005
|
261d5b3655
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
4 years ago |
|
puxiao.liao
|
a8b163261d
|
mysql 版本修改
|
4 years ago |
|
puxiao.liao
|
46085f9051
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
钮海涛
|
81bbe8476a
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |
|
钮海涛
|
6e6b0a7c11
|
排程结果优化
|
4 years ago |
|
puxiao.liao
|
b31342c5db
|
Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
Xiao-yin0517
|
e7f5397e59
|
Merge remote-tracking branch 'origin/ext-dev' into ext-dev
|
4 years ago |