From d43b0ba9eb98f265dccf280a7930fa2ab9d7dc27 Mon Sep 17 00:00:00 2001 From: baoge <751575283@qq.com> Date: Thu, 20 Jul 2023 16:10:16 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E4=BF=AE=E6=94=B9bom=E5=8D=95=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E8=A1=A8=E5=A2=9E=E5=8A=A0aps=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BomServiceImpl.java | 6 +++--- .../wms/product_manage/备份pdm/wql/pdm.xls | Bin 223232 -> 222208 bytes 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/impl/BomServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/impl/BomServiceImpl.java index edea866a..b0a58e0b 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/impl/BomServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/service/impl/BomServiceImpl.java @@ -258,7 +258,7 @@ public class BomServiceImpl implements BomService { //Bom主表 WQLObject wo_pdm_bi_bom = WQLObject.getWQLObject("pdm_bi_bom"); //Bom明细表 - WQLObject wo_pdm_bomdtl_aps = WQLObject.getWQLObject("pdm_bi_bomdtl_aps"); + WQLObject pdm_bi_bomdtl = WQLObject.getWQLObject("pdm_bi_bomdtl"); //物料表 WQLObject wo_material = WQLObject.getWQLObject("md_me_materialbase"); //原材料对应半成品 @@ -429,7 +429,7 @@ public class BomServiceImpl implements BomService { bomDtlParam.put("manufacture", ""); } //插入原材料明细 - wo_pdm_bomdtl_aps.insert(bomDtlParam); + pdm_bi_bomdtl.insert(bomDtlParam); } } if(j == 13) { @@ -460,7 +460,7 @@ public class BomServiceImpl implements BomService { bomDtlParam.put("instruction_type", "U"); bomDtlParam.put("instruction_code", "M"); //插入明细表 - wo_pdm_bomdtl_aps.insert(bomDtlParam); + pdm_bi_bomdtl.insert(bomDtlParam); } } } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/wql/pdm.xls b/mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/备份pdm/wql/pdm.xls index 66f68e16d2ca5e6331895c0fc824aa05cbe4ba28..ab37737b5ebda35fc0fb7e59640b39d9d2001b10 100644 GIT binary patch delta 5518 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 l@pty*{%v9TF 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