许心洁
|
2f90982e68
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
许心洁
|
c53c8c04e3
|
BUG#7186
|
5 years ago |
jenkins
|
852be5a130
|
Jenkins自动合并
|
5 years ago |
袁津哲
|
76b5087e60
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
袁津哲
|
f323637c94
|
Wms初始化扫描实体字段新增逻辑优化
|
5 years ago |
|
jenkins
|
b0bbf43a9b
|
Jenkins自动合并
|
5 years ago |
宋军超
|
5a24a08c00
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
宋军超
|
b0f60a9176
|
2020-01-08创建动态列表与查询model
|
5 years ago |
 钮海涛
|
68fc275565
|
修复资源甘特图拖拽问题
|
5 years ago |
|
jenkins
|
75dc17f4c4
|
Jenkins自动合并
|
5 years ago |
jokelone
|
d0cd9d03b9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
jokelone
|
0d7aca73a8
|
【需求：7315 生产工单变更】
|
5 years ago |
 王杰
|
54bdf8f6a0
|
JIS
|
5 years ago |
e-jiawentao1
|
7b696d7e73
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
e-jiawentao1
|
a92090a3ab
|
2020-01-07创建动态查询与表单各层
|
5 years ago |
e-jiawentao1
|
c51453a856
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
e-jiawentao1
|
9fbc120666
|
动态搜索与自定义列表初始化扫描Bean字段
|
5 years ago |
|
jenkins
|
54d6d1f340
|
Jenkins自动合并
|
5 years ago |
WYnneaoapc
|
b1d030e0dd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
jenkins
|
189bece3f7
|
Jenkins自动合并
|
5 years ago |
|
e-jiawentao1
|
b2edab4ef4
|
2020-01-07创建动态查询与表单dao
|
5 years ago |
|
e-jiawentao1
|
1dba90f768
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
e-jiawentao1
|
b939ce6625
|
2020-01-07创建动态查询实体
|
5 years ago |
|
王杰
|
685d7949bf
|
Merge branch 'dev' into test
|
5 years ago |
zcg
|
d8f6a5273c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
许心洁
|
a2041a4900
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
许心洁
|
7d63a933c0
|
生产报工JOB出错没有更新状态+流程修改初始化组件没有重新加载组件+流程管家：加上可设置是否提交逻辑
|
5 years ago |
|
zcg
|
b84a305b26
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
jenkins
|
497b963f60
|
Jenkins自动合并
|
5 years ago |
|
王杰
|
bf62494236
|
JIS
|
5 years ago |
|
jenkins
|
fa4cc8610f
|
Jenkins自动合并
|
5 years ago |
puxiao.liao
|
8584946ce5
|
【 条码状态报表，导出时下列三个字段为中文
】bug7196
|
5 years ago |
|
WYnneaoapc
|
a9f2cf2501
|
task 1309 大数据检索
|
5 years ago |
|
zcg
|
c86f3e280e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
王杰
|
0a0124cd2b
|
Merge branch 'dev' into test
|
5 years ago |
|
jokelone
|
c3a7e0057b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
jokelone
|
fea1811191
|
【bug：7153 JIT排序】
|
5 years ago |
|
王杰
|
4f8898d57a
|
Merge branch 'dev' into test
|
5 years ago |
|
王杰
|
bcec1d7e62
|
JIS
|
5 years ago |
|
王杰
|
f88041df1e
|
Merge branch 'dev' into test
|
5 years ago |
|
王杰
|
3fe50125ae
|
JIS
|
5 years ago |
|
jokelone
|
c226e61acf
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
zcg
|
d9990f0cb8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
jenkins
|
a685cd208d
|
Jenkins自动合并
|
5 years ago |
|
许心洁
|
267ec6c647
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
wei.peng
|
823f818abf
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
许心洁
|
fe809e2eff
|
定时处理遗漏的待处理移动单JOB：处理周期改为可配置的JOB参数+流程管家：在放入“IS_COMMIT_REF_MOVE”缓存时需要判断是否为空+交易类型添加属性“是否推送异常邮件”用于第一次处理移动单出错
|
5 years ago |
|
wei.peng
|
44af186f2f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
zcg
|
f2d73a0687
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
 曾贞一
|
1995e55b40
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
989e05c64c
|
【7168 对于发运单标签补打功能，根据发运单中的ship-to获取标签模板进行打印】
|
5 years ago |
|
wei.peng
|
d8d47541df
|
自定义报表调整
|
5 years ago |
|
wei.peng
|
af6083ddff
|
日志存储优化
|
5 years ago |
|
jenkins
|
c14ef88ea8
|
Jenkins自动合并
|
5 years ago |
|
jokelone
|
68eb60c6cb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
钮海涛
|
74be235a26
|
修复资源甘特图拖拽问题
|
5 years ago |
|
钮海涛
|
b0bbd132c6
|
修复资源甘特图拖拽问题
|
5 years ago |
|
zcg
|
f38e54e496
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
jenkins
|
422aa1835f
|
Jenkins自动合并
|
5 years ago |
|
钮海涛
|
4013ed776b
|
修复炉资源排程问题
|
5 years ago |
|
jenkins
|
dfb06def2b
|
Jenkins自动合并
|
5 years ago |
|
曾贞一
|
9e9d3e2afa
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
5a4510cedb
|
【7168 对于发运单标签补打功能，根据发运单中的ship-to获取标签模板进行打印】
|
5 years ago |
qianhs
|
81bab75132
|
【库存调整盘点需要修改为，扫描新的库位时就对上一个库位中的数据做调整（更新条码状态），每个库位的扫描数据还是存在同一张盘点单内，点击提交时该张盘点单关闭。去除页面上的未盘移库按钮，未盘条码直接做移库。】【bug7148 】
|
5 years ago |
陈思洁
|
bae2130d72
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
1f1f6ec825
|
【KT-1346 增加拉动任务的暂停和开启】
|
5 years ago |
|
WYnneaoapc
|
430e5ad6dd
|
Merge branch 'dev' into test
|
5 years ago |
|
WYnneaoapc
|
76c84631ab
|
revise class name
|
5 years ago |
|
WYnneaoapc
|
adb4bd2a1c
|
Merge branch 'dev' into test
|
5 years ago |
|
puxiao.liao
|
0d2df2ec43
|
【 7194 Po明细导出，单据状态为中文
】bug7194
|
5 years ago |
|
puxiao.liao
|
a3a5e63baa
|
【 7194 Po明细导出，单据状态为中文
】bug7194
|
5 years ago |
|
王杰
|
42a22d14d3
|
安灯导出字=字段冗余
|
5 years ago |
|
许心洁
|
861f46323b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
许心洁
|
7594b3d515
|
SAP取消指令：按行取消函数逻辑从软删明细和条码变为更新单据明细和条码的状态为行取消
|
5 years ago |
E
|
a1276b5542
|
【#1338 库位物料中需要增加批量导入】
|
5 years ago |
|
许心洁
|
a231651315
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
WYnneaoapc
|
0a7f6ebf24
|
Merge branch 'dev' into test
|
5 years ago |
|
WYnneaoapc
|
cb7a1dea2a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
WYnneaoapc
|
011b4d2205
|
zh20200101 现场问题修改 BI all
|
5 years ago |
gcj
|
b29347c409
|
【坤泰运输管理】
|
5 years ago |
|
钮海涛
|
9627b6cf9e
|
修改资源甘特图侧边栏显示内容
|
5 years ago |
|
jenkins
|
774e5015c6
|
Jenkins自动合并
|
5 years ago |
|
钮海涛
|
2eb244c41c
|
修改资源甘特图侧边栏显示内容
|
5 years ago |
|
许心洁
|
9a272f8b6a
|
BUG#6755：移动单监听队列新增逻辑：如果当前处理的移动单的交易类型配置成需要推送异常邮件，并且全局参数“系统管理员”也有配置，则随送异常邮件
|
5 years ago |
|
jenkins
|
a104276c01
|
Jenkins自动合并
|
5 years ago |
汪云昊
|
1cc4cacb5f
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
汪云昊
|
b0b671aac0
|
软适配 数据源适配器优化
|
5 years ago |
|
jenkins
|
688d976683
|
Jenkins自动合并
|
5 years ago |
|
陈思洁
|
9f0a1e8ce0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
05efdbb568
|
【KT-1339 安全库存拉动，新增低于起订量概念】
|
5 years ago |
|
王杰
|
8a4aa9fed2
|
jis发运
|
5 years ago |
|
陈思洁
|
1e1e5e907e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
472adfd03c
|
【KT-1339 安全库存拉动，新增低于起订量概念】
|
5 years ago |
|
jokelone
|
ebe34e4ba9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
汪云昊
|
a76d70851d
|
软适配 适配记录参数 分页查询
|
5 years ago |
|
zcg
|
ad08ff21bb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
WYnneaoapc
|
569c2613fe
|
Merge branch 'dev' into test
|
5 years ago |
|
puxiao.liao
|
f8e3edabc3
|
【 7159 线边退料逻辑错误，应该为：扫描A条码，输入原条码的剩余数量，拆包生成的新条码留在线边，原条码退回仓库。若数量与原条码相等，则不做拆包。
】bug7159
|
5 years ago |
|
wei.peng
|
391d4005ad
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
jenkins
|
028ae09f9c
|
Jenkins自动合并
|
5 years ago |
|
wei.peng
|
f768247c4f
|
代码合并 2019-12-30 15:59:52
|
5 years ago |
|
曾贞一
|
8b90b33e28
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
2da366630f
|
【VDA波次配料--物料汇总优化】
|
5 years ago |
|
钮海涛
|
14f47f1ab4
|
修改字段编辑弹出框
|
5 years ago |
|
jokelone
|
39790fd50b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
jokelone
|
d47a097c53
|
【任务：1344 通用接口增加批量数据处理】
|
5 years ago |
|
曾贞一
|
ed25a6f7d6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
46bf93f410
|
【VDA波次配料--物料汇总优化】
|
5 years ago |
|
zcg
|
1230906c3e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
jenkins
|
d98b05e479
|
Jenkins自动合并
|
5 years ago |
|
钮海涛
|
6afa007224
|
新增拖拽接口
|
5 years ago |
|
jenkins
|
d32900413a
|
Jenkins自动合并
|
5 years ago |
|
许心洁
|
ae83a432d9
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
许心洁
|
8143afeea9
|
拣货：条码的数量不能小于0+定时处理遗漏的待处理移动单JOB+closeTaskDetails函数还需要软删单据明细的状态
|
5 years ago |
|
wei.peng
|
3b7b374b23
|
自定报表对象模型调整
|
5 years ago |
|
汪云昊
|
b12f67e34b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
汪云昊
|
ec1dbc5212
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
汪云昊
|
6b02d9969a
|
数据源批量写入优化
|
5 years ago |
|
jenkins
|
9ee137a5c3
|
Jenkins自动合并
|
5 years ago |
|
gcj
|
5c838ebcf1
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
gcj
|
62c50e04cc
|
【宁德问题清单】
|
5 years ago |
|
jenkins
|
c830600235
|
Jenkins自动合并
|
5 years ago |
|
E
|
b175de4635
|
【#1335 基础数据-包装规格管理-增加导入导出】"默认容器类型"改为"容器类型"
|
5 years ago |
|
E
|
e962a1d22a
|
【#1331 KT-基础数据-物料信息】“标准包装”改为“标包”
|
5 years ago |
|
许心洁
|
d5efd000b0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
许心洁
|
d94ccd5ac5
|
下线扣减交易处理组件BUG：获取双精度类型数值时应该判断是否为空getHandledQtyVal
|
5 years ago |
|
钮海涛
|
8b1ae09885
|
修改订单甘特图
|
5 years ago |
|
王杰
|
7287aaeb77
|
其他组未提交的代码
|
5 years ago |
|
汪云昊
|
2f3e680fac
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
E
|
9e47c4ac5a
|
【#1332 基础数据-容器类型管理】新增期限单位字段
|
5 years ago |
|
jenkins
|
471016b345
|
Jenkins自动合并
|
5 years ago |
|
汪云昊
|
20ccf65c5c
|
资源加载优化
|
5 years ago |
|
汪云昊
|
d89ed44bcc
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
汪云昊
|
1d9ab80ae8
|
数据源适配器 - 批量写入优化
|
5 years ago |
|
zcg
|
192034152b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
jenkins
|
b96d22b011
|
Jenkins自动合并
|
5 years ago |
|
许心洁
|
018908d3cb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
许心洁
|
032bd61b87
|
物料拆分新增等份拆分功能+
快速移库写入移动单明细的行号写入规则不对，优化性能+
下线扣减交易处理组件修改逻辑：有条码就扣减，移动单明细表新增已处理数量，处理完毕才更新移动单的状态为已处理并传给MOVE_TO_ERP处理程序+
实时库存明细报表新增列“处理中数量”（待过账的数量）
|
5 years ago |
|
puxiao.liao
|
d34ba5e114
|
【 经讨论六合一允许扫描来源或目标不同的零件号，但是提交时需要按照目标来源拆分成不同的单据
】bug7068
|
5 years ago |
|
jenkins
|
e306cc6cdc
|
Jenkins自动合并
|
5 years ago |
|
qianhs
|
7f69df95df
|
【存调整盘点，扫描库位后，提示内容“零件号，条码，数量”】【bug7060 】
|
5 years ago |
|
jenkins
|
1163faaac1
|
Jenkins自动合并
|
5 years ago |
|
曾贞一
|
0493feaf80
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
曾贞一
|
1f8885779f
|
【6714 FIFO重新变化时需要有提示信息，加组件，用通用变量设置组件保存上次的FIFO信息。】
|
5 years ago |
陆卫豪
|
56fe97e200
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
WYnneaoapc
|
32c9bbbe85
|
task `1308` 4 同步国际化资源
|
5 years ago |
|
陈思洁
|
9d5eac441e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |
|
陈思洁
|
b5d50af250
|
【KT-1284 计划拉动-生产计划管理】
|
5 years ago |
|
钮海涛
|
629e2f8270
|
新增新增或保存字段信息接口
|
5 years ago |
|
曾贞一
|
6eafdb1d7e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
5 years ago |