许心洁
|
b112bdb5e8
|
成功处理移动单写入MOVE_TO_ERP表：根据移动单号+行号+零件号查询是否已存在数据，是则将此数据标记为不同步且无效软删除
|
6 years ago |
 曾贞一
|
1357dfad30
|
【VDA收货-- 前端PC端POsn页】任务号1102
【VDA收货-- 问题清单中加密库位】任务号1104
【VDA收货-- 系统无法查看保质期物料的具体信息】任务号1112
【VDA收货-- 对于分组数据如何查看分组信息】任务号1111
|
6 years ago |
|
许心洁
|
dd86ce354a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
b8842edbb1
|
无条码打印：新功能开发完成
|
6 years ago |
crish
|
88af19f8e9
|
修改开发环境pom文件test为dev
|
6 years ago |
changjiang.gao
|
13066bd4d1
|
【库存预警】bug 243
|
6 years ago |
|
许心洁
|
3bc277178e
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
陈思洁
|
a90aa8498f
|
实体修改字段类型【int】改成【Integer】
|
6 years ago |
|
许心洁
|
0c20a2b655
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
陈思洁
|
e5b5891d23
|
bom信息中新增冗余字符
|
6 years ago |
|
许心洁
|
f5a8e9f130
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
曾贞一
|
610a96d2ee
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
6b9c7b3ced
|
【VDA库存调整盘点】 添加供应商字段
|
6 years ago |
|
许心洁
|
77fefbcf74
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
许心洁
|
04df70114d
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
许心洁
|
e593cc875d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
changjiang.gao
|
2ba7596a57
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
changjiang.gao
|
25f11781c1
|
盘点差异增加字段
|
6 years ago |
|
许心洁
|
ba7fe81978
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
5956d5a08e
|
冲销：需求变更优化
|
6 years ago |
|
曾贞一
|
26b4a5c52c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
a9045ed403
|
bug 5953
|
6 years ago |
|
陈思洁
|
a54d711d95
|
#1085 BOM导入接口新增
|
6 years ago |
|
许心洁
|
02055a8b7e
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
许心洁
|
18789939b0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
crish
|
cd74f5336f
|
Merge branch 'dev' into test
|
6 years ago |
于学杰
|
dbc69e957a
|
1. 供应商物料实体增加字段
|
6 years ago |
刘辉
|
e89df89f9a
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
changjiang.gao
|
3ab8cf112d
|
盘点条码差异
|
6 years ago |
|
刘辉
|
febbea09c3
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
changjiang.gao
|
8808a77de6
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
changjiang.gao
|
69e8357c69
|
条码数量编辑
|
6 years ago |
|
于学杰
|
63e225026c
|
1. 扩展通用接口功能，支持与软适配的对接
|
6 years ago |
|
刘辉
|
4ffc63ce83
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
bleakney.liu
|
f6be80db01
|
增加groupby 构造函数
|
6 years ago |
|
许心洁
|
a1597c089c
|
成品冲销+导入转换格式（就一个不知道是什么单导入）
|
6 years ago |
|
crish
|
1de89d732b
|
本地误拉了test代码，解决pom
|
6 years ago |
|
crish
|
9f9874902d
|
冲突解决
|
6 years ago |
|
曾贞一
|
e603ac66a7
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
许心洁
|
16839f6911
|
成品冲销+抛异常方法封装优化
|
6 years ago |
|
许心洁
|
2f843a8f5a
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
许心洁
|
88754f9a71
|
收货看板重写
|
6 years ago |
|
于学杰
|
68a6c85068
|
Merge branch 'dev' into test
|
6 years ago |
|
陈思洁
|
cd8bd3a68b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
3828b4863c
|
添加保质期字段
|
6 years ago |
|
曾贞一
|
dfdb6be4bb
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
6a9924eda6
|
【VDA生产领料】 FIFO推荐组件
|
6 years ago |
wei.peng
|
e7e4a8587f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
于学杰
|
fcefe8de38
|
1. 通用接口增加调用软适配的功能（使用脚本引擎实现）
|
6 years ago |
|
许心洁
|
7863325afd
|
本地误拉了测试的代码，还原后提交，在测试分支拉开发分支的代码也得还原
|
6 years ago |
|
许心洁
|
b7b78b85ac
|
误拉了test分支的代码：还原
|
6 years ago |
|
刘辉
|
83a7a9e988
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
changjiang.gao
|
9e1b86eb2b
|
导出显示bug修改
|
6 years ago |
|
许心洁
|
8deff73454
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
changjiang.gao
|
647508d92c
|
导出显示bug修改
|
6 years ago |
|
刘辉
|
722146acd8
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
bleakney.liu
|
29fee6b028
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
bleakney.liu
|
746a04f96d
|
代码格式优化
|
6 years ago |
|
许心洁
|
6fc4474699
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
lbwgithub
|
a4d873f36f
|
添加过滤条件
|
6 years ago |
|
许心洁
|
04cdf58aef
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
lbwgithub
|
abd2321850
|
格式化代码
|
6 years ago |
|
许心洁
|
89ab1816e3
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
lbwgithub
|
71a68e8cf6
|
枚举
|
6 years ago |
 王杰
|
18bc35f60d
|
Merge branch 'dev' into test
|
6 years ago |
|
lbwgithub
|
473e2caea0
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
lbwgithub
|
2cf4759c21
|
枚举
|
6 years ago |
|
刘辉
|
60d1798b9c
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
陈思洁
|
0bdc3592e2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
f67e7df17f
|
新增冗余字段
|
6 years ago |
|
曾贞一
|
320c7f6b1f
|
【生产快速入库】生产快速入库导入接口
|
6 years ago |
|
曾贞一
|
9d3b45d2e2
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
ddd91f51b5
|
【生产快速入库】组件选择，任务编号1051
|
6 years ago |
|
许心洁
|
232c675444
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
许心洁
|
84a96a22fa
|
新加NotNumBiggerPackContainsZero方法
|
6 years ago |
|
许心洁
|
1b5df102e7
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
许心洁
|
95f156adf4
|
所有double类型的属性都要加上精度注解，否则数据库中自动生成的类型为double
|
6 years ago |
|
许心洁
|
1a7b4e3438
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘辉
|
1defd0d8be
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
陈思洁
|
113bb8755d
|
解决冲突
|
6 years ago |
|
陈思洁
|
4ac7bae38b
|
新增hql
|
6 years ago |
|
bleakney.liu
|
0fa1ffa23b
|
[物流线路修改]修改数据类型
|
6 years ago |
|
bleakney.liu
|
f682d056be
|
[物流线路管理]修改查询条件
|
6 years ago |
|
许心洁
|
653c8dca1f
|
直送发运扣减JOB过滤打印状态为线边退料生成的条码的代码逻辑错误
|
6 years ago |
|
曾贞一
|
2b62357ab5
|
VDA收货【生产快速入库】组件，任务编号1051
|
6 years ago |
|
许心洁
|
10fcc569bd
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
许心洁
|
e90c59ccf2
|
生产报工当查询到多条子物料时查询的SQL没有返回itemQty
|
6 years ago |
|
许心洁
|
e35cf183da
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
lbwgithub
|
4fc72ca358
|
条码模型
|
6 years ago |
|
lbwgithub
|
81d86d1bd2
|
条码模型
|
6 years ago |
jenkins
|
99382a8fca
|
Merge branch 'dev' into test
|
6 years ago |
|
曾贞一
|
c509f3c707
|
VDA 生产快速入库
|
6 years ago |
|
jenkins
|
0982f01eb2
|
Merge branch 'dev' into test
|
6 years ago |
|
陈思洁
|
26684524f1
|
生产报工组件和生产报工标签组件提交
|
6 years ago |
|
jenkins
|
7e3edd06a0
|
Merge branch 'dev' into test
|
6 years ago |
|
陈思洁
|
3ba6508b0c
|
新增打印机配置表
|
6 years ago |
|
陈思洁
|
22fbbe2a91
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
edfc78995b
|
新增打印机配置表
|
6 years ago |
刘敏
|
8a94b054d8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
刘敏
|
c2a75d96da
|
实体字段get方法修改
|
6 years ago |