From 06ba782f1526cd37a23a7cb1407ba7c69bf7152b Mon Sep 17 00:00:00 2001 From: lihao Date: Tue, 2 Dec 2025 13:56:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=94=9F=E4=BA=A7=E6=8A=A5?= =?UTF-8?q?=E5=91=8A=E4=BF=9D=E5=AD=98=E6=97=B6=E5=80=99=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E5=9B=9E=E5=86=99=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mmpac/pmo/wr/PublicPMOService4WrImpl.java | 152 +++++++++--------- 1 file changed, 76 insertions(+), 76 deletions(-) diff --git a/mmpac/src/private/nc/pubimpl/mmpac/pmo/wr/PublicPMOService4WrImpl.java b/mmpac/src/private/nc/pubimpl/mmpac/pmo/wr/PublicPMOService4WrImpl.java index 1ca31310..80dbccf2 100644 --- a/mmpac/src/private/nc/pubimpl/mmpac/pmo/wr/PublicPMOService4WrImpl.java +++ b/mmpac/src/private/nc/pubimpl/mmpac/pmo/wr/PublicPMOService4WrImpl.java @@ -243,43 +243,43 @@ public class PublicPMOService4WrImpl implements IPublicPMOService4Wr { PMOHeadVO head = (PMOHeadVO)headMap.get(item.getCpmohid()); UFBoolean autoFlag = (UFBoolean)autodonepara.get(head.getCtrantypeid()); if (autoFlag.booleanValue()) { - BaseDAO dao = new BaseDAO(); - // 查询备料计划 如果下游备料计划未出库数量（计划出库-累计出库）小于0，生产订单自动完工取消 naccoutnum 累计出库数量 nplanoutnum计划出库 - String pickmsql = "select cbmaterialvid,vrowno,nplanoutnum,naccoutnum from mm_pickm_b where cpickmid in ( select cpickmid from mm_pickm where csourcebillrowid='" + item.getCmoid() + "' and dr=0) and dr = 0"; - List> hmateral = (List>) dao.executeQuery(pickmsql, new MapListProcessor()); - List vrownos = new ArrayList(); - List> maps = new ArrayList(); - - Boolean l=false; - for (Map map : hmateral) { - String material =MaterialVO.CODE+","+MaterialVO.NAME+","+MaterialVO.OUTTOLERANCE; - // 物料出库容差 % 0.0000 - Map goodsMap = MyHelper.transferFields(MaterialVO.getDefaultTableName(), material, MaterialVO.PK_MATERIAL, item.getCmaterialvid()); - String Outtolerance= null !=goodsMap.get("outtolerance") ? goodsMap.get("outtolerance").toString() : "0"; - if(null != map.get("nplanoutnum") && null != map.get("naccoutnum") && (new UFDouble(String.valueOf(map.get("nplanoutnum").toString())).sub(new UFDouble(String.valueOf(map.get("naccoutnum").toString()))).abs()).compareTo(new UFDouble(String.valueOf(map.get("nplanoutnum").toString())).multiply(new UFDouble(String.valueOf(Outtolerance.toString())))) > 0) { - l=true; - Map map1 =new HashMap<>(); - map1.put("vrowno",map.get("vrowno").toString()); - map1.put("mrlname",goodsMap.get("name").toString()); - map1.put("mrlcode",goodsMap.get("code").toString()); - maps.add(map1); - } - } - if(l){ - // String pickm = " select vbillcode,cpickmid from mm_pickm where csourcebillrowid='" + item.getCmoid() + "' and dr=0"; - // List> pickms = (List>) dao.executeQuery(pickm, new MapListProcessor()); - String err=""; - for (Map vrowno : maps) { - String pmobillcode= head.getVbillcode(); - String pmovrowno= item.getVrowno(); - // String pickmbillcode= pickms.get(0).get("vbillcode").toString(); - String pickmvrowno= vrowno.get("vrowno").toString(); - String mrlname= vrowno.get("mrlname").toString(); - String mrlcode= vrowno.get("mrlcode").toString(); - err=err+"生产订单"+pmobillcode+"行"+pmovrowno+"的备料计划行"+pickmvrowno+"物料【"+mrlcode+","+mrlname+"】检查不通过\n"; - } - throw new BusinessException(err); - } + // BaseDAO dao = new BaseDAO(); + // // 查询备料计划 如果下游备料计划未出库数量（计划出库-累计出库）小于0，生产订单自动完工取消 naccoutnum 累计出库数量 nplanoutnum计划出库 + // String pickmsql = "select cbmaterialvid,vrowno,nplanoutnum,naccoutnum from mm_pickm_b where cpickmid in ( select cpickmid from mm_pickm where csourcebillrowid='" + item.getCmoid() + "' and dr=0) and dr = 0"; + // List> hmateral = (List>) dao.executeQuery(pickmsql, new MapListProcessor()); + // List vrownos = new ArrayList(); + // List> maps = new ArrayList(); + // + // Boolean l=false; + // for (Map map : hmateral) { + // String material =MaterialVO.CODE+","+MaterialVO.NAME+","+MaterialVO.OUTTOLERANCE; + // // 物料出库容差 % 0.0000 + // Map goodsMap = MyHelper.transferFields(MaterialVO.getDefaultTableName(), material, MaterialVO.PK_MATERIAL, item.getCmaterialvid()); + // String Outtolerance= null !=goodsMap.get("outtolerance") ? goodsMap.get("outtolerance").toString() : "0"; + // if(null != map.get("nplanoutnum") && null != map.get("naccoutnum") && (new UFDouble(String.valueOf(map.get("nplanoutnum").toString())).sub(new UFDouble(String.valueOf(map.get("naccoutnum").toString()))).abs()).compareTo(new UFDouble(String.valueOf(map.get("nplanoutnum").toString())).multiply(new UFDouble(String.valueOf(Outtolerance.toString())))) > 0) { + // l=true; + // Map map1 =new HashMap<>(); + // map1.put("vrowno",map.get("vrowno").toString()); + // map1.put("mrlname",goodsMap.get("name").toString()); + // map1.put("mrlcode",goodsMap.get("code").toString()); + // maps.add(map1); + // } + // } + // if(l){ + // // String pickm = " select vbillcode,cpickmid from mm_pickm where csourcebillrowid='" + item.getCmoid() + "' and dr=0"; + // // List> pickms = (List>) dao.executeQuery(pickm, new MapListProcessor()); + // String err=""; + // for (Map vrowno : maps) { + // String pmobillcode= head.getVbillcode(); + // String pmovrowno= item.getVrowno(); + // // String pickmbillcode= pickms.get(0).get("vbillcode").toString(); + // String pickmvrowno= vrowno.get("vrowno").toString(); + // String mrlname= vrowno.get("mrlname").toString(); + // String mrlcode= vrowno.get("mrlcode").toString(); + // err=err+"生产订单"+pmobillcode+"行"+pmovrowno+"的备料计划行"+pickmvrowno+"物料【"+mrlcode+","+mrlname+"】检查不通过\n"; + // } + // throw new BusinessException(err); + // } item.setFitemstatus(Integer.valueOf(PMOFItemStatusEnum.FINISH.getEnumValue().getValue())); item.setTactendtime(new UFDateTime(AppBsContext.getInstance().getBusiDate().toPersisted())); item.setStatus(1); @@ -306,45 +306,45 @@ public class PublicPMOService4WrImpl implements IPublicPMOService4Wr { PMOHeadVO head = (PMOHeadVO)headMap.get(item.getCpmohid()); UFBoolean autoFlag = (UFBoolean)autodonepara.get(head.getCtrantypeid()); if (autoFlag.booleanValue()) { - BaseDAO dao = new BaseDAO(); - // 查询备料计划 如果下游备料计划未出库数量（计划出库-累计出库）小于0，生产订单自动完工取消 naccoutnum 累计出库数量 nplanoutnum计划出库 - String pickmsql = "select cbmaterialvid,vrowno,nplanoutnum,naccoutnum from mm_pickm_b where cpickmid in ( select cpickmid from mm_pickm where csourcebillrowid='" + item.getCmoid() + "' and dr=0) and dr = 0"; - List> hmateral = (List>) dao.executeQuery(pickmsql, new MapListProcessor()); - List vrownos = new ArrayList(); - List> maps = new ArrayList(); - - Boolean l=false; - for (Map map : hmateral) { - String material =MaterialVO.CODE+","+MaterialVO.NAME+","+MaterialVO.OUTTOLERANCE; - // 物料出库容差 % 0.0000 - Map goodsMap = MyHelper.transferFields(MaterialVO.getDefaultTableName(), material, MaterialVO.PK_MATERIAL, item.getCmaterialvid()); - String Outtolerance= null !=goodsMap.get("outtolerance") ? goodsMap.get("outtolerance").toString() : "0"; - if(null != map.get("nplanoutnum") && null != map.get("naccoutnum") && (new UFDouble(map.get("nplanoutnum").toString()).sub(new UFDouble(String.valueOf(map.get("naccoutnum").toString()))).abs()).compareTo(new UFDouble(String.valueOf(map.get("nplanoutnum").toString())).multiply(new UFDouble(String.valueOf(Outtolerance.toString())))) > 0) { - UFDouble num1 = new UFDouble(map.get("nplanoutnum").toString()).sub(new UFDouble(String.valueOf(map.get("naccoutnum").toString()))).abs(); - - l=true; - Map map1 =new HashMap<>(); - map1.put("vrowno",map.get("vrowno").toString()); - map1.put("mrlname",goodsMap.get("name").toString()); - map1.put("mrlcode",goodsMap.get("code").toString()); - maps.add(map1); - } - } - if(l){ - // String pickm = " select vbillcode,cpickmid from mm_pickm where csourcebillrowid='" + item.getCmoid() + "' and dr=0"; - // List> pickms = (List>) dao.executeQuery(pickm, new MapListProcessor()); - String err=""; - for (Map vrowno : maps) { - String pmobillcode= head.getVbillcode(); - String pmovrowno= item.getVrowno(); - // String pickmbillcode= pickms.get(0).get("vbillcode").toString(); - String pickmvrowno= vrowno.get("vrowno").toString(); - String mrlname= vrowno.get("mrlname").toString(); - String mrlcode= vrowno.get("mrlcode").toString(); - err=err+"生产订单"+pmobillcode+"行"+pmovrowno+"的备料计划行"+pickmvrowno+"物料【"+mrlcode+","+mrlname+"】检查不通过\n"; - } - throw new BusinessException(err); - } + // BaseDAO dao = new BaseDAO(); + // // 查询备料计划 如果下游备料计划未出库数量（计划出库-累计出库）小于0，生产订单自动完工取消 naccoutnum 累计出库数量 nplanoutnum计划出库 + // String pickmsql = "select cbmaterialvid,vrowno,nplanoutnum,naccoutnum from mm_pickm_b where cpickmid in ( select cpickmid from mm_pickm where csourcebillrowid='" + item.getCmoid() + "' and dr=0) and dr = 0"; + // List> hmateral = (List>) dao.executeQuery(pickmsql, new MapListProcessor()); + // List vrownos = new ArrayList(); + // List> maps = new ArrayList(); + // + // Boolean l=false; + // for (Map map : hmateral) { + // String material =MaterialVO.CODE+","+MaterialVO.NAME+","+MaterialVO.OUTTOLERANCE; + // // 物料出库容差 % 0.0000 + // Map goodsMap = MyHelper.transferFields(MaterialVO.getDefaultTableName(), material, MaterialVO.PK_MATERIAL, item.getCmaterialvid()); + // String Outtolerance= null !=goodsMap.get("outtolerance") ? goodsMap.get("outtolerance").toString() : "0"; + // if(null != map.get("nplanoutnum") && null != map.get("naccoutnum") && (new UFDouble(map.get("nplanoutnum").toString()).sub(new UFDouble(String.valueOf(map.get("naccoutnum").toString()))).abs()).compareTo(new UFDouble(String.valueOf(map.get("nplanoutnum").toString())).multiply(new UFDouble(String.valueOf(Outtolerance.toString())))) > 0) { + // UFDouble num1 = new UFDouble(map.get("nplanoutnum").toString()).sub(new UFDouble(String.valueOf(map.get("naccoutnum").toString()))).abs(); + // + // l=true; + // Map map1 =new HashMap<>(); + // map1.put("vrowno",map.get("vrowno").toString()); + // map1.put("mrlname",goodsMap.get("name").toString()); + // map1.put("mrlcode",goodsMap.get("code").toString()); + // maps.add(map1); + // } + // } + // if(l){ + // // String pickm = " select vbillcode,cpickmid from mm_pickm where csourcebillrowid='" + item.getCmoid() + "' and dr=0"; + // // List> pickms = (List>) dao.executeQuery(pickm, new MapListProcessor()); + // String err=""; + // for (Map vrowno : maps) { + // String pmobillcode= head.getVbillcode(); + // String pmovrowno= item.getVrowno(); + // // String pickmbillcode= pickms.get(0).get("vbillcode").toString(); + // String pickmvrowno= vrowno.get("vrowno").toString(); + // String mrlname= vrowno.get("mrlname").toString(); + // String mrlcode= vrowno.get("mrlcode").toString(); + // err=err+"生产订单"+pmobillcode+"行"+pmovrowno+"的备料计划行"+pickmvrowno+"物料【"+mrlcode+","+mrlname+"】检查不通过\n"; + // } + // throw new BusinessException(err); + // } item.setFitemstatus(Integer.valueOf(PMOFItemStatusEnum.FINISH.getEnumValue().getValue())); item.setTactendtime(new UFDateTime(AppBsContext.getInstance().getBusiDate().toPersisted())); item.setStatus(1);