Commit Graph

1450 Commits (0850df73696a05a1eb8ef64d614cac899c251738)

Author SHA1 Message Date
jun a3d92f9372 点检单id信息不存在报错 6 months ago
jun 7aab622f76 目视单打印空指针 6 months ago
臧学普 34f8cb319f Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 6 months ago
臧学普 18fee22d4f 打印目视单-装配件有相同展示序号的零件需要合并 6 months ago
jun c201703e5c 点检单页面查询问题修复 6 months ago
jun f079ee5f03 生产过程控制查询工单增加时间查询条件 6 months ago
jun 50c46a27e4 43770 装箱防错需要增加工艺防错 6 months ago
jun d7587a5bb6 生产过程控制,查询工单增加班次范围查询条件 6 months ago
臧学普 a3c5a034fe Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 6 months ago
臧学普 82afd7d558 打印目视单重复-增加redis锁,防止一个产线和零件生产组发送同时有多个请求,获取到相同的数据进行打印 6 months ago
jun 996af9cf85 设备点检功能变更开发 6 months ago
jun ac90d30220 设备点检最新方案调整 6 months ago
臧学普 d2e0a8649e 打印目视单-PTR转P 6 months ago
王杰 febca18a14 离线表 6 months ago
王杰 402de6f23b 离线 6 months ago
jun 649d66e90f Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 6 months ago
jun ce72090531 排序汇报逻辑调整 6 months ago
jun 0852177791 发运问题修复 6 months ago
臧学普 5df4a7dc80 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 6 months ago
臧学普 25358f36df 打印目视单-description 6 months ago
jun c0c2b0f92b mes_jis_shipping表增加发运组字段 6 months ago
王杰 624fcce42b 可复用条码 bug 6 months ago
jun b1941ee5ac Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 6 months ago
jun 51567a7b7f 广州发运慢问题修复 6 months ago
王杰 490ca9a003 排序装配件 逻辑调整 6 months ago
jun 824ffb83b4 排序发运校验扫描确认零件方式是否维护 6 months ago
jun 8305c1b75a SPS拉动单顺序,增加客户单号 6 months ago
臧学普 f1b2f1ce53 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 6 months ago
臧学普 a529a5fb77 打印目视单-description 6 months ago
王杰 1c3e2656d8 排序 跳过 6 months ago
臧学普 90438bf32a Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 6 months ago
王杰 bb78d98afc 注释代码 6 months ago
臧学普 9d14b66fcb 装配目视单打印时间 6 months ago
jun c31a240bbc SPS单据打印优化,增加每次查询条数 6 months ago
王杰 872f8e9413 去除离线生产配置 6 months ago
jun c3d079fa83 Merge branch 'dev' into dev-wuhan-temp
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java
6 months ago
jun 21b501f5fd 合并冲突 6 months ago
jun a25c3993c5 SPS单据打印车型名称 6 months ago
xiangwei.zhang 3509bc88d2 MesJisShipping carNo 赋值问题 6 months ago
王杰 f95fbb750d 装配件前道防错 bug 6 months ago
xiangwei.zhang 63bf825875 点检校验设备id 6 months ago
jun 4051f5889f 生产控制选择工单时,查询零件条件无效 6 months ago
jun d8335872e4 非排序CBR汇报,bom_size值错误 6 months ago
jun 93dd002b40 JIS拉动报空指针异常 6 months ago
jun 4d80911aef 电子化检验问题修复 6 months ago
jun f297e1c4c5 客户条码打印问题修复 6 months ago
jun 4aed6c4887 SPS拉动单据打印优化 6 months ago
xiangwei.zhang 77c351c23d BTO工单报工,工作中心用生产版本的工作中心 6 months ago
xiangwei.zhang 1d1911a8ad 首检,打印条码也能首检 6 months ago
jun a2dc24de4c 发运增加扫描日志信息 6 months ago
jun 5d48b239ff Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 6 months ago
jun 07e0329195 打印模板问题修复 6 months ago
王杰 1041100674 自进自出 生成重复条码 问题修改 6 months ago
xiangwei.zhang a7e53047ab 工单报工问题 6 months ago
jun a0e5401b33 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 6 months ago
jun a92e9ab627 打印模板事务问题修复 6 months ago
王杰 bf013da537 防错 非排序 逻辑调整 6 months ago
王杰 4305ea53ab Merge branch 'dev-wuhan-temp' of http://git.estsh.com/I3-YF/i3plus-mes-pcn-yfai into dev-wuhan-temp 6 months ago
jun 6855811584 排序发运扫描提示信息 6 months ago
jun 2d58f43022 发运扫描提示信息 6 months ago
王杰 a237d0672e 可复用 逻辑重写 6 months ago
jun 5e3ada454c Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 6 months ago
jun 4a6eba09aa 43605 装箱防错:扫描已经发运的条码,未报错 6 months ago
王杰 42e0c41afd 装配件 6 months ago
王杰 79ed2e8c90 裁片 6 months ago
jun dccae499f3 43661 排序发运扫描条码时,同序号的零件也需要校验扫描顺序 6 months ago
xiangwei.zhang f3cc04669f Merge branch 'dev' into dev-wuhan-temp
# Conflicts:
#	modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java
6 months ago
臧学普 a319b05ce9 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 6 months ago
王杰 cfd48f4b3e 包装定义 字段错误 6 months ago
王杰 1e146c8596 裁片工单工步 修改 6 months ago
臧学普 a0e27add57 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 6 months ago
王杰 dae94f2c07 装配件二次确认 排序线 6 months ago
jun 72b58c2130 43624 返工作业:打印新条码后,单据无法点击返工完成。 6 months ago
jun 0e2fb59a96 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 6 months ago
jun 0742266b50 排序发运校验客户零件号 6 months ago
王杰 15f8d56864 离线同步JOB 6 months ago
jun 880efd60cd 报表问题修复 6 months ago
xiangwei.zhang 4a40b51e9a 设备停机合并 6 months ago
xiangwei.zhang d924f8a73d 关闭的单据也需要报工 6 months ago
臧学普 3d77e70d79 离线检查是否拉数据 6 months ago
jun e562fd8a48 PCN开关班次问题处理 7 months ago
jun 3b3e8014b5 武汉汇报job&装配目视单打印问题修复 7 months ago
jun 36560566f1 43590 开关班管理:接班时--90002 系统异常:对象为空 7 months ago
臧学普 f682deee4d Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 7 months ago
臧学普 e689db4edb 重构sps代码 7 months ago
王杰 e4776fe0df 扫描产成零件编码 工步 7 months ago
jun c0ed1c8ce8 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 7 months ago
jun 7ebec5bbe2 裁片原材料防错-扫描条码提示信息修改 7 months ago
王杰 b5459b68f8 扫描产成零件工步 7 months ago
jun 61c351f458 芜湖发运增加唯一性校验 7 months ago
jun 393461a03e Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 7 months ago
jun 1d12047d10 通用导出报表开发 7 months ago
xiangwei.zhang 26bc0bcab8 设备停机修改 7 months ago
王杰 d61b2aa000 Merge branch 'dev' into dev-wuhan-temp 7 months ago
王杰 d693da28c8 扫描产成零件工步 7 months ago
jun b5ccdf6521 芜湖客户条码打印 7 months ago
jun 70e8529c4f CBR负报工逻辑调整 7 months ago
jun bd3ee9e8f7 Merge remote-tracking branch 'origin/dev-wuhan-temp' into dev-wuhan-temp 7 months ago
jun 7d1cc9b556 SPS拉动单打印 7 months ago
臧学普 540612bf09 重构sps代码 7 months ago