 王杰
|
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 |