puxiao.liao
|
7508796daa
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
puxiao.liao
|
44b5635e78
|
天津麦格纳PO生产任务增加关联行号
|
5 years ago |
 钮海涛
|
01d67fdd1f
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
7a29b85848
|
Fix Bug #11733 新增采购订货进度可以编辑原因
|
5 years ago |
|
puxiao.liao
|
6a42b517fc
|
Fix Task#2839
武汉PRD-WMS&TMS装车明细接口
|
5 years ago |
|
puxiao.liao
|
c7e5524a0a
|
修复无条码生产扣减增加扣减条码状态只能为入库，合格
|
5 years ago |
|
钮海涛
|
3d5729e28b
|
自动打印队列增加供应商
|
5 years ago |
|
puxiao.liao
|
90d94f35c8
|
Fix bug#11683
质检单-已收货数量-显示优化
|
5 years ago |
|
钮海涛
|
5a0178f5df
|
合并dev代码
|
5 years ago |
|
钮海涛
|
af4bb83f85
|
sweb合并test代码
|
5 years ago |
|
钮海涛
|
1695d75ff2
|
合并dev代码
|
5 years ago |
|
钮海涛
|
94568777fb
|
合并test代码
|
5 years ago |
|
钮海涛
|
9c7d455998
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |
|
钮海涛
|
61ad20717b
|
合并sweb代码
|
5 years ago |
 曾贞一
|
944b853862
|
【代码优化】
|
5 years ago |
|
曾贞一
|
84d5f84457
|
【11629 20021--北美看板需求变更--0930】
|
5 years ago |
|
puxiao.liao
|
79baaa4546
|
Fix bug#11661
移库单界面增加来源存储区和目标库位的检索条件
|
5 years ago |
汪云昊
|
171f39cf01
|
revert:还原pojo pom.xml报表
|
5 years ago |
|
汪云昊
|
56bd07dbf3
|
Merge remote-tracking branch 'origin/dev' into test
|
5 years ago |
|
puxiao.liao
|
f591139bed
|
修复TJ MGN BUG
|
5 years ago |
rock.yu
|
14d2af59d6
|
增加多级BOM生效功能
|
5 years ago |
许心洁
|
a939c689f3
|
任务#2814
|
5 years ago |
|
rock.yu
|
605b7e846a
|
增加虚零件属性
|
5 years ago |
|
曾贞一
|
4bd47e64c3
|
【接口映射-添加字段接口名称】
|
5 years ago |
|
钮海涛
|
543058b3a5
|
合并sweb代码
|
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 |
|
puxiao.liao
|
4bfb903e54
|
修复麦格那发运提交事务重复&盘点提交sql异常
|
5 years ago |
|
rock.yu
|
11750e9bf1
|
修改库存快照的pojo，确保快照功能可以正常执行
|
5 years ago |
|
puxiao.liao
|
fc351f5599
|
修复TJ MGN BUG
|
5 years ago |
|
puxiao.liao
|
ffb45cf3dd
|
修复TJ MGN BUG
|
5 years ago |
|
曾贞一
|
0f4a8c130c
|
【冲突解决】
|
5 years ago |
|
曾贞一
|
41efdd4de8
|
【2798 武汉PRD-AMP-WMS2AMP同步拉动零件库存接口】
|
5 years ago |
|
puxiao.liao
|
0c044eed91
|
修复TJ MGN BUG
|
5 years ago |
|
puxiao.liao
|
4ffe517015
|
修复TJ MGN BUG
|
5 years ago |
|
puxiao.liao
|
07f6aabd72
|
修复TJ MGN BUG
|
5 years ago |
|
rock.yu
|
16a2d75a17
|
结果生产报工job的sqlserver不兼容问题
|
5 years ago |
|
rock.yu
|
352db6a7fa
|
工单拉动的日志保存到数据库
|
5 years ago |
|
puxiao.liao
|
10edb8ebae
|
Finish Task #2184 Cost:8h
2184 06 1.2.3.7.1物流路线检查
|
5 years ago |
|
钮海涛
|
fa467a2e0d
|
sweb合并dev代码
|
5 years ago |
|
钮海涛
|
5f144781c9
|
SWEB合并test代码
|
5 years ago |
|
钮海涛
|
6749bda558
|
合并dev代码
|
5 years ago |
|
钮海涛
|
572e749bdb
|
Merge remote-tracking branch 'origin/dev' into dev
|
5 years ago |
|
钮海涛
|
b253a020b9
|
合并test代码
|
5 years ago |
|
钮海涛
|
5c104e036f
|
合并test代码
|
5 years ago |
|
puxiao.liao
|
2c3571b014
|
修复TJ MGN BUG
|
5 years ago |
|
puxiao.liao
|
f14cc48243
|
修复TJ MGN BUG
|
5 years ago |
|
puxiao.liao
|
e6b5caa61c
|
修复TJ MGN BUG
|
5 years ago |
|
钮海涛
|
f9db132861
|
坤泰SWEBU9接口
|
5 years ago |
|
rock.yu
|
17dae82081
|
增加麦格纳工单的滑动窗口计算逻辑
|
5 years ago |
|
puxiao.liao
|
5e0c0a4051
|
修复TJ MGN BUG
|
5 years ago |
|
puxiao.liao
|
ae6ffa27f4
|
修复TJ MGN BUG
|
5 years ago |
|
汪云昊
|
163d0773a9
|
修改pom文件版本
|
5 years ago |
|
汪云昊
|
b38e6ea1ad
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
钮海涛
|
48443a57de
|
合并test代码
|
5 years ago |
|
钮海涛
|
a3eb1e83f3
|
Fix Bug #11320,#11213
|
5 years ago |
|
puxiao.liao
|
900fd5d5b7
|
MGN标准库存支持修改拆包
|
5 years ago |
|
钮海涛
|
6e803445d7
|
Fix Bug #11320,#11213
|
5 years ago |
|
钮海涛
|
485c66aaf7
|
合并test代码
|
5 years ago |
|
曾贞一
|
6e252705ab
|
Merge branch 'test' of helin.huang/i3plus-pojo-liquor into test
|
5 years ago |
|
puxiao.liao
|
6e22be2d37
|
麦格纳ASN收货看板修改
|
5 years ago |
liquor
|
e75745380e
|
【11324 20011--北美收货自动打印时批次字段为2020-09-11，需要后台在传给前端时将后三位字符去除，变为2020-09用于客户目视化-0914】
|
5 years ago |
|
曾贞一
|
f7fcb1f530
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
3267a9b54f
|
【如东AGV接口】
|
5 years ago |
|
puxiao.liao
|
92c2a49b90
|
麦格纳ASN新增异常
|
5 years ago |
|
liquor
|
ddf9936d74
|
在看板中增加了一列“来源库位”。
|
5 years ago |
|
puxiao.liao
|
039fc9106b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
puxiao.liao
|
6765c58de2
|
Fix bug#11212
生产报废的条码在条码状态中查询是入库状态 --20200914
|
5 years ago |
|
钮海涛
|
31791ea8cc
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
17c64fbf46
|
修改麦格纳最早批次问题
|
5 years ago |
|
puxiao.liao
|
8ac53abe9e
|
麦格纳ASN新增异常
|
5 years ago |
|
钮海涛
|
cb39559a3d
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
曾贞一
|
6cc11a637d
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
c947df6c66
|
【坤泰接口优化】
|
5 years ago |
|
puxiao.liao
|
15a259c8b2
|
修复MGN系列BUG
|
5 years ago |
|
钮海涛
|
cfd507438e
|
天津麦格纳问题修复
|
5 years ago |
|
汪云昊
|
7a4be36111
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
puxiao.liao
|
97a8a5a6ec
|
修复MGN系列BUG
|
5 years ago |
|
puxiao.liao
|
698128aff5
|
MGN修复BUG
|
5 years ago |
|
曾贞一
|
99e63fea8c
|
【2741 北京麦格纳WMS-质检跳批】
|
5 years ago |
|
钮海涛
|
5c9da87650
|
合并冲突
|
5 years ago |
|
钮海涛
|
d47607880e
|
合并冲突
|
5 years ago |
|
曾贞一
|
193cff013f
|
【2737 09 1.2.1.9.1库位新增库位别名】
|
5 years ago |
|
puxiao.liao
|
61b87d2d00
|
MGN修复BUG
|
5 years ago |
|
puxiao.liao
|
15d915370e
|
MGN修复BUG
|
5 years ago |
|
曾贞一
|
6ca0948a5d
|
【11026 20011--有关北美收货产生的需求变更--0910】
|
5 years ago |
|
puxiao.liao
|
9a7bef44ac
|
MGN修复BUG
|
5 years ago |
|
曾贞一
|
54dc09ff76
|
【冲突解决】
|
5 years ago |
|
曾贞一
|
9ebe3c17b7
|
【枚举状态】
|
5 years ago |
|
puxiao.liao
|
26367ea28d
|
Finish Task #2184 Cost:8h
2184 06 1.2.3.7.1物流路线检查
|
5 years ago |
|
rock.yu
|
d7133b24f5
|
增加缺失的字段
|
5 years ago |
|
曾贞一
|
92e8364b58
|
【1140 09 1.2.1.1.1客户发运车辆推荐】
|
5 years ago |
|
曾贞一
|
62733aa799
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
a53e7c5724
|
【2712 子 09 1.2.1.1.1客户发运车辆推荐 / 09 1.2.1.1.1客户发运车辆推荐 -后端】
|
5 years ago |
|
puxiao.liao
|
acbad1a637
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
Conflicts:
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
|
5 years ago |
|
puxiao.liao
|
df4e794a48
|
修复MGN系列BUG
|
5 years ago |
|
rock.yu
|
1e5fe42702
|
完成了麦格纳质检录入不良数量的功能
|
5 years ago |
|
曾贞一
|
a0b50da83e
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
c06c504805
|
【2712 子 09 1.2.1.1.1客户发运车辆推荐 / 09 1.2.1.1.1客户发运车辆推荐 -后端】
|
5 years ago |
|
puxiao.liao
|
679ad59b86
|
Fix bug#10977
19128+MES工单生成WMS领料任务无法生成+20200901
|
5 years ago |
|
puxiao.liao
|
0e89f89327
|
修复MGN系列BUG
|
5 years ago |
|
puxiao.liao
|
137c45b5cc
|
修复MGN系列BUG
|
5 years ago |
|
rock.yu
|
3935bde8f6
|
同步 SAP 数据同步 JOB（从仪征同步）
|
5 years ago |
|
puxiao.liao
|
2527fe0163
|
修复MGN系列BUG
|
5 years ago |
|
钮海涛
|
51746154ba
|
合并dev到test
|
5 years ago |
|
钮海涛
|
e6b472bcfd
|
合并test代码到dev
|
5 years ago |
|
钮海涛
|
98b992408c
|
Merge remote-tracking branch 'remotes/origin/test' into dev
|
5 years ago |
|
钮海涛
|
4144e12b5d
|
合并test代码到master
|
5 years ago |
|
钮海涛
|
92f0158dab
|
合并master代码
|
5 years ago |
|
曾贞一
|
57aae56345
|
【2690 ext新增委外库存查询报表 -后端】
|
5 years ago |
wynne1005
|
f06f51cc7e
|
master merge test
|
5 years ago |
|
rock.yu
|
f6b812aaf8
|
PDA组件原生支持脚本组件
|
5 years ago |
|
rock.yu
|
9be1dd70d5
|
盘点明细表 lotno 字段增加默认值
|
5 years ago |
|
puxiao.liao
|
36e9000710
|
麦格纳BUG
|
5 years ago |
|
曾贞一
|
c1cb461f36
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
a9e97d4e28
|
【2688 08 extPDA-查询查看零件对应库位】
【2683 08 ext单据打印新增字段查询和显示】
【2682 08 ext单据打印新增模板选择】
|
5 years ago |
|
rock.yu
|
42187ebadc
|
完善流程管家日志信息
|
5 years ago |
|
钮海涛
|
85395e84fd
|
合并dev代码
|
5 years ago |
|
钮海涛
|
2013d47353
|
合并dev代码
|
5 years ago |
|
曾贞一
|
ec7aee68a7
|
【10744 20011--二维码收货时，如果该零件号设置了特殊批次，则扫描系统自己生成的二维码时永远报错“条码未维护供应商批次 执行成功请扫描二维码”，实际批次已经存在与条码最后一个字段中--0830】
|
5 years ago |
|
许心洁
|
2cc6abb902
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
291c0b2a40
|
BUG#10584,BUG#10784,BUG#10785
|
5 years ago |
|
钮海涛
|
9a41c2e2e0
|
合并test到dev
|
5 years ago |
|
钮海涛
|
347f6671f2
|
合并dev到test
|
5 years ago |
|
钮海涛
|
310da99743
|
合并master代码
|
5 years ago |
|
汪云昊
|
a52646a65d
|
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
|
5 years ago |
|
puxiao.liao
|
6d59e00fc5
|
Fix bug#10545
10545 19081 -- 出入库界面更改 20200814
|
5 years ago |
|
puxiao.liao
|
ba5befe291
|
Finish Task #2645 Cost:8h
【PCR-20200525-003_委外出库条码变更】中的零件号转化
|
5 years ago |
|
曾贞一
|
d81a7bf22e
|
【接口映射优化】
|
5 years ago |
陈思洁
|
d17161d359
|
【2658 LPS导入后端开发】
|
5 years ago |
|
曾贞一
|
867ecc6d71
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
15314209ae
|
【2636 07 1.2.3.4.3坤泰ERP&WMS接口】
|
5 years ago |
|
puxiao.liao
|
9299f17c3b
|
Fix bug#10671
二维码收货扫描条码报错系统异常 --20200821
|
5 years ago |
|
曾贞一
|
d3ae797ba0
|
【坤泰接口开发】
【质保周期检查组件--优化代码】
|
5 years ago |
|
rock.yu
|
5bfd542402
|
增加工单拉动
|
5 years ago |
|
曾贞一
|
0b09e410f5
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
fe2017fbe4
|
【622 08 1.2.2.2.6 BOM增加虚阶零件】
|
5 years ago |
|
钮海涛
|
228d3dd2ab
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
841742e474
|
托标签收货合并到二维码收货
|
5 years ago |
|
puxiao.liao
|
fde40074ce
|
BUG修复
|
5 years ago |
|
钮海涛
|
9878547daa
|
合并dev分支代码
|
5 years ago |
|
钮海涛
|
f42ece4f6c
|
优化流程管家执行性能
|
5 years ago |
|
钮海涛
|
2fb46609c3
|
sweb功能开发
|
5 years ago |
|
曾贞一
|
8f7a7fcc32
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
6ba2d2826a
|
【麦格纳问题】
|
5 years ago |
|
许心洁
|
9bbc387818
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
4ec9858182
|
任务#2625
|
5 years ago |
|
曾贞一
|
2bef33960c
|
【2617 08 1.2.2.2.4新增保质期检查组件】
|
5 years ago |
|
许心洁
|
1c02cd6562
|
任务#2612，2613
|
5 years ago |
|
汪云昊
|
bda160ccec
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
ypf
|
523d2ffc80
|
关于欧洲领料看板逻辑实体的添加
|
5 years ago |
|
许心洁
|
4a9e5cbb59
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
3a4c143563
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
14e68803df
|
增加根据物料号取库存地信息的微服务接口
|
5 years ago |
|
许心洁
|
7dcd8a1627
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
许心洁
|
7482a6dd74
|
BUG#9928 和任务#2590
|
5 years ago |
|
puxiao.liao
|
f9061f5d27
|
BUG修复
|
5 years ago |
qianhs
|
86c9bce2aa
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
曾贞一
|
067a859e83
|
【10229 19081-- 在已有的二维码生产报工逻辑上加上原材料扣减逻辑 --20200802】
|
5 years ago |
|
钮海涛
|
933f2014ad
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
39f6819e9b
|
修复合并版本问题
|
5 years ago |
|
钮海涛
|
59a1acdafc
|
修复合并版本问题
|
5 years ago |
|
puxiao.liao
|
d5d16569bb
|
Fix bug#10283
20089+库存移动统计报表查询增加项目代码查询项
|
5 years ago |
|
钮海涛
|
f760b72094
|
Merge remote-tracking branch 'remotes/origin/test'
|
5 years ago |
|
rock.yu
|
f368ec88cc
|
修改流程管家组件调用日志表
|
5 years ago |
|
qianhs
|
c872663847
|
Finish Task #2080 Cost:8h
|
5 years ago |
|
rock.yu
|
b928acae47
|
1. 流程管家增加记录组件执行耗时的功能
|
5 years ago |
|
钮海涛
|
51bae8d1e6
|
Fix Bug #10312 修复动态搜索取不到列信息问题
|
5 years ago |
 王杰
|
6c5e646d49
|
test merge master
|
5 years ago |
|
曾贞一
|
f25a186d77
|
【2511 07 1.2.3.4.3坤泰ERP&WMS接口】
|
5 years ago |
|
曾贞一
|
4ff84de904
|
【2557 sap指令锁定回传信息增加业务类型，交易类型，erp单号内容】
|
5 years ago |
|
puxiao.liao
|
5990e56dfd
|
Finish Task #2540 Cost:8h
喜德WMS-新增“回传源材料扣减结果”的接口映射
|
5 years ago |
|
钮海涛
|
e239c89e63
|
Merge remote-tracking branch 'origin/test' into test
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
|
5 years ago |
|
钮海涛
|
7f55af4477
|
Finish Task #2560 Cost:8h
|
5 years ago |
|
钮海涛
|
5a64ce6021
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
puxiao.liao
|
937eac5e87
|
Finish Task #2549 Cost:4h
自动生成领料单增加默认来源存储区、自动获取默认目标库位
|
5 years ago |
|
钮海涛
|
72c1363517
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
f2cf6af1fe
|
Finish Task #2523 Cost:16h
Fix Bug #10065 已增加数据权限控制
|
5 years ago |
|
许心洁
|
46904c43d1
|
任务#2528，#2545
|
5 years ago |
|
puxiao.liao
|
47f466d1d6
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
puxiao.liao
|
e85acdcfff
|
Fix bug#9994
库存明细--显示重复
|
5 years ago |
|
qianhs
|
958a45d3dd
|
Finish Task #2080 Cost:8h
|
5 years ago |
|
钮海涛
|
fd0f079a6a
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
34be0bde26
|
增加物料组功能
|
5 years ago |
|
puxiao.liao
|
2e3f5bb2af
|
Fix bug#9994
库存明细--显示重复
|
5 years ago |
|
puxiao.liao
|
5f90efe691
|
Fix bug#9982
19125+条码打印页面，erpSrcNo字段数据错误，导致打印出的条码数据有误+0727
|
5 years ago |
|
钮海涛
|
7ca3b43bfe
|
合并DEV分支代码
|
5 years ago |
|
钮海涛
|
b04ef3caa4
|
合并TEST分支代码
|
5 years ago |
|
钮海涛
|
ef40f20e1d
|
解决合并冲突
|
5 years ago |
|
钮海涛
|
3c22c8e3f4
|
test版本合并到master
|
5 years ago |
|
钮海涛
|
0eb571d717
|
Fix bug #9804
|
5 years ago |
|
钮海涛
|
9bde10f13c
|
修复收货回执界面打不开问题
|
5 years ago |
|
puxiao.liao
|
5006e0a938
|
Finish Task #2520 Cost:8h
2520 07 1.2.3.3.4北京麦格纳WMS-JIS生产报工与内部移库
|
5 years ago |
|
puxiao.liao
|
31c3fcd868
|
泰国需求
|
5 years ago |
|
钮海涛
|
3e95dd4029
|
修复北京麦格纳生产报工问题
|
5 years ago |
|
puxiao.liao
|
88b85b03d2
|
Finish Task #2436 Cost:8h
拣货、客户发运流程简化配置
|
5 years ago |
|
qianhs
|
c9e4c72901
|
Finish Task #2080 Cost:8h
|
5 years ago |
|
qianhs
|
e17318dbcb
|
Finish Task #2080 Cost:8h
|
5 years ago |
|
王杰
|
b3999ad481
|
dev merge test
|
5 years ago |
|
王杰
|
767c1bffbc
|
test merge dev
|
5 years ago |