 钮海涛
|
505de36ca5
|
修改SWeb供应商登录接口
|
5 years ago |
puxiao.liao
|
56deedeaf3
|
北京麦格纳看板
|
5 years ago |
|
puxiao.liao
|
c965a34236
|
北京麦格纳看板
|
5 years ago |
|
puxiao.liao
|
ba81af744b
|
北京麦格纳看板
|
5 years ago |
|
puxiao.liao
|
ceb882cef4
|
天津MGN修复BUG
|
5 years ago |
|
puxiao.liao
|
4ca43f81cc
|
北京麦格纳JIS发运看板
|
5 years ago |
|
钮海涛
|
34a3c9553d
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
bf41628114
|
修改物料的标准质检时间类型为浮点数，精度为2
|
5 years ago |
|
puxiao.liao
|
1aebc6761c
|
Fix bug#11878
19081-增加库存交易推算报表-1016
|
5 years ago |
|
钮海涛
|
3e89aa9425
|
乐观锁增加默认值设置
|
5 years ago |
|
钮海涛
|
61d123cfc8
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
93626dad0f
|
新增质检完成状态报表
|
5 years ago |
rock.yu
|
269f072fb8
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
puxiao.liao
|
8ed135734d
|
天津麦格纳BUG
|
5 years ago |
|
钮海涛
|
7bdecfe687
|
Merge remote-tracking branch 'origin/test' into test
|
5 years ago |
|
钮海涛
|
07282396d2
|
ASN到货看板问题修复
|
5 years ago |
|
rock.yu
|
9a2b6fe43a
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
5 years ago |
|
rock.yu
|
c3bdf4a162
|
解决10330库存扣减不准的问题
|
5 years ago |
|
puxiao.liao
|
ee700ab5b0
|
天津麦格纳多级BOM
|
5 years ago |
|
puxiao.liao
|
75520519de
|
修复天津麦格纳BUG
|
5 years ago |
|
puxiao.liao
|
cfd0cb03ff
|
天津麦格纳BUG修复
|
5 years ago |
|
rock.yu
|
8932108cd3
|
暂时去掉乐观锁
|
5 years ago |
|
rock.yu
|
df9474807c
|
库存条码表、库存表 增加版本号，用乐观锁控制并发问题
|
5 years ago |
|
puxiao.liao
|
08687a7e14
|
修复天津麦格纳BUG
|
5 years ago |
|
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 |