2254 Commits (master)

Author SHA1 Message Date
mengjiao 8cd2b82f04 wms冲销bug 6 months ago
zhaoxiaolin 8d7c9c10ee Merge remote-tracking branch 'origin/master' 7 months ago
zhaoxiaolin 4e71868a76 产品主键跟踪 7 months ago
mengjiao 4d06ca0e40 Merge remote-tracking branch 'origin/master' 7 months ago
mengjiao 758f9505f9 wms补打功能的查询物料改为模糊查询 7 months ago
zhaoxiaolin a79b8b7c63 问题修复24 7 months ago
zhaoxiaolin 2006f9145a 问题修复24 7 months ago
zhaoxiaolin 4f6a3514d4 问题修复24 7 months ago
zhaoxiaolin 1eaaf46109 问题修复24 7 months ago
zhaoxiaolin 8a531dd2fd 问题修复24 7 months ago
元气满满(jgy) 972ab962cc 2024-12-11 质量上传照片 7 months ago
zhaoxiaolin ab9dd8eb5d Merge remote-tracking branch 'origin/master' 7 months ago
zhaoxiaolin 6770999e8a 问题修复24 7 months ago
mengjiao 4152a51a9d Merge remote-tracking branch 'origin/master' 7 months ago
mengjiao 9529c14ba7 wms质检修改3 7 months ago
zhaoxiaolin 16fbc0eeff 修复2 7 months ago
zhaoxiaolin cb3a8810ae Merge remote-tracking branch 'origin/master' 7 months ago
zhaoxiaolin d376da1957 问题修复24 7 months ago
mengjiao 1e95415fa8 wms质检修改2 7 months ago
mengjiao 6c53998b20 Merge remote-tracking branch 'origin/master' 7 months ago
mengjiao e1806718ae wms质检修改 7 months ago
Yangwl 024a293bee Merge remote-tracking branch 'origin/master' 7 months ago
Yangwl 190116c425 单耗数据增加工时统计 7 months ago
mengjiao b250e7146f Merge remote-tracking branch 'origin/master' 7 months ago
mengjiao d6a3865f2a wms工序汇总报表 7 months ago
zhaoxiaolin 6ac3800606 问题修复23 7 months ago
zhaoxiaolin a68f69ad9a 问题修复23 7 months ago
zhaoxiaolin ccfbf80a28 问题修复22 7 months ago
mengjiao 54e8525ebc Merge remote-tracking branch 'origin/master' 7 months ago
mengjiao a480e5c566 wms修改补打不插入到库存里面。和补打不需要选择仓库和库区,根据配置的物料附属信息获取仓库和库区 7 months ago
zhaoxiaolin 4b3f067c89 问题修复21 7 months ago
zhaoxiaolin 27be79c807 问题修复20 7 months ago
mengjiao 70142e8e62 wms白胚原材料查询bug 7 months ago
陈恒杰 c0f35d9c33 白坯原材料入库优化 7 months ago
zhaoxiaolin a5db9cd88b Merge remote-tracking branch 'origin/master' 7 months ago
zhaoxiaolin d79301f588 问题修复19 7 months ago
mengjiao fbb0bf5e12 wms成品入库的批次bug--批次字符串上可能会多个空格,导致判断有误--所以去除空格 7 months ago
mengjiao 1c683f8dfd wms标识卡扫描小bug 7 months ago
mengjiao b76b9bddd4 wms冲销bug修改 7 months ago
mengjiao 78c4cba12b wms测试后又提的需求要收货时对应标识卡可以进行修改 7 months ago
mengjiao ed9146112d wms标识卡查询添加字段 7 months ago
mengjiao 0fe5bd2afc wms105过账bug2 7 months ago
mengjiao 84ab36e7c7 wms105过账bug 7 months ago
mengjiao af915c1845 wms新的收货优化2和生产领料bug 7 months ago
mengjiao 2107dd5da5 wms新的收货优化 7 months ago
Yangwl 61d3b1beb3 Merge remote-tracking branch 'origin/master' 7 months ago
Yangwl 86fd98b6db 箱型改单表,生产日报表导出修改。 7 months ago
mengjiao c27f446a8f Merge remote-tracking branch 'origin/master' 7 months ago
mengjiao 1ab20ef427 wms问题1 7 months ago
Yangwl 59b032d6b5 Merge remote-tracking branch 'origin/master' 7 months ago
Yangwl 8bd1b45747 生产日报表导出,查询修改 7 months ago
mengjiao 18d5844879 Merge remote-tracking branch 'origin/master' 7 months ago
mengjiao 72d547a265 wms补打和冲销的问题完善和一些比如过账批次的小问题修改 7 months ago
zhaoxiaolin 98765a6df7 问题修复19 7 months ago
zhaoxiaolin 672b84d4a8 问题修复18 7 months ago
zhaoxiaolin 8b9f201515 问题修复17 7 months ago
zhaoxiaolin 802c4c565e 问题修复17 7 months ago
Yangwl 19ec79005c 报表看板修改,导出数据修改。 7 months ago
zhaoxiaolin 247240ddda 问题修复17 8 months ago
陈恒杰 b294a02e60 Merge remote-tracking branch 'origin/master' 8 months ago
陈恒杰 76b11c8451 白坯原材料入库优化 8 months ago
zhaoxiaolin 6c258b0a54 问题修复16 8 months ago
zhaoxiaolin 1175a6ad5c 问题修复15 8 months ago
mengjiao 67f3cdde9c wms白胚问题部分接口,和出库过账成功后的明细修改 8 months ago
zhaoxiaolin 8d62084045 问题修复14 8 months ago
zhaoxiaolin 97a2b159ec 问题修复15 8 months ago
陈恒杰 cc4d3f5ca1 自动生成采购单号 8 months ago
mengjiao 223d3cf056 wms白坯原材料手持接口2 8 months ago
mengjiao 1cfd4b450d wms白坯原材料手持接口 8 months ago
陈恒杰 6095efa114 Merge remote-tracking branch 'origin/master' 8 months ago
陈恒杰 9cdb893322 白坯原材料采购单修改 8 months ago
mengjiao cf88a94e26 Merge remote-tracking branch 'origin/master' 8 months ago
mengjiao d4f7452e7f wms修改3特殊类型 8 months ago
陈恒杰 e20cb5ed9b Merge remote-tracking branch 'origin/master' 8 months ago
陈恒杰 6bc77433bc 白坯原材料 8 months ago
元气满满(jgy) e31986dd44 2024-11-8 设备-切线调拨、工单切线 - 微信提醒调整 8 months ago
Yangwl e0f6e198ca Merge remote-tracking branch 'origin/master' 8 months ago
Yangwl 3e7339cc3e 单耗修改 8 months ago
zhaoxiaolin 93105ec308 问题修复14 8 months ago
zhaoxiaolin f32aa42ba7 问题修复14 8 months ago
zhaoxiaolin 036e690fad 问题修复14 8 months ago
zhaoxiaolin c88726d580 问题修复13 8 months ago
元气满满(jgy) 0284c08961 2024-11-06 MES+sys API+Device 三个模块 生产工单切线、切线调拨产生新设备点检任务 8 months ago
mengjiao 3535c84db7 Merge remote-tracking branch 'origin/master' 8 months ago
mengjiao 0aa30108d6 wms修改2 8 months ago
zhaoxiaolin 303ecdb66b 问题修复13 8 months ago
Yangwl 70b7e13878 Merge remote-tracking branch 'origin/master' 8 months ago
Yangwl b2539af219 生产日报表看板 8 months ago
zhaoxiaolin 37bef6b180 问题修复12 8 months ago
Yangwl c8006b88c0 Merge remote-tracking branch 'origin/master' 8 months ago
Yangwl 7376533d62 H5报表,4楼看板 8 months ago
元气满满(jgy) 8ef8eb43d1 2024-11-05 Device设备 - 查询点检产线-工单状态应为w1 8 months ago
元气满满(jgy) 979fba0209 2024-11-5 Device设备 - 点检 -只生成当日计划生产的产线 8 months ago
mengjiao 9ced49d488 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	op-modules/op-wms/src/main/java/com/op/wms/controller/BpProcureOrderController.java
8 months ago
mengjiao 3d08918ac0 wms修改重复过账测试bug 8 months ago
zhaoxiaolin 84f2290dcd 修复2 8 months ago
zhaoxiaolin f22f64e54a 修复2 8 months ago
zhaoxiaolin d773d44507 问题修复11 8 months ago
陈恒杰 c5d8552506 Merge remote-tracking branch 'origin/master' 8 months ago
陈恒杰 5cb2adad8f 白坯原材料采购单 8 months ago
mengjiao 497514647d Merge remote-tracking branch 'origin/master' 8 months ago
mengjiao 5c49d63444 wms修改1 8 months ago
zhaoxiaolin 8c81e1d64c 问题修复10 8 months ago
zhaoxiaolin 897a9e83a5 问题修复9 8 months ago
mengjiao 561d15680c wms和打印机做对接 8 months ago
mengjiao fbad45bd59 wms采购到货(SRM)到货登记界面改进,重点加上“整张送货单一键报检”,不用选择和修改数字 加标识卡的打印顺序,如:7张标识卡的话,就是7-1、7-2、7-3这样 8 months ago
Yangwl 2ae296d681 Merge remote-tracking branch 'origin/master' 8 months ago
Yangwl fa04d66dff 白坯业务看板 8 months ago
zhaoxiaolin 040785982e 问题修复8 8 months ago
zhaoxiaolin e4a97da59a 问题修复7 8 months ago
陈恒杰 6c629a4d84 Merge remote-tracking branch 'origin/master' 8 months ago
陈恒杰 17a2ec19f3 白坯原材料入库 8 months ago
mengjiao f07749eafb Merge remote-tracking branch 'origin/master' 8 months ago
mengjiao d89016e4fe wms白胚部分修改 8 months ago
Yangwl a52a4eab62 白坯需求实体 8 months ago
Yangwl 4893ed8ac8 Merge remote-tracking branch 'origin/master' 8 months ago
Yangwl df21d00b98 SAP白坯需求数量接口 8 months ago
陈恒杰 89c8973cac Merge remote-tracking branch 'origin/master' 8 months ago
陈恒杰 0b22b0542c 白坯原材料入库 8 months ago
zhaoxiaolin 21818265fc 问题修复6 8 months ago
mengjiao 761e5b97aa Merge remote-tracking branch 'origin/master' 8 months ago
mengjiao f1d3595e79 wms页面修改 8 months ago
zhaoxiaolin 6504f975a4 问题修复5 8 months ago
Yangwl 04aff0d8f9 报表推送修改 8 months ago
zhaoxiaolin 235955dce2 问题修复4 8 months ago
zhaoxiaolin b0c5d5e8c6 问题修复4 8 months ago
zhaoxiaolin 71c2c09b2f 问题修复3 8 months ago
zhaoxiaolin a4b0ec81da 问题修复2 8 months ago
zhaoxiaolin 92f7cf7741 问题修复 8 months ago
zhaoxiaolin 09b3795c50 问题修复 8 months ago
zhaoxiaolin bed8f9a353 问题修复 8 months ago
mengjiao 991307491a Merge remote-tracking branch 'origin/master' 8 months ago
mengjiao ccf6e9303b wms部分修改3 8 months ago
陈恒杰 6495ff8292 来料检验物料号模糊查询 8 months ago
zhaoxiaolin 5fad84018d 问题修复 8 months ago
zhaoxiaolin 7c8e7dc38e Merge remote-tracking branch 'origin/master' 8 months ago
zhaoxiaolin 954170a6cb 问题修复 8 months ago
mengjiao f0f7b81534 wms部分修改2.1 8 months ago
mengjiao 818d395e3d wms部分修改2 8 months ago
mengjiao 1872a8d7ba Merge remote-tracking branch 'origin/master' 8 months ago
mengjiao 707130bbae wms部分修改 8 months ago
zhaoxiaolin b3efa8d1bf 问题修复 8 months ago
zhaoxiaolin 7a80d9dc30 问题修复 8 months ago
元气满满(jgy) 85bec1c62d 2024-10-18 设备-运行记录-导出 8 months ago
mengjiao 76983c9df4 Merge remote-tracking branch 'origin/master' 8 months ago
mengjiao 9763eb4408 wms过账加过账批次 8 months ago
zhaoxiaolin 335226b2dc 问题修复 8 months ago
zhaoxiaolin 36e7c1427e 问题修复 8 months ago
mengjiao 8fa1a90af5 wmsSap收货过账字段生产时间的修改 8 months ago
mengjiao ded3c3ec2c wms批次的截取规则修改 8 months ago
mengjiao bee7cff0c2 wms成品出库查询的修改 8 months ago
mengjiao a4f83dd248 wms定时任务2 8 months ago
mengjiao a482c1b621 Merge remote-tracking branch 'origin/master' 8 months ago
mengjiao c924f6c467 wms定时任务 8 months ago
zhaoxiaolin e33b29e349 oa 8 months ago
zhaoxiaolin 393983493a oa 8 months ago
zhaoxiaolin 9f5836d239 oa 8 months ago
zhaoxiaolin d3b0dcf26b 线体产品 8 months ago
zhaoxiaolin 4e661cabe8 cpk分析报表 8 months ago
zhaoxiaolin dfc7627430 受控文件功能开发升级 8 months ago
zhaoxiaolin 1320887022 受控文件功能开发 9 months ago
mengjiao f09dcd1aa1 wms生产领料手持确认接口修改 9 months ago
mengjiao 98ce3d3b7d wms入库批次修改批次2 9 months ago
mengjiao 028e2a0583 wms入库批次修改批次 9 months ago
mengjiao 3f4d016372 wms包材库存页面添加上送货单和采购单--有利于反查,同时加上补打按钮 9 months ago
mengjiao eda3150b06 Merge remote-tracking branch 'origin/master' 9 months ago
mengjiao eaf3066869 wms供应商字段的查询 9 months ago
zhaoxiaolin 9160f1c223 定量检测项明细报表 9 months ago
mengjiao e7e9d57758 wms包材出库明细页面接口 9 months ago
mengjiao 2d7d562cdd wms成品过账修改3和加送货单字插入 9 months ago
mengjiao f0ac9a24ec Merge remote-tracking branch 'origin/master' 9 months ago
mengjiao c5212b74d3 wms成品过账修改2 9 months ago
mengjiao cc8ccba803 wms成品过账修改1 9 months ago
zhaoxiaolin d49b3b9bdd 质量问题修改 9 months ago
元气满满(jgy) c3cc940ebc 2024-10-09 设备-工单导出 9 months ago
元气满满(jgy) d76e261b1c 2024-10-09 设备-安环-点检、巡检、保养三个报表 9 months ago
zhaoxiaolin a7b2989873 质量问题修改 9 months ago
mengjiao 126c1ec1f3 Merge remote-tracking branch 'origin/master' 9 months ago
mengjiao 3e6678a95e wms过账修改 9 months ago
元气满满(jgy) 499ef4d5bd 2024-10-08 设备-点检巡检保养报表 加合格率 9 months ago
mengjiao cfab9c2d69 wms查询页面修改 9 months ago
mengjiao 848bc9082c wms打印标识卡bug 9 months ago
mengjiao 6ace161a53 wms105过账bug 9 months ago
mengjiao 430dec322b wms之前的库存临时打印标识卡页面修改加测试问题 9 months ago
mengjiao 6c52e7de3f wms补打问题 9 months ago
mengjiao b4986a84ff wms问题修改 9 months ago
mengjiao 0e7cf9b438 wms包材退货过账接口修改 9 months ago
mengjiao d9fdb56d9d wms包材退货接口5 9 months ago
mengjiao 54450f5f22 Merge remote-tracking branch 'origin/master' 9 months ago
mengjiao b4aad429d2 wms包材退货接口4修改 9 months ago
zhaoxiaolin 64b203c956 三层报工修改 9 months ago
mengjiao 66682323f9 wms包材退货接口3 9 months ago
mengjiao a8648e0543 wms包材退货和打印接口2 9 months ago
mengjiao b40e61930a Merge remote-tracking branch 'origin/master' 9 months ago
mengjiao 37df2b577d wms包材退货和打印接口 9 months ago
zhaoxiaolin 6aeb8d76cb 工艺默认同步1000工厂 9 months ago
mengjiao 43d99edb29 Merge remote-tracking branch 'origin/master' 9 months ago
mengjiao 0cf33db060 wms包材接口修改 9 months ago
元气满满(jgy) bc28d92c76 Merge remote-tracking branch 'origin/master' 9 months ago
元气满满(jgy) b501b7059d 2024-09-20 设备-两个改动 手持接口+快读工单重复 9 months ago
mengjiao e1aa0eef08 生产领料-查询接口修改 9 months ago
mengjiao 48c6ee4db1 过账接口修改1 9 months ago
mengjiao 3f3ec65d11 sap接口修改 9 months ago
mengjiao 223dcf589d Merge remote-tracking branch 'origin/master' 9 months ago
mengjiao c5a8c3d29c wms修改2 9 months ago
陈恒杰 76378ec84e Merge remote-tracking branch 'origin/master' 9 months ago
陈恒杰 7fe2550fef 附属属性修改 9 months ago
mengjiao 3c1efdc3ce 补打修改 9 months ago
mengjiao eae3aba059 wms修改 9 months ago
陈恒杰 1fba7c8452 Merge remote-tracking branch 'origin/master' 10 months ago
陈恒杰 cea2fc0784 页面优化 10 months ago
Yangwl f9d882fdff Merge remote-tracking branch 'origin/master' 10 months ago
Yangwl d944723919 企业微信推送修改 10 months ago
mengjiao 133c270d17 过账修改 10 months ago
mengjiao 85652ede50 查询修改 10 months ago
mengjiao 65a70b9a7a Merge remote-tracking branch 'origin/master' 10 months ago
mengjiao c6cc87fb8a 包材出库过账修改 10 months ago
zhaoxiaolin 040ffed149 质量cpk配置 10 months ago
mengjiao 3460f4ec24 包材出库修改3 10 months ago
mengjiao 410aecd5ac 包材出库修改2 10 months ago
mengjiao a7b34640bf Merge remote-tracking branch 'origin/master' 10 months ago
mengjiao b23047f1e6 包材出库修改 10 months ago
陈恒杰 e8cb726894 页面优化 10 months ago
zhaoxiaolin dd8b2d9d8c 质量cpk 10 months ago
zhaoxiaolin a3bff82c1c Merge remote-tracking branch 'origin/master' 10 months ago
zhaoxiaolin 7a9d2dd4ae 数据源 10 months ago
mengjiao 4e519ae69d bug修复 10 months ago
mengjiao ca4ef2c6a8 包材出库提交 10 months ago
zhaoxiaolin f18ec9c8e2 质量手持bug修复7 10 months ago
zhaoxiaolin 186955f16f 质量手持bug修复6 10 months ago
zhaoxiaolin 8b50870a38 质量手持bug修复5 10 months ago
zhaoxiaolin da1910fc60 质量手持bug修复4 10 months ago
zhaoxiaolin 6dad3b4ce5 质量手持bug修复3 10 months ago
zhaoxiaolin b28459cd76 质量手持bug修复2 10 months ago
zhaoxiaolin 24d8b7c6a1 Merge remote-tracking branch 'origin/master' 10 months ago
zhaoxiaolin abc649aef4 质量手持bug修复 10 months ago
陈恒杰 9340ef8a3d 包材采购单页面修改 10 months ago
陈恒杰 8013613b20 Merge remote-tracking branch 'origin/master' 10 months ago
陈恒杰 5514b5d951 包材采购单页面修改 10 months ago
mengjiao ac827d2d67 Merge remote-tracking branch 'origin/master' 10 months ago
mengjiao 393e90e69e 批次号生成问题 10 months ago
zhaoxiaolin ede02cca4e Merge remote-tracking branch 'origin/master' 10 months ago
zhaoxiaolin 4a477c9259 标识卡加重置 10 months ago
mengjiao 6bce1430e6 成品过账和查询修改2 10 months ago
zhaoxiaolin a497b975e7 Merge remote-tracking branch 'origin/master' 10 months ago
zhaoxiaolin 7ea5e138ef 质量细节优化 10 months ago
mengjiao 4dc9b4cb80 成品过账修改 10 months ago
mengjiao 615676adab 成品模糊查询2 10 months ago
mengjiao 2ee57da594 成品模糊查询 10 months ago
mengjiao 79d0a701e6 成品过账修复bug2 10 months ago