7399 Commits (0f46a23c7af8cb64bacfff45c2f2076ae285b617)
 

Author SHA1 Message Date
puxiao.liao 0f46a23c7a Fix bug#11611
19081-计划外入库-扫描条码后撤销
5 years ago
rock.yu 605b7e846a 增加虚零件属性 5 years ago
陈思洁 d5d4942eb6 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 604c1443ca 【三色灯控制信息基础页面增删改查】 5 years ago
wynne1005 ea6fc313c3 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 1975906ee5 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 4bd47e64c3 【接口映射-添加字段接口名称】 5 years ago
陈思洁 0f1f437a9e 【2794 09 ext 19081-返工返修标签打印变更-20200813】 5 years ago
陈思洁 373e5026c5 【2794 09 ext 19081-返工返修标签打印变更-20200813】 5 years ago
陈思洁 ad2f084287 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 b8e34a34b5 【11561 19081-安灯pushPLC控制三色灯-目前未控制具体工位-20200924】 5 years ago
songss b376450d4b 修改获取复核异常的数据接口返回数据 5 years ago
wynne1005 12f1c4a809 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 708985be2a 中航 设备自动报警 #1 5 years ago
曾贞一 2f717fdd98 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
曾贞一 2d2ff0ddb1 【2801 武汉PRD-AMP-WMS2SAP回传TWD订单收货结果接口】 5 years ago
joke.wang 9fb8962e4e 客退件bug修复 5 years ago
宋军超 979e18c4a7 天津麦格纳修改涂装质检看板 5 years ago
puxiao.liao 4bfb903e54 修复麦格那发运提交事务重复&盘点提交sql异常 5 years ago
宋军超 ba6470baad 天津麦格纳修改组托获取托包规数量 5 years ago
rock.yu d227fcedd4 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
rock.yu 11750e9bf1 修改库存快照的pojo,确保快照功能可以正常执行 5 years ago
汪云昊 ffdfd866e0 Merge remote-tracking branch 'origin/dev' into test 5 years ago
汪云昊 b2bc93abfe Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 816557085f fix(base):修改当前页取值方法 5 years ago
wynne1005 2ae471febd Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 3c1c6c8c55 新增通用对象 password 5 years ago
陈思洁 e9ce24d6f9 【2794 09 ext 19081-返工返修标签打印变更-20200813】 5 years ago
joke.wang 612c919e5f bypass优化 5 years ago
puxiao.liao fc351f5599 修复TJ MGN BUG 5 years ago
songss 44af4d1418 项目过滤掉.DS_Store 5 years ago
wynne1005 7c9c0890fa Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
songss 28d7b79f82 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 777f5818b3 Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
wynne1005 114654dd99 冲突解决 5 years ago
宋双双 3d259fe565 删除 '.DS_Store' 5 years ago
wynne1005 696695ef0e 海纳川变更 10923 10894 5 years ago
songss d050274450 新增查询生产表数据接口 5 years ago
陈思洁 5fcdc2d4ea Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 5 years ago
陈思洁 053b609d88 【11559 19081-MESOP30料箱二次校验没有触发20200922】 5 years ago
汪云昊 25c195ba98 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
钮海涛 0ce944ec5f Merge remote-tracking branch 'remotes/origin/test' into dev 5 years ago
钮海涛 73809df827 合并swebtest代码 5 years ago
songss 2f953ac223 新增获取中航DB复核项接口。新增修改生产数据接口 5 years ago
joke.wang bc383d573b 生产工单增加特殊标示字段 5 years ago
钮海涛 ac4f217c9d Merge remote-tracking branch 'origin/dev' into dev 5 years ago
钮海涛 c4f161e958 Start Task #2795 5 years ago
puxiao.liao ffb45cf3dd 修复TJ MGN BUG 5 years ago
songss 90a96444e7 Merge remote-tracking branch 'origin/test' into test 5 years ago
songss c5de9c9841 Merge remote-tracking branch 'origin/test' into test
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
5 years ago