luweihao
|
f358c13b04
|
ptl迁移4
|
6 years ago |
jenkins
|
0961a7ce14
|
Jenkins自动合并
|
6 years ago |
qianhs
|
9fe977e8c0
|
【 日生产计划生成的条码在条码打印界面只能补打，不能打印】【bug7514】
|
6 years ago |
|
jenkins
|
106703a2be
|
Jenkins自动合并
|
6 years ago |
|
qianhs
|
8477526bf5
|
【 日生产计划生成的条码在条码打印界面只能补打，不能打印】【bug7514】
|
6 years ago |
|
jenkins
|
a9d94ecff7
|
Jenkins自动合并
|
6 years ago |
|
luweihao
|
bbfcdfdd64
|
ptl pojo 提交
|
6 years ago |
|
luweihao
|
717b72e086
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
luweihao
|
bc007c3d2b
|
pojo提交
|
6 years ago |
|
jenkins
|
6a91ce5c50
|
Jenkins自动合并
|
6 years ago |
|
qianhs
|
8a9c8273d8
|
【 发运流程 20300， 20390 没有往 ref_item 字段填写对应的值】【bug7506】
|
6 years ago |
|
jenkins
|
1a2b706e24
|
Jenkins自动合并
|
6 years ago |
|
luweihao
|
a2bf78c87e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
luweihao
|
3bed5974f6
|
ptl pojo init
|
6 years ago |
|
luweihao
|
73af305576
|
迁移20200213 2
|
6 years ago |
|
jenkins
|
594577cc69
|
Jenkins自动合并
|
6 years ago |
汪云昊
|
821d69bd06
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
汪云昊
|
8093290bad
|
lac任务检查
|
6 years ago |
puxiao.liao
|
901623b254
|
【 7510 领料，发运一步法做完之后在单据子表详情中条码状态任然为待处理。
】bug7510
|
6 years ago |
|
jenkins
|
218899aae9
|
Jenkins自动合并
|
6 years ago |
|
汪云昊
|
4708f43149
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
puxiao.liao
|
f9cb6be454
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
puxiao.liao
|
54b167256f
|
【 7510 领料，发运一步法做完之后在单据子表详情中条码状态任然为待处理。
】bug7510
|
6 years ago |
|
jenkins
|
67a016b261
|
Jenkins自动合并
|
6 years ago |
|
luweihao
|
d750a88aad
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
luweihao
|
1c144eca4d
|
移除mespcn乐观锁
|
6 years ago |
|
jenkins
|
f8fa1cd957
|
Jenkins自动合并
|
6 years ago |
|
qianhs
|
9c754e5816
|
【 发运流程 20300， 20390 没有往 ref_item 字段填写对应的值】【bug7506】
|
6 years ago |
|
jenkins
|
26fd59e5c7
|
Jenkins自动合并
|
6 years ago |
|
puxiao.liao
|
96e0e3756f
|
【 7507 发运单接收接口新增字段
】bug7507
|
6 years ago |
|
jenkins
|
24d834cd6d
|
Jenkins自动合并
|
6 years ago |
|
qianhs
|
e1114d67d2
|
【静态盘点解冻调差时，如果勾选了所有盘点单，现在需要一个单子一个单子点击确认调差，需要在点击时将所有盘点单的调差范围都显示出来，然后一次性调差所有功能】【bug7485】
|
6 years ago |
|
jenkins
|
7c422cad79
|
Jenkins自动合并
|
6 years ago |
|
qianhs
|
591f865bf3
|
【成品打印需要带出客户零件号，先用单据所属的客户发往地+零件号去WMS_CUSTOMER_PART表中找客户零件号，如果找不到再用客户+零件号去找。】【bug7501】
|
6 years ago |
|
jenkins
|
335c725bca
|
Jenkins自动合并
|
6 years ago |
|
qianhs
|
4ccda48061
|
【 PDA所有流程中，扫描后默认提示的组件去除】【bug7409】
|
6 years ago |
|
jenkins
|
af860ff688
|
Jenkins自动合并
|
6 years ago |
 钮海涛
|
03de37cf7c
|
修改导入导出进度明细。
|
6 years ago |
|
钮海涛
|
4583b87bf5
|
添加导入导出进度明细。
|
6 years ago |
|
jenkins
|
8c5020b098
|
Jenkins自动合并
|
6 years ago |
 曾贞一
|
9607c91582
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
44648e4218
|
【1396 亚太-领料任务明细看板】
|
6 years ago |
|
jenkins
|
f45a0d69b0
|
Jenkins自动合并
|
6 years ago |
jokelone
|
af31ba4884
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
54cd3cfc45
|
业务表增加唯一索引
|
6 years ago |
|
钮海涛
|
e1225bbccd
|
添加执行命令组进度明细。
|
6 years ago |
 王杰
|
01e896a752
|
Merge branch 'dev' into test
|
6 years ago |
|
曾贞一
|
60ab897195
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
e14e813230
|
【7476 发运的新老标签对应报表】
|
6 years ago |
|
luweihao
|
d601ef9a32
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
luweihao
|
acc907dd28
|
task `1295` mes添加索引
|
6 years ago |
|
jenkins
|
27b1f5ca21
|
Jenkins自动合并
|
6 years ago |
|
qianhs
|
22eaa30dab
|
【收货时，如果多收了零件号，点击重置后再扫描单号，该零件号明细无法显示在下方提示中。】【bug7423】
|
6 years ago |
|
汪云昊
|
0bd38e8e9a
|
打印模板查询优化
|
6 years ago |
|
王杰
|
cd93680349
|
Merge branch 'dev' into test
|
6 years ago |
|
jokelone
|
799b691aaf
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
5fc59129bd
|
【mes-pojo 继承Serializable】
|
6 years ago |
|
luweihao
|
5f25e311bb
|
mes-pcn pojo添加serializable
|
6 years ago |
|
luweihao
|
6b66c15c72
|
Merge branch 'dev' into test
|
6 years ago |
|
luweihao
|
ab3ad4c2d5
|
task 去除生产数据注解
|
6 years ago |
|
luweihao
|
b27bbb6158
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
3f77135a17
|
枚举
|
6 years ago |
|
jenkins
|
138b2cf7b7
|
Jenkins自动合并
|
6 years ago |
|
jokelone
|
2d807ea47a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jokelone
|
30cb7f7b9d
|
工单类型去除JIT类型
|
6 years ago |
|
jenkins
|
1ae61084c5
|
Jenkins自动合并
|
6 years ago |
|
曾贞一
|
c075875f28
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
415ae5a45b
|
【7457 1.发运时，如果是两步发运，客户标签打印后，在做第二步发运出库时，需要扫描已经绑定的客户标签。】
|
6 years ago |
|
jenkins
|
770d7175aa
|
Jenkins自动合并
|
6 years ago |
|
钮海涛
|
cf203390b8
|
修正时间段编辑类型
|
6 years ago |
|
jenkins
|
6e545a7ec1
|
Jenkins自动合并
|
6 years ago |
袁津哲
|
db6522fba3
|
优化动态搜索与自定义列表代码
|
6 years ago |
|
luweihao
|
2c6a4464c3
|
Merge branch 'dev' into test
|
6 years ago |
|
luweihao
|
667847afe7
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
luweihao
|
d3c817529f
|
task `1408` 生产数据结构化
|
6 years ago |
|
jenkins
|
521973a2f5
|
Jenkins自动合并
|
6 years ago |
zcg
|
db3b06071d
|
【枚举修改】
|
6 years ago |
|
zcg
|
8a04ca4e3d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
zcg
|
bc1825fd35
|
【mes枚举修改，mesModel修改,pcn枚举修改】
|
6 years ago |
|
luweihao
|
503f528e78
|
Merge branch 'dev' into test
|
6 years ago |
|
luweihao
|
a094473333
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
luweihao
|
4ae13f8270
|
task `1408` 生产数据结构化
|
6 years ago |
|
jenkins
|
cf44b8866a
|
Jenkins自动合并
|
6 years ago |
|
钮海涛
|
9e0158e749
|
修改test分支POM配置
|
6 years ago |
|
jenkins
|
c90df4e96a
|
Jenkins自动合并
|
6 years ago |
许心洁
|
28ce8615fd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
51d60a107a
|
SAP指令锁定逻辑修改：
根据单号查询(之前：任务明细;现在：单据明细)获取行号记录到sap_order_lock表；
原因：SAP要的是单据的行号，任务明细可能是单据明细的拆分或者合并所得，行号不一定准；
|
6 years ago |
|
jenkins
|
f927ee21ac
|
Jenkins自动合并
|
6 years ago |
|
王杰
|
bf71cd07d0
|
JIS发运
|
6 years ago |
|
jenkins
|
7e6f83a974
|
Jenkins自动合并
|
6 years ago |
陈思洁
|
babc158ed6
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
陈思洁
|
5feae0dd1a
|
【1405 物流路线在物品分类及仓库级别的应用】
|
6 years ago |
|
陈思洁
|
09339a6e1f
|
【1405 物流路线在物品分类及仓库级别的应用】
|
6 years ago |
|
jenkins
|
a3823f4a16
|
Jenkins自动合并
|
6 years ago |
|
袁津哲
|
2d30f2da0f
|
Wms动态搜索与自定义列表，表单开发
|
6 years ago |
wei.peng
|
b199c5995f
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-ics into test
# Conflicts:
# modules/i3plus-ics-console/src/main/resources/application.properties
# modules/i3plus-ics-gateway/src/main/resources/application.properties
# modules/i3plus-ics-regist/src/main/resources/application.properties
|
6 years ago |
|
jenkins
|
134757c92b
|
Jenkins自动合并
|
6 years ago |
|
wei.peng
|
32d715a29c
|
APS 调用失败bug 修复
动态报表 下拉问题修复
|
6 years ago |
宋军超
|
964afe73cd
|
2020-01-16 16:42 添加自定义列枚举
|
6 years ago |
|
宋军超
|
ed5a3b5acd
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |