Commit Graph

282 Commits (master)

Author SHA1 Message Date
jun 99c87bd8bc Merge remote-tracking branch 'origin/dev' into dev 5 months ago
jun c5987d3bd8 武汉cockpit发运防错按照散件方式写入 5 months ago
xiangwei.zhang acab8131a0 对账单信息 5 months ago
jun a244b350f2 产品加工记录增加工单状态查询 6 months ago
jun 2d98ac7c86 Merge remote-tracking branch 'origin/dev' into dev 6 months ago
jun d2c977b5de 点检功能点优化 6 months ago
王杰 0f8dcbfc75 Merge branch 'dev' into dev-wuhan 6 months ago
臧学普 0250db7d47 零件发运组--客户工厂与信息点联动 6 months ago
王杰 188284ab69 增加http接口 pcn调用 用于将数据自动初始化到工位按钮表 6 months ago
臧学普 68908190ed 生产零件号是用来查找生产版本与bom 存在于零件生产组中 6 months ago
jun cfb57c094d 工单同步wms功能开发 6 months ago
jun 8bb57ecb56 SPS拉动单生成优化 6 months ago
臧学普 419fc65025 工单号顺序号调整 6 months ago
臧学普 fc9e36abcf 离线job生成装配件及拉动单模板 6 months ago
jun 9367768764 43663 试制工单不自动关单(芜湖) 6 months ago
jun 6ca8142abb 43661 排序发运扫描条码时,同序号的零件也需要校验扫描顺序 6 months ago
jun d59c8cd91e Merge remote-tracking branch 'origin/dev' into dev-wuhan
# Conflicts:
#	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesBtoJobServiceImpl.java
6 months ago
jun 0da05f6daf BOM反向查询报表,通用发运报表开发 6 months ago
jun 94f70a14ec 43590 开关班管理:接班时--90002 系统异常:对象为空 6 months ago
xiangwei.zhang de3cc8bac3 BTO单生成bug修复 6 months ago
jun 03288a28c8 排序手工插单逻辑修改 6 months ago
臧学普 02ce42cec9 创建工单及线末大屏修改 6 months ago
jun a4a0ac889e 通用导出报表开发 6 months ago
jun 97d7e4e65d SPS拉动单打印 7 months ago
jun bc6b3dc5ad 天桥数报表开发 7 months ago
臧学普 c7145fa51b 线末大屏 7 months ago
臧学普 6a1779c6f0 线末大屏 7 months ago
jun c40e5c75ee CBR报工逻辑调整 7 months ago
jun effbe4561a 问题修复: 加工规则零件号不能模糊搜索 7 months ago
王杰 18efcb1c04 Merge branch 'dev' into dev-wuhan 7 months ago
xiangwei.zhang d96f360a0f 设备停机 7 months ago
gsz 7b56ed23f3 拉动单补打并且插入PrintedSnLog表 7 months ago
jun 94a22fa575 Merge branch 'dev' into dev-wuhan
# Conflicts:
#	modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesWorkOrderService.java
7 months ago
xiangwei.zhang 6f23a3fbe0 设备点检明细导入 7 months ago
jun 4cf06dea83 通用V107Melos数据监控查询 7 months ago
jun 52ac7e42fd getById方法增加organizeCode条件 7 months ago
xiangwei.zhang b8c938102d bom递归和报工调整修改 7 months ago
gsz 731cdeeac1 发运零件子零件明细+发运单子零件明细 7 months ago
pzj 4437d06c96 装配件查询、发运明细报表、可疑品条码信息、检验产品数据子报表 7 months ago
yxw 9878633805 1、MesProductionPartContext 增加cutQty(裁片工单数量)
2、裁片工单绑定问题修复
7 months ago
王杰 a80e653f08 Merge branch 'dev' into dev-wuhan 7 months ago
yxw 6768e2802d 装配目视单预览 8 months ago
pzj e130754448 包装组零件规则基础数据主、明细 8 months ago
yxw 7c82801377 装配目视单打印 8 months ago
pzj 45395bd4d6 辊道设备配置基础数据 8 months ago
jun 6162899689 CBR报工逻辑调整 8 months ago
yxw 29dd614d4b 新增打印工单打印队列 8 months ago
pzj 1ee988c030 站点信息基础数据 8 months ago
pzj 5641d27974 裁片基础数据 裁片长度修改类型、裁片配置、裁片原材料配置、裁片成品配置、裁片设备配置、裁片设备配置明细、裁片设备配置设备加工参数 8 months ago
pzj 182186077c 等离子基础数据 可回用包装类型、可回用包装、可回用包装零件 8 months ago