8544 Commits (0450e2665a22e952654d301103667776faa04137)

Author SHA1 Message Date
puxiao.liao 4de836b28a 质检明细状态增加选别 4 years ago
nies 51160a4586 更新用户导入model 4 years ago
钮海涛 1fc8349b66 Merge remote-tracking branch 'origin/ext-dev' into ext-dev 4 years ago
钮海涛 9c9af10973 完成硫化补满模最大间隔限制,订单未完全下发未完成。 4 years ago
nies 0a36e83fd5 更新用户导入的model 4 years ago
钮海涛 3a5fad2a74 完成硫化补满模最大间隔限制,订单未完全下发未完成。 4 years ago
nies 474e181d8c bsp注册参数增加注册类型 4 years ago
gsz 6411160219 Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
gsz 4b21ff8851 南非E看板提交 修改 4 years ago
钮海涛 d0b880c7aa 牵纱拆余数到手工设备完成最大间隔限制,硫化补满模未完成。 4 years ago
puxiao.liao 24a0f1026f Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
nies 5da810fb20 Merge branch 'test' into dev 4 years ago
nies 9a534c96e6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 4 years ago
nies 0aa24fb812 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
nies 1e0f9a847a 新增人员导入的model类 4 years ago
钮海涛 f0147d2680 按订单排程,完成最大间隔限制,牵纱拆余数到手工设备未完成。 4 years ago
曾贞一 634dce48b9 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
曾贞一 90f0936b20 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
曾贞一 add0708fb2 【3617 收货入库-后端开发】 4 years ago
castle.zang aa3ece8336 增加脚本支持,修改返回为resultBean 4 years ago
钮海涛 5b41f25711 Merge remote-tracking branch 'origin/ext-dev' into ext-dev 4 years ago
钮海涛 13d015e79a 工序间最大间隔限制调整前 4 years ago
jun 7945213f6e 19048 -- 供应商退货选择ERP单号界面增加【已退数量】字段 --20210710 4 years ago
jun d5fd0ec33a Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
jun 1de5989099 华域麦格纳组托 4 years ago
jun e5e79230db WmsStockSn新增箱重量和托重量 4 years ago
puxiao.liao 1ff31386af 规则加载加入路径配置 4 years ago
puxiao.liao 1a403dfefd Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
Dominic_Xiao efbb51711e 16826 19081-备件计划导入功能增加数量选项,便于快速导入-20210723 4 years ago
gsz c901b36663 Merge remote-tracking branch 'remotes/origin/test' into ext-dev 4 years ago
Wynne 55af273ea7 feat(Screen): 界面回显
界面回显
4 years ago
曾贞一 bb48086df9 Merge remote-tracking branch 'origin/test' into test 4 years ago
曾贞一 4cd0f48f52 【查询条件】 4 years ago
jun fdec525fa1 16788 19081-北京麦格纳,ERP明细报表优化,2021-07-16 4 years ago
puxiao.liao ad1f48c28c Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
jun 8e9cc32c9a Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
jun c93d9bdd2a 北京麦格纳ASN看板明细新增字段后无数据 4 years ago
castle.zang 52b70927b3 ptl亮灯增加backoff字段 4 years ago
puxiao.liao 93cfa0ec44 Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
钮海涛 521e12b69c Merge remote-tracking branch 'origin/ext-dev' into ext-dev 4 years ago
钮海涛 9910420ea8 完成最大间隔限制问题。 4 years ago
puxiao.liao e4b7159fc7 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
puxiao.liao 804401e12c 修复枚举导出异常 4 years ago
puxiao.liao 4250f215f2 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
puxiao.liao 09e380d1f2 属性添加枚举值注解 4 years ago
joke.wang f0c0a4038c ua配置 4 years ago
joke.wang a086d24203 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
joke.wang d2ec6e27a5 条码注释掉版本字段 4 years ago
puxiao.liao e48341f47b Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
wynne1005 d8ad92fe24 merge test 还原pom 4 years ago
wynne1005 08a0ca7937 merge dev 还原pom 4 years ago
wynne1005 8cb6abc09d Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 4 years ago
Dominic_Xiao 4297c59ef4 去除无效索引 4 years ago
Dominic_Xiao 5c62f1b0d5 产线班次时段新增顺序字段 4 years ago
Dominic_Xiao adfec8957d 看板班次时段增加序号 4 years ago
puxiao.liao 48fb24f3d7 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
joke.wang 2521606f5b 删掉无效索引 4 years ago
puxiao.liao 606653ec0c 条码表增加工单,班次字段信息 4 years ago
puxiao.liao ac535feab8 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
joke.wang 370f4e9a02 强过报工定时任务 4 years ago
gsz c8cdc48290 WmsECartOrderNoBuild 4 years ago
gsz d0d34f9a8f WmsECartOrderNoBuild 4 years ago
gsz c4057a64ad WmsECartOrderNoBuildRepository 4 years ago
puxiao.liao 59677dc00a Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
puxiao.liao 3136ba43b1 明细增加供应商信息 4 years ago
wynne1005 c55875e129 feat(screen): 7.7 通用界面与前端完成回显
7.7 通用界面与前端完成回显
4 years ago
gsz e029090e03 南非领料单据命名规则更改  零件号*yyMMddsequenceNo --20210707 4 years ago
Dominic_Xiao b54b31779b Merge remote-tracking branch 'origin/test' into test 4 years ago
Dominic_Xiao c3a018dc1f 零件消耗数量模型 4 years ago
nies c467fff481 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
nies 8791ead24a 修改bsp平台执行器的注册参数 4 years ago
曾贞一 edd25a1fe3 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
gsz 2b5da37bbe Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
gsz c75973e674 南非领料单据命名规则更改 零件号*yyMMddsequenceNo 4 years ago
gsz f5dee63b21 3579 20063-精冲预警看板-202107 4 years ago
puxiao.liao ded6612504 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
 Conflicts:
	modules/i3plus-pojo-screen/pom.xml
4 years ago
nies cb740da130 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
nies f9eac5d6af 更新AccountExportModel 4 years ago
jun 6ba94fab3b WmsMoveSn 删除无效多余索引映射 4 years ago
jun 5ca70c8ae6 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 4 years ago
jun 3ac0d2d6dc 删除wmsStockSn无效索引映射 4 years ago
曾贞一 95cee813c0 【jenkins打包报错】 4 years ago
jun 79608e26e7 北京mgn ERP FG details明细报表 4 years ago
曾贞一 5efca780b1 Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
钮海涛 983f5db7cb Merge remote-tracking branch 'origin/ext-dev' into ext-dev 4 years ago
钮海涛 ec3bcc7518 有库存问题修复 4 years ago
曾贞一 df1a5716fb Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
puxiao.liao 6049d5d041 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
puxiao.liao 94a6f616e7 BOM添加采购类型字段 4 years ago
puxiao.liao b3c2e6a728 Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
puxiao.liao 1e13a34883 BOM添加采购类型字段 4 years ago
duan.yang 0e3138c85d Merge remote-tracking branch 'origin/ext-dev' into ext-dev 4 years ago
duan.yang 48779edcfc 添加同步至WMS标识
Signed-off-by: duan.yang <994300880@qq.com>
4 years ago
puxiao.liao 4840627a7f Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev 4 years ago
puxiao.liao e711e9f051 Excel的导出增加批注信息 4 years ago
钮海涛 ebe47b102a Merge remote-tracking branch 'origin/ext-dev' into ext-dev 4 years ago
钮海涛 b0d2a7b710 有库存问题修复 4 years ago
Dominic_Xiao 383576d0c8 Merge remote-tracking branch 'origin/test' into test 4 years ago
Dominic_Xiao 980f98bf26 安灯看板模型新增具体事件原因字段 4 years ago
王杰 a1fcd53e1f Merge branch 'test' into ext-dev 4 years ago