From a1e09c857551a234e1c7a03b6dc75eee38bf154b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E9=94=A6=E8=B4=A4?= <996842803@qq.com> Date: Wed, 17 Jun 2026 11:14:44 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=85=A5=E5=BA=93=E6=89=B9=E6=AC=A1?= =?UTF-8?q?=E5=8F=B7):=20=E8=B0=83=E6=95=B4=E6=89=B9=E6=AC=A1=E5=8F=B7?= =?UTF-8?q?=E7=94=9F=E6=88=90=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WmsProductPutServiceImpl.java | 609 +++++++++--------- 1 file changed, 321 insertions(+), 288 deletions(-) diff --git a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java index eb15e763b..95abb7ec0 100644 --- a/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java +++ b/op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java @@ -90,10 +90,10 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { @Override @DS("#header.poolName") public List selectWmsProductPutList(WmsProductPut wmsProductPut) { - List wmsProductPutList= wmsProductPutMapper.selectWmsProductPutList(wmsProductPut); - for (WmsProductPut wmsProductPut1: - wmsProductPutList) { - String qcResult= wmsProductPutMapper.selectQcCheckTask(wmsProductPut1); + List wmsProductPutList = wmsProductPutMapper.selectWmsProductPutList(wmsProductPut); + for (WmsProductPut wmsProductPut1 : + wmsProductPutList) { + String qcResult = wmsProductPutMapper.selectQcCheckTask(wmsProductPut1); wmsProductPut1.setZJStatus(qcResult); } return wmsProductPutList; @@ -169,7 +169,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { // wmsProductPutTrayMapper.insertWmsProductPutTray(wmsProductPutTray); // } return wmsProductPutMapper.selectWmsProductPutByWorkOrder(workOrder); - }finally { + } finally { DynamicDataSourceContextHolder.poll(); } @@ -181,7 +181,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { try { WmsProductPut wmsProductPut1 = wmsProductPutMapper.selectMesReportWork(wmsProductPut); return wmsProductPut1; - }finally { + } finally { DynamicDataSourceContextHolder.poll(); } @@ -285,7 +285,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { } } return SUCCESS; - }finally { + } finally { DynamicDataSourceContextHolder.poll(); } @@ -297,7 +297,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { String msgs = "操作完成"; for (WmsProductPut wmsProductPut1 : wmsProductPut) { - String status = wmsProductPut1.getStatus(); + String status = wmsProductPut1.getStatus(); WmsProductPut wmsProductPutSAPById = wmsProductPutMapper.selectWmsProductPutSAPById(wmsProductPut1.getId()); if (wmsProductPutSAPById != null) { List wmsProductPut2 = wmsProductPutMapper.selectWmsProductPutSAPByIds(wmsProductPutSAPById.getId()); @@ -315,11 +315,11 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { map.put("BATCH", wmsProductPut3.getAttr4()); map.put("STCK_TYPE", wmsProductPut1.getAttr3()); //去除空格 - if (wmsProductPut3.getBatchNumber().trim().length()==24){ + if (wmsProductPut3.getBatchNumber().trim().length() == 24) { - String HSDAT = InterceptionSJRules(wmsProductPut3.getBatchNumber()); + String HSDAT = InterceptionSJRules(wmsProductPut3.getBatchNumber()); map.put("HSDAT", HSDAT); - }else { + } else { map.put("HSDAT", wmsProductPut3.getProductDate()); } @@ -332,7 +332,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { WmsProductPut wmsProductPut4 = new WmsProductPut(); wmsProductPut4.setSapMessage(msg); if (code == 200) {//过账成功 - // String date = (String) result.getData(); + // String date = (String) result.getData(); Map map1 = new HashMap(); map1 = (Map) result.getData(); String MATERIALDOCUMENT = (String) map1.get("MATERIALDOCUMENT"); @@ -358,7 +358,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { try { WmsProductPut wmsProductPut1 = wmsProductPutMapper.selectMesReportWork(wmsProductPut); return wmsProductPut1; - }finally { + } finally { DynamicDataSourceContextHolder.poll(); } @@ -368,14 +368,9 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { @DS("#header.poolName") public List getReportList(wmsReportWork mesReportWork) { List rlist = wmsProductPutMapper.getReportList(mesReportWork); - for (wmsReportWork wmsReportWork: - rlist ) { - if (wmsReportWork.getBatch().length()>=23){ - String batchsk = InterceptionRules(wmsReportWork.getBatch()); - wmsReportWork.setBatchSK(batchsk); - }else { - wmsReportWork.setBatchSK(wmsReportWork.getBatch()); - } + for (wmsReportWork wmsReportWork : + rlist) { + wmsReportWork.setBatchSK(InterceptionRules(wmsReportWork.getBatch())); } return rlist; } @@ -383,7 +378,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { @Override @DS("#header.poolName") public String addReportListSap(List mesReportWorks) throws ParseException { - String selectedType= mesReportWorks.get(0).getSelectedType(); + String selectedType = mesReportWorks.get(0).getSelectedType(); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMddHHmmss"); Date date = new Date(); String formattedDate = dateFormat.format(date);//批次 @@ -412,7 +407,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { wmsProductPutk.setStatus("1"); wmsProductPutk.setUnitOfMeasure(mesReportWork.getUnit()); wmsProductPutk.setBatchNumber(mesReportWork.getBatch());// - // wmsProductPutk.setSapStatus("2");//过账失败的 + // wmsProductPutk.setSapStatus("2");//过账失败的 List wmsProductPutList = wmsProductPutMapper.selectWmsProductPutList(wmsProductPutk); if (wmsProductPutList.size() > 0) { @@ -440,7 +435,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { // wmsProductPutk.setSapStatus("2"); // List wmsProductPutList = wmsProductPutMapper.selectWmsProductPutList(wmsProductPutk); // if (wmsProductPutList.size() > 0) {//已经插入 - wmsReportWorkListagain.add(mesReportWork);// + wmsReportWorkListagain.add(mesReportWork);// // } } //已经插入且插入失败的 @@ -543,10 +538,10 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { map.put("ERFME", mesReportWork.getUnit()); map.put("BATCH", mesReportWork.getBatchSK()); map.put("STCK_TYPE", selectedType); - if (mesReportWork.getBatch().trim().length()==24){ - String HSDAT = InterceptionSJRules(mesReportWork.getBatch()); + if (mesReportWork.getBatch().trim().length() == 24) { + String HSDAT = InterceptionSJRules(mesReportWork.getBatch()); map.put("HSDAT", HSDAT); - }else { + } else { String formattedsDate = mesReportWork.getProductDate().replace("-", ""); map.put("HSDAT", formattedsDate); } @@ -591,11 +586,11 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { map.put("ERFME", mesReportWork.getUnit()); map.put("BATCH", mesReportWork.getBatchSK()); map.put("STCK_TYPE", selectedType); - if (mesReportWork.getBatch().trim().length()==24){ + if (mesReportWork.getBatch().trim().length() == 24) { //String batch = mesReportWork.getBatch().substring(12); - String HSDAT = InterceptionSJRules(mesReportWork.getBatch()); + String HSDAT = InterceptionSJRules(mesReportWork.getBatch()); map.put("HSDAT", HSDAT); - }else { + } else { String formattedsDate = mesReportWork.getProductDate().replace("-", ""); map.put("HSDAT", formattedsDate); } @@ -654,23 +649,18 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { } - - - - - @Override public ProOrderWorkorder selectWmsOdsWhiteEmbryoInhAnd(WmsOdsWhiteEmbryoIn wmsOdsWhiteEmbryoIns) { DynamicDataSourceContextHolder.push("ds_" + wmsOdsWhiteEmbryoIns.getSiteCode()); try { - ProOrderWorkorder proOrderWorkorder= wmsOdsWhiteEmbryoInMapper.selectProOrderWorkorder(wmsOdsWhiteEmbryoIns); - if (proOrderWorkorder!=null){ - List proOrderWorkorderBatchList= wmsOdsWhiteEmbryoInMapper.selectProOrderWorkorderBatch(proOrderWorkorder); - for(ProOrderWorkorderBatch proOrderWorkorderBatch:proOrderWorkorderBatchList){ - String realityNumber= wmsOdsWhiteEmbryoInMapper.selectByOrderAndBc(proOrderWorkorderBatch,proOrderWorkorder.getOrderCode()); - if (realityNumber!=null){ + ProOrderWorkorder proOrderWorkorder = wmsOdsWhiteEmbryoInMapper.selectProOrderWorkorder(wmsOdsWhiteEmbryoIns); + if (proOrderWorkorder != null) { + List proOrderWorkorderBatchList = wmsOdsWhiteEmbryoInMapper.selectProOrderWorkorderBatch(proOrderWorkorder); + for (ProOrderWorkorderBatch proOrderWorkorderBatch : proOrderWorkorderBatchList) { + String realityNumber = wmsOdsWhiteEmbryoInMapper.selectByOrderAndBc(proOrderWorkorderBatch, proOrderWorkorder.getOrderCode()); + if (realityNumber != null) { proOrderWorkorderBatch.setRealityNumber(realityNumber); - }else { + } else { proOrderWorkorderBatch.setRealityNumber("0"); } } @@ -679,7 +669,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { } // proOrderWorkorder .setUnit("辆"); return proOrderWorkorder; - }finally { + } finally { DynamicDataSourceContextHolder.poll(); } @@ -687,14 +677,14 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { @Override public String addtWmsOdsWhiteEmbryoInhAnd(WmsOdsWhiteEmbryoIn wmsOdsWhiteEmbryoIn) { - String result="入库成功"; + String result = "入库成功"; //先判断这个订单是否存在//如果存在--就修改订单。-如果不存在就添加上， DynamicDataSourceContextHolder.push("ds_" + wmsOdsWhiteEmbryoIn.getSiteCode()); try { - String unit= wmsOdsWhiteEmbryoIn.getUnit(); - String userDefined1= wmsOdsWhiteEmbryoIn.getUserDefined1(); - WmsOdsWhiteEmbryoIn wmsOdsWhiteEmbryoIn1= wmsOdsWhiteEmbryoInMapper.selectWmsOdsWhiteEmbryoInByOrderCodeAndUserDefined1(wmsOdsWhiteEmbryoIn); - if (wmsOdsWhiteEmbryoIn1==null){ + String unit = wmsOdsWhiteEmbryoIn.getUnit(); + String userDefined1 = wmsOdsWhiteEmbryoIn.getUserDefined1(); + WmsOdsWhiteEmbryoIn wmsOdsWhiteEmbryoIn1 = wmsOdsWhiteEmbryoInMapper.selectWmsOdsWhiteEmbryoInByOrderCodeAndUserDefined1(wmsOdsWhiteEmbryoIn); + if (wmsOdsWhiteEmbryoIn1 == null) { //原来不存在 wmsOdsWhiteEmbryoIn.setID(IdUtils.fastSimpleUUID()); wmsOdsWhiteEmbryoIn.setActive("1"); @@ -702,21 +692,21 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { wmsOdsWhiteEmbryoIn.setOrderStatus("1"); wmsOdsWhiteEmbryoIn.setCreateDate(new Date()); wmsOdsWhiteEmbryoInMapper.insertWmsOdsWhiteEmbryoIn(wmsOdsWhiteEmbryoIn); - wmsOdsWhiteEmbryoIn1=wmsOdsWhiteEmbryoIn; + wmsOdsWhiteEmbryoIn1 = wmsOdsWhiteEmbryoIn; } // else {//原来就存在 // wmsOdsWhiteEmbryoIn1.setOrderStatus("1"); // wmsOdsWhiteEmbryoInMapper.updateWmsOdsWhiteEmbryoIn(wmsOdsWhiteEmbryoIn1); // } - List wmsWhiteBilletInforList= wmsOdsWhiteEmbryoIn.getWmsWhiteBilletInforList(); - for (WmsWhiteBilletInfor wmsWhiteBilletInfor: + List wmsWhiteBilletInforList = wmsOdsWhiteEmbryoIn.getWmsWhiteBilletInforList(); + for (WmsWhiteBilletInfor wmsWhiteBilletInfor : wmsWhiteBilletInforList) { //判断是否入完 //wms_ods_em_storage_news_sn 明细 - WmsOdsWhiteEmbryoIn wmsOdsWhiteEmbryoIn2= wmsOdsWhiteEmbryoInMapper.selectWmsOdsWhiteEmbryoInByID(wmsOdsWhiteEmbryoIn1.getID()); - BigDecimal runumber= wmsOdsWhiteEmbryoIn2.getRealityNumber().add(new BigDecimal(wmsWhiteBilletInfor.getBatchQuantity())); - BigDecimal planNumber= wmsOdsWhiteEmbryoIn2.getPlanNumber(); - if (runumber.equals(planNumber)){//相等，为true，否则为false + WmsOdsWhiteEmbryoIn wmsOdsWhiteEmbryoIn2 = wmsOdsWhiteEmbryoInMapper.selectWmsOdsWhiteEmbryoInByID(wmsOdsWhiteEmbryoIn1.getID()); + BigDecimal runumber = wmsOdsWhiteEmbryoIn2.getRealityNumber().add(new BigDecimal(wmsWhiteBilletInfor.getBatchQuantity())); + BigDecimal planNumber = wmsOdsWhiteEmbryoIn2.getPlanNumber(); + if (runumber.equals(planNumber)) {//相等，为true，否则为false wmsOdsWhiteEmbryoIn2.setOrderStatus("2"); } wmsOdsWhiteEmbryoIn2.setLastUpdateBy(wmsOdsWhiteEmbryoIn.getCreateBy()); @@ -724,7 +714,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { wmsOdsWhiteEmbryoIn2.setRealityNumber(runumber); wmsOdsWhiteEmbryoInMapper.updateWmsOdsWhiteEmbryoIn(wmsOdsWhiteEmbryoIn2); //修改订单入库数量和状态 - WmsOdsEmStorageNewsSn wmsOdsEmStorageNewsSn =new WmsOdsEmStorageNewsSn(); + WmsOdsEmStorageNewsSn wmsOdsEmStorageNewsSn = new WmsOdsEmStorageNewsSn(); wmsOdsEmStorageNewsSn.setWlCode(wmsWhiteBilletInfor.getWlCode());//库位 wmsOdsEmStorageNewsSn.setMaterialCode(wmsOdsWhiteEmbryoIn.getMaterialCode()); wmsOdsEmStorageNewsSn.setMaterialDesc(wmsOdsWhiteEmbryoIn.getMaterialDesc()); @@ -738,19 +728,19 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { wmsOdsEmStorageNewsSn.setUserDefined2(unit); wmsOdsEmStorageNewsSn.setFactoryCode(wmsOdsWhiteEmbryoIn.getSiteCode()); wmsOdsEmStorageNewsSnMapper.insertWmsOdsEmStorageNewsSn(wmsOdsEmStorageNewsSn); - WmsOdsEmStorageNews wmsOdsEmStorageNews=new WmsOdsEmStorageNews(); + WmsOdsEmStorageNews wmsOdsEmStorageNews = new WmsOdsEmStorageNews(); wmsOdsEmStorageNews.setWlCode(wmsWhiteBilletInfor.getWlCode()); wmsOdsEmStorageNews.setMaterialCode(wmsOdsWhiteEmbryoIn.getMaterialCode()); wmsOdsEmStorageNews.setMaterialDesc(wmsOdsWhiteEmbryoIn.getMaterialDesc()); wmsOdsEmStorageNews.setUserDefined1(unit); wmsOdsEmStorageNews.setActiveFlag("1"); - List wmsOdsEmStorageNewsList= wmsOdsEmStorageNewsMapper.selectWmsOdsEmStorageNewsList(wmsOdsEmStorageNews); - if (wmsOdsEmStorageNewsList.size()>0){ - WmsOdsEmStorageNews wmsOdsEmStorageNews1 = wmsOdsEmStorageNewsList.get(0); - BigDecimal Amount=wmsOdsEmStorageNews1.getAmount().add(new BigDecimal(wmsWhiteBilletInfor.getBatchQuantity())); + List wmsOdsEmStorageNewsList = wmsOdsEmStorageNewsMapper.selectWmsOdsEmStorageNewsList(wmsOdsEmStorageNews); + if (wmsOdsEmStorageNewsList.size() > 0) { + WmsOdsEmStorageNews wmsOdsEmStorageNews1 = wmsOdsEmStorageNewsList.get(0); + BigDecimal Amount = wmsOdsEmStorageNews1.getAmount().add(new BigDecimal(wmsWhiteBilletInfor.getBatchQuantity())); wmsOdsEmStorageNews1.setAmount(Amount); wmsOdsEmStorageNewsMapper.updateWmsOdsEmStorageNews(wmsOdsEmStorageNews1); - }else { + } else { wmsOdsEmStorageNews.setAmount(new BigDecimal(wmsWhiteBilletInfor.getBatchQuantity())); wmsOdsEmStorageNews.setUserDefined1(wmsOdsWhiteEmbryoIn.getUnit()); wmsOdsEmStorageNews.setCreateBy(wmsOdsWhiteEmbryoIn.getCreateBy()); @@ -762,7 +752,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { } // wms_ods_em_storage_news 主库 } - }finally { + } finally { DynamicDataSourceContextHolder.poll(); } @@ -774,9 +764,9 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { DynamicDataSourceContextHolder.push("ds_" + wmsProductPutTrayCode.getSiteCode()); try { wmsProductPutTrayCode.setRelatStatus("1"); - List wmsProductPutTrayCodeList= wmsProductPutTrayCodeMapper.selectWmsProductPutTrayCodeList(wmsProductPutTrayCode); + List wmsProductPutTrayCodeList = wmsProductPutTrayCodeMapper.selectWmsProductPutTrayCodeList(wmsProductPutTrayCode); return wmsProductPutTrayCodeList; - }finally { + } finally { DynamicDataSourceContextHolder.poll(); } @@ -784,14 +774,14 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { @Override public String addSnCorrelationBarcode(WmsProductPutTrayCode wmsProductPutTrayCode) { - String result="关联成功"; + String result = "关联成功"; DynamicDataSourceContextHolder.push("ds_" + wmsProductPutTrayCode.getSiteCode()); try { wmsProductPutTrayCode.setRelatStatus("1"); wmsProductPutTrayCode.setStorageId(IdUtils.fastSimpleUUID()); wmsProductPutTrayCode.setNumber(1); wmsProductPutTrayCodeMapper.insertWmsProductPutTrayCode(wmsProductPutTrayCode); - }finally { + } finally { DynamicDataSourceContextHolder.poll(); } @@ -800,11 +790,11 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { @Override public String deletSnCorrelationBarcode(WmsProductPutTrayCode wmsProductPutTrayCode) { - String result="解除成功"; + String result = "解除成功"; DynamicDataSourceContextHolder.push("ds_" + wmsProductPutTrayCode.getSiteCode()); try { wmsProductPutTrayCodeMapper.deleteWmsProductPutTrayCodeByStorageId(wmsProductPutTrayCode.getStorageId()); - }finally { + } finally { DynamicDataSourceContextHolder.poll(); } @@ -812,52 +802,52 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { } /** + * "MAKTX": "榄菊果蔬餐具净(海盐柠檬)1kg×10",描述 物料描述 + * "KUNNR": "0001010404", //送达方 + * "VBELN": "0081003133", //交货单 + * "ZSAREA": "", //销售大区 + * "BZTXT1": "", //销售大区描述 + * "KUNNR_NM": "上海大润发有限公司（华东高新总仓）", //送达方描述 + * "MENGE": "6.000", //数量 + * "MEINS": "KAR", //单位 + * "LIFNR_NM": "上海中集公联集装箱储运有限公司", //货运代理描述 + * "TDDAT": "2202-02-09", //计划日期 + * "LIFNR": "0000400213", //货运代理 + * "VBELN_VA": "0000738138", //销售单 + * "MATNR": "000000010201020100" 物料描述 * - "MAKTX": "榄菊果蔬餐具净(海盐柠檬)1kg×10",描述 物料描述 - "KUNNR": "0001010404", //送达方 - "VBELN": "0081003133", //交货单 - "ZSAREA": "", //销售大区 - "BZTXT1": "", //销售大区描述 - "KUNNR_NM": "上海大润发有限公司（华东高新总仓）", //送达方描述 - "MENGE": "6.000", //数量 - "MEINS": "KAR", //单位 - "LIFNR_NM": "上海中集公联集装箱储运有限公司", //货运代理描述 - "TDDAT": "2202-02-09", //计划日期 - "LIFNR": "0000400213", //货运代理 - "VBELN_VA": "0000738138", //销售单 - "MATNR": "000000010201020100" 物料描述 * @param wmsSellOutEmbryo * @return */ @Override public String selectFinishedProductSales(WmsSellOutEmbryo wmsSellOutEmbryo) { - String results="提单成功"; + String results = "提单成功"; DynamicDataSourceContextHolder.push("ds_" + wmsSellOutEmbryo.getFactoryCode()); try { - Map objectMap=new HashMap<>(); - objectMap.put("S_MATNR",wmsSellOutEmbryo.getProductCode());//物料号， - objectMap.put("S_TDDAT",wmsSellOutEmbryo.getAttr1());//String 计划运输日期 - objectMap.put("S_VBELN",wmsSellOutEmbryo.getDeliveryOrder());//交货单 - R result = remoteSapService.FPinventory(objectMap); + Map objectMap = new HashMap<>(); + objectMap.put("S_MATNR", wmsSellOutEmbryo.getProductCode());//物料号， + objectMap.put("S_TDDAT", wmsSellOutEmbryo.getAttr1());//String 计划运输日期 + objectMap.put("S_VBELN", wmsSellOutEmbryo.getDeliveryOrder());//交货单 + R result = remoteSapService.FPinventory(objectMap); int code = result.getCode(); String msg = result.getMsg(); - if(code==200){ - List> mapList= (List>) result.getData(); - for ( Map stringStringMap: mapList){ - String MAKTX=stringStringMap.get("MAKTX");//物料描述 - String MATNR=stringStringMap.get("MATNR");//物料号 - String KUNNR=stringStringMap.get("KUNNR");//送达方 - String VBELN=stringStringMap.get("VBELN");//交货单---一销售单对多交货单 - String VBELN_VA=stringStringMap.get("VBELN_VA");//销售单 - String MENGE=stringStringMap.get("MENGE");//数量 - String MEINS=stringStringMap.get("MEINS");//单位 - String TDDAT=stringStringMap.get("TDDAT");//计划日期 - String KUNNR_NM=stringStringMap.get("KUNNR_NM");//送达方描述 - String LIFNR=stringStringMap.get("LIFNR");//货运代理 - String LIFNR_NM=stringStringMap.get("LIFNR_NM");//货运代理描述 - String ZSAREA=stringStringMap.get("ZSAREA");//销售大区 - String BZTXT1=stringStringMap.get("BZTXT1");//销售大区描述 - WmsSellOutEmbryo wmsSellOutEmbryo1=new WmsSellOutEmbryo(); + if (code == 200) { + List> mapList = (List>) result.getData(); + for (Map stringStringMap : mapList) { + String MAKTX = stringStringMap.get("MAKTX");//物料描述 + String MATNR = stringStringMap.get("MATNR");//物料号 + String KUNNR = stringStringMap.get("KUNNR");//送达方 + String VBELN = stringStringMap.get("VBELN");//交货单---一销售单对多交货单 + String VBELN_VA = stringStringMap.get("VBELN_VA");//销售单 + String MENGE = stringStringMap.get("MENGE");//数量 + String MEINS = stringStringMap.get("MEINS");//单位 + String TDDAT = stringStringMap.get("TDDAT");//计划日期 + String KUNNR_NM = stringStringMap.get("KUNNR_NM");//送达方描述 + String LIFNR = stringStringMap.get("LIFNR");//货运代理 + String LIFNR_NM = stringStringMap.get("LIFNR_NM");//货运代理描述 + String ZSAREA = stringStringMap.get("ZSAREA");//销售大区 + String BZTXT1 = stringStringMap.get("BZTXT1");//销售大区描述 + WmsSellOutEmbryo wmsSellOutEmbryo1 = new WmsSellOutEmbryo(); wmsSellOutEmbryo1.setId(IdUtils.fastSimpleUUID()); wmsSellOutEmbryo1.setDeliveryOrder(VBELN);//交货单号 wmsSellOutEmbryo1.setAttr1(VBELN_VA); @@ -880,15 +870,15 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { wmsSellOutEmbryo1.setCreateBy(wmsSellOutEmbryo.getCreateBy()); wmsSellOutEmbryo1.setCreateTime(new Date()); //判断有没有这个单子，。如果有的话，就跳过吧 - WmsSellOutEmbryo wmsSellOutEmbryo2= wmsSellOutEmbryoMapper.selectWmsSellOutEmbryoByOrderCodeAndProductCode(VBELN,MATNR); - if (wmsSellOutEmbryo2==null){ + WmsSellOutEmbryo wmsSellOutEmbryo2 = wmsSellOutEmbryoMapper.selectWmsSellOutEmbryoByOrderCodeAndProductCode(VBELN, MATNR); + if (wmsSellOutEmbryo2 == null) { wmsSellOutEmbryoMapper.insertWmsSellOutEmbryo(wmsSellOutEmbryo1); - }else { - results="已经存在"; + } else { + results = "已经存在"; } } } - }finally { + } finally { DynamicDataSourceContextHolder.poll(); } @@ -897,34 +887,34 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { @Override public String confirmFinishedProductSales(WmsSellOutEmbryo wmsSellOutEmbryo) { - String result1="出库成功"; + String result1 = "出库成功"; DynamicDataSourceContextHolder.push("ds_" + wmsSellOutEmbryo.getFactoryCode()); try { - List wmsProductPutTrayCodeList= wmsSellOutEmbryo.getWmsProductPutTrayCodeList(); - List wmsFpStorageNewsSns = wmsSellOutEmbryo.getWmsFpStorageNewsSns(); - for (WmsFpStorageNewsSn wmsFpStorageNewsSn: + List wmsProductPutTrayCodeList = wmsSellOutEmbryo.getWmsProductPutTrayCodeList(); + List wmsFpStorageNewsSns = wmsSellOutEmbryo.getWmsFpStorageNewsSns(); + for (WmsFpStorageNewsSn wmsFpStorageNewsSn : wmsFpStorageNewsSns) { - WmsSellOutEmbryo wmsSellOutEmbryo1 = wmsSellOutEmbryoMapper.selectWmsSellOutEmbryoByIdRE(wmsSellOutEmbryo.getId()); - BigDecimal OutQuantity= wmsSellOutEmbryo1.getOutQuantity().add(wmsFpStorageNewsSn.getAmount());//已出加操作 + WmsSellOutEmbryo wmsSellOutEmbryo1 = wmsSellOutEmbryoMapper.selectWmsSellOutEmbryoByIdRE(wmsSellOutEmbryo.getId()); + BigDecimal OutQuantity = wmsSellOutEmbryo1.getOutQuantity().add(wmsFpStorageNewsSn.getAmount());//已出加操作 int result = wmsSellOutEmbryo1.getPlanQuantity().compareTo(OutQuantity); - WmsSellOutEmbryo wmsSellOutEmbryoUpdate=new WmsSellOutEmbryo(); - if (result == 0){//出库完 + WmsSellOutEmbryo wmsSellOutEmbryoUpdate = new WmsSellOutEmbryo(); + if (result == 0) {//出库完 wmsSellOutEmbryoUpdate.setStatus("2"); - }else { + } else { wmsSellOutEmbryoUpdate.setStatus("1"); } wmsSellOutEmbryoUpdate.setId(wmsSellOutEmbryo.getId()); wmsSellOutEmbryoUpdate.setOutQuantity(OutQuantity); wmsSellOutEmbryoMapper.updateWmsSellOutEmbryoRE(wmsSellOutEmbryoUpdate); - WmsFpStorageNewsSn wmsFpStorageNewsSn1=new WmsFpStorageNewsSn(); + WmsFpStorageNewsSn wmsFpStorageNewsSn1 = new WmsFpStorageNewsSn(); wmsFpStorageNewsSn1.setStorageId(wmsFpStorageNewsSn.getStorageId()); wmsFpStorageNewsSn1.setAmount(wmsFpStorageNewsSn.getAmount()); wmsFpStorageNewsSn1.setActiveFlag("1"); wmsFpStorageNewsSn1.setProductCode(wmsSellOutEmbryo1.getProductCode()); wmsFpStorageNewsSnMapper.updateWmsFpStorageNewsSnOut(wmsFpStorageNewsSn1); wmsFpStorageNewsSnMapper.updateWmsFpStorageNewsSnsetZT(wmsFpStorageNewsSn1); - WmsFpStorageNewsSn wmsFpStorageNewsSn2= wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnByStorageId(wmsFpStorageNewsSn.getStorageId()); - WmsFpStorageNewsSn wmsFpStorageNewsSn3=new WmsFpStorageNewsSn(); + WmsFpStorageNewsSn wmsFpStorageNewsSn2 = wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnByStorageId(wmsFpStorageNewsSn.getStorageId()); + WmsFpStorageNewsSn wmsFpStorageNewsSn3 = new WmsFpStorageNewsSn(); wmsFpStorageNewsSn3.setStorageId(IdUtils.fastSimpleUUID()); wmsFpStorageNewsSn3.setWhCode(wmsFpStorageNewsSn2.getWhCode()); wmsFpStorageNewsSn3.setWaCode(wmsFpStorageNewsSn2.getWaCode()); @@ -943,7 +933,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { wmsFpStorageNewsSn3.setBarCode(wmsSellOutEmbryo.getId()); wmsFpStorageNewsSn3.setFactoryCode(wmsSellOutEmbryo.getFactoryCode()); wmsFpStorageNewsSnMapper.insertWmsFpStorageNewsSnRecords(wmsFpStorageNewsSn3);//出库明细记录 - WmsFpStorageNews wmsFpStorageNews=new WmsFpStorageNews(); + WmsFpStorageNews wmsFpStorageNews = new WmsFpStorageNews(); wmsFpStorageNews.setActiveFlag("1"); wmsFpStorageNews.setWlCode(wmsFpStorageNewsSn2.getWlCode()); wmsFpStorageNews.setProductCode(wmsSellOutEmbryo1.getProductCode()); @@ -953,7 +943,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { wmsFpStorageNews.setWaCode(wmsFpStorageNewsSn2.getWaCode()); wmsFpStorageNewsMapper.updateWmsFpStorageNewsOut(wmsFpStorageNews); } - }finally { + } finally { DynamicDataSourceContextHolder.poll(); } @@ -967,13 +957,13 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { try { wmsProductPutTrayCode.setRelatStatus("1"); // List wmsProductPutTrayCodeList= wmsProductPutTrayCodeMapper.selectWmsProductPutTrayCodeList(wmsProductPutTrayCode);//sn - WmsFpStorageNewsSn wmsFpStorageNewsSn=new WmsFpStorageNewsSn(); + WmsFpStorageNewsSn wmsFpStorageNewsSn = new WmsFpStorageNewsSn(); wmsFpStorageNewsSn.setSn(wmsProductPutTrayCode.getSn()); wmsFpStorageNewsSn.setActiveFlag("1"); - List wmsFpStorageNewsSns = wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnSTList(wmsFpStorageNewsSn); + List wmsFpStorageNewsSns = wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnSTList(wmsFpStorageNewsSn); return wmsFpStorageNewsSns; - }finally { + } finally { DynamicDataSourceContextHolder.poll(); } @@ -985,25 +975,25 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { try { wmsProductPutTrayCode.setRelatStatus("1"); //barcode - List wmsProductPutTrayCodeList= wmsProductPutTrayCodeMapper.selectWmsProductPutTrayCodeList(wmsProductPutTrayCode); + List wmsProductPutTrayCodeList = wmsProductPutTrayCodeMapper.selectWmsProductPutTrayCodeList(wmsProductPutTrayCode); //对应的箱码 - if (wmsProductPutTrayCodeList.size()>0){ - WmsProductPutTrayCode wmsProductPutTrayCode1= wmsProductPutTrayCodeList.get(0); + if (wmsProductPutTrayCodeList.size() > 0) { + WmsProductPutTrayCode wmsProductPutTrayCode1 = wmsProductPutTrayCodeList.get(0); wmsProductPutTrayCode.setSn(wmsProductPutTrayCode1.getSn());//托盘 - WmsFpStorageNewsSn wmsFpStorageNewsSn=new WmsFpStorageNewsSn(); + WmsFpStorageNewsSn wmsFpStorageNewsSn = new WmsFpStorageNewsSn(); wmsFpStorageNewsSn.setSn(wmsProductPutTrayCode.getSn()); wmsFpStorageNewsSn.setActiveFlag("1"); - List wmsFpStorageNewsSns= wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnList(wmsFpStorageNewsSn); + List wmsFpStorageNewsSns = wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnList(wmsFpStorageNewsSn); //库位 - if(wmsFpStorageNewsSns.size()>0){ - WmsFpStorageNewsSn wmsFpStorageNewsSn1= wmsFpStorageNewsSns.get(0); - wmsProductPutTrayCode.setWlCode( wmsFpStorageNewsSn1.getWlCode());//库位 + if (wmsFpStorageNewsSns.size() > 0) { + WmsFpStorageNewsSn wmsFpStorageNewsSn1 = wmsFpStorageNewsSns.get(0); + wmsProductPutTrayCode.setWlCode(wmsFpStorageNewsSn1.getWlCode());//库位 wmsProductPutTrayCode.setProductCode(wmsFpStorageNewsSn1.getProductCode()); wmsProductPutTrayCode.setProductName(wmsFpStorageNewsSn1.getProductName()); return wmsProductPutTrayCode; } } - }finally { + } finally { DynamicDataSourceContextHolder.poll(); } @@ -1016,54 +1006,55 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { DynamicDataSourceContextHolder.push("ds_" + wmsSellOutEmbryo.getFactoryCode()); try { wmsSellOutEmbryo.setActiveFlag("1"); - List wmsSellOutEmbryoList= wmsSellOutEmbryoMapper.selectWmsSellOutEmbryoListRE(wmsSellOutEmbryo); + List wmsSellOutEmbryoList = wmsSellOutEmbryoMapper.selectWmsSellOutEmbryoListRE(wmsSellOutEmbryo); return wmsSellOutEmbryoList; - }finally { + } finally { DynamicDataSourceContextHolder.poll(); } } + @Override public String finishedProductSalesReturnTD(WmsRuturnPutEmbryo wmsRuturnPutEmbryo) { - String results="提单成功";//退货单 + String results = "提单成功";//退货单 DynamicDataSourceContextHolder.push("ds_" + wmsRuturnPutEmbryo.getFactoryCode()); try { - Map objectMap=new HashMap<>(); - objectMap.put("S_MATNR",wmsRuturnPutEmbryo.getProductCode());//物料号， - objectMap.put("S_TDDAT",wmsRuturnPutEmbryo.getAttr1());//String 计划运输日期 - objectMap.put("S_VBELN",wmsRuturnPutEmbryo.getProductOrder());//成品销售退货单 - objectMap.put("S_AUART","ZRE"); - R result = remoteSapService.FPinventory(objectMap); + Map objectMap = new HashMap<>(); + objectMap.put("S_MATNR", wmsRuturnPutEmbryo.getProductCode());//物料号， + objectMap.put("S_TDDAT", wmsRuturnPutEmbryo.getAttr1());//String 计划运输日期 + objectMap.put("S_VBELN", wmsRuturnPutEmbryo.getProductOrder());//成品销售退货单 + objectMap.put("S_AUART", "ZRE"); + R result = remoteSapService.FPinventory(objectMap); int code = result.getCode(); String msg = result.getMsg(); - if(code==200){ - List> mapList= (List>) result.getData(); - for ( Map stringStringMap: mapList){ - String MAKTX=stringStringMap.get("MAKTX");//物料描述 - String MATNR=stringStringMap.get("MATNR");//物料号 - String KUNNR=stringStringMap.get("KUNNR");//送达方 - String VBELN=stringStringMap.get("VBELN");//交货单---一销售单对多交货单 - String VBELN_VA=stringStringMap.get("VBELN_VA");//销售单 - String MENGE=stringStringMap.get("MENGE");//数量 - String MEINS=stringStringMap.get("MEINS");//单位 - String TDDAT=stringStringMap.get("TDDAT");//计划日期 - String KUNNR_NM=stringStringMap.get("KUNNR_NM");//送达方描述 - String LIFNR=stringStringMap.get("LIFNR");//货运代理 - String LIFNR_NM=stringStringMap.get("LIFNR_NM");//货运代理描述 - String ZSAREA=stringStringMap.get("ZSAREA");//销售大区 - String BZTXT1=stringStringMap.get("BZTXT1");//销售大区描述 - String POSNR=stringStringMap.get("POSNR");//交货项目 - String AUART=stringStringMap.get("AUART");// - String BEZEI=stringStringMap.get("BEZEI");// + if (code == 200) { + List> mapList = (List>) result.getData(); + for (Map stringStringMap : mapList) { + String MAKTX = stringStringMap.get("MAKTX");//物料描述 + String MATNR = stringStringMap.get("MATNR");//物料号 + String KUNNR = stringStringMap.get("KUNNR");//送达方 + String VBELN = stringStringMap.get("VBELN");//交货单---一销售单对多交货单 + String VBELN_VA = stringStringMap.get("VBELN_VA");//销售单 + String MENGE = stringStringMap.get("MENGE");//数量 + String MEINS = stringStringMap.get("MEINS");//单位 + String TDDAT = stringStringMap.get("TDDAT");//计划日期 + String KUNNR_NM = stringStringMap.get("KUNNR_NM");//送达方描述 + String LIFNR = stringStringMap.get("LIFNR");//货运代理 + String LIFNR_NM = stringStringMap.get("LIFNR_NM");//货运代理描述 + String ZSAREA = stringStringMap.get("ZSAREA");//销售大区 + String BZTXT1 = stringStringMap.get("BZTXT1");//销售大区描述 + String POSNR = stringStringMap.get("POSNR");//交货项目 + String AUART = stringStringMap.get("AUART");// + String BEZEI = stringStringMap.get("BEZEI");// - WmsRuturnPutEmbryo wmsRuturnPutEmbryo1=new WmsRuturnPutEmbryo(); + WmsRuturnPutEmbryo wmsRuturnPutEmbryo1 = new WmsRuturnPutEmbryo(); wmsRuturnPutEmbryo1.setProductOrder(VBELN); wmsRuturnPutEmbryo1.setFactoryCode(wmsRuturnPutEmbryo.getFactoryCode()); wmsRuturnPutEmbryo1.setProductCode(MATNR); wmsRuturnPutEmbryo1.setAttr10(POSNR); wmsRuturnPutEmbryo1.setActiveFlag("1"); - List wmsRuturnPutEmbryoList= wmsRuturnPutEmbryoMapper.selectWmsRuturnPutEmbryoList(wmsRuturnPutEmbryo1); - if ( wmsRuturnPutEmbryoList.size()==0){ + List wmsRuturnPutEmbryoList = wmsRuturnPutEmbryoMapper.selectWmsRuturnPutEmbryoList(wmsRuturnPutEmbryo1); + if (wmsRuturnPutEmbryoList.size() == 0) { wmsRuturnPutEmbryo1.setAttr7(AUART); wmsRuturnPutEmbryo1.setAttr8(BEZEI); wmsRuturnPutEmbryo1.setPlanQuantity(new BigDecimal(MENGE)); @@ -1077,13 +1068,13 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { wmsRuturnPutEmbryo1.setSapStatus("0"); wmsRuturnPutEmbryo1.setId(IdUtils.fastSimpleUUID()); wmsRuturnPutEmbryoMapper.insertWmsRuturnPutEmbryo(wmsRuturnPutEmbryo1); - }else { - results="已经存在"; + } else { + results = "已经存在"; } } } return results; - }finally { + } finally { DynamicDataSourceContextHolder.poll(); } @@ -1093,9 +1084,9 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { public List selectBaseEquipmentList(BaseEquipment baseEquipment) { DynamicDataSourceContextHolder.push("ds_" + baseEquipment.getFactoryCode()); try { - List baseEquipments = wmsRuturnPutEmbryoMapper.selectBaseEquipmentList(baseEquipment); + List baseEquipments = wmsRuturnPutEmbryoMapper.selectBaseEquipmentList(baseEquipment); return baseEquipments; - }finally { + } finally { DynamicDataSourceContextHolder.poll(); } @@ -1105,9 +1096,9 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { public List listProOrderWorkorder(ProOrderWorkorder proOrderWorkorder) { DynamicDataSourceContextHolder.push("ds_" + proOrderWorkorder.getFactoryCode()); try { - List workorderList= wmsOdsWhiteEmbryoInMapper.listProOrderWorkorder(proOrderWorkorder); + List workorderList = wmsOdsWhiteEmbryoInMapper.listProOrderWorkorder(proOrderWorkorder); return workorderList; - }finally { + } finally { DynamicDataSourceContextHolder.poll(); } @@ -1117,7 +1108,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { public Integer finishedProductProductionRecords(ProOrderWorkorder proOrderWorkorder) { DynamicDataSourceContextHolder.push("ds_" + proOrderWorkorder.getFactoryCode()); try { - WmsProductProductionRecords wmsProductProductionRecords=new WmsProductProductionRecords(); + WmsProductProductionRecords wmsProductProductionRecords = new WmsProductProductionRecords(); wmsProductProductionRecords.setSiteCode(proOrderWorkorder.getFactoryCode()); wmsProductProductionRecords.setId(IdUtils.fastSimpleUUID()); wmsProductProductionRecords.setSn(proOrderWorkorder.getSn()); @@ -1132,9 +1123,9 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { wmsProductProductionRecords.setLineCode(proOrderWorkorder.getProdLineCode()); wmsProductProductionRecords.setCreateBy(proOrderWorkorder.getCreateBy()); wmsProductProductionRecords.setCreateTime(new Date()); - Integer result= wmsProductPutRecordsMapper.insertProductProductionRecord(wmsProductProductionRecords); + Integer result = wmsProductPutRecordsMapper.insertProductProductionRecord(wmsProductProductionRecords); return result; - }finally { + } finally { DynamicDataSourceContextHolder.poll(); } @@ -1143,9 +1134,9 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { @Override @DS("#header.poolName") public List selectProductProductionRecords(WmsProductProductionRecords wmsProductProductionRecords) { - // DynamicDataSourceContextHolder.push("ds_" + wmsProductProductionRecords.getSiteCode()); + // DynamicDataSourceContextHolder.push("ds_" + wmsProductProductionRecords.getSiteCode()); - List records= wmsProductPutRecordsMapper.selectProductProductionRecords(wmsProductProductionRecords); + List records = wmsProductPutRecordsMapper.selectProductProductionRecords(wmsProductProductionRecords); return records; } @@ -1155,7 +1146,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { DynamicDataSourceContextHolder.push("ds_" + wmsProductPut.getFactoryCode()); try { // String[] attributes = wmsProductPut.getPallet().split("-"); - WmsProductPut wmsProductPutTEM= wmsProductPutMapper.selectProOrderWorkorderBatchPalletcode(wmsProductPut); + WmsProductPut wmsProductPutTEM = wmsProductPutMapper.selectProOrderWorkorderBatchPalletcode(wmsProductPut); String attribute1 = wmsProductPutTEM.getAttribute1(); // 获取第一个属性 String attribute2 = wmsProductPutTEM.getAttribute2(); // 获取第二个属性 String attribute3 = wmsProductPutTEM.getAttribute3(); // 获取第三个属性 @@ -1163,52 +1154,52 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { wmsProductPut.setAttribute2(attribute2); wmsProductPut.setAttribute3(attribute3); WmsProductPut wmsProductPut1 = wmsProductPutMapper.WmsProductPutByWorkOrderqueryBS(wmsProductPut); - WmsProductPut wmsProductPut2 =new WmsProductPut(); + WmsProductPut wmsProductPut2 = new WmsProductPut(); wmsProductPut2.setWorkOrder(attribute1); wmsProductPut2.setBatchNumber(attribute2); wmsProductPut2.setPallet(attribute3); - WmsProductPut wmsProductPut3= wmsProductPutMapper.selectProOrderWorkorderBatchPallet(wmsProductPut2); + WmsProductPut wmsProductPut3 = wmsProductPutMapper.selectProOrderWorkorderBatchPallet(wmsProductPut2); //wmsProductPut.setProductCode(wmsProductPut3.getProductCode()); // wmsProductPut.setProductName(wmsProductPut3.getProductName()); // wmsProductPut.setUnitOfMeasure(wmsProductPut3.getAttr5()); wmsProductPut1.setNumber(wmsProductPut3.getAttr3()); //获取托盘信息--首先要他们有绑定数据 - WmsProductProductionRecords wmsProductProductionRecord=new WmsProductProductionRecords(); + WmsProductProductionRecords wmsProductProductionRecord = new WmsProductProductionRecords(); wmsProductProductionRecord.setUserDefined1(wmsProductPut.getPallet()); - List wmsProductProductionRecords= wmsProductPutRecordsMapper.selectProductProductionRecords(wmsProductProductionRecord); - if (wmsProductProductionRecords.size()>0){ - WmsProductProductionRecords wmsProductProductionRecords1= wmsProductProductionRecords.get(0); + List wmsProductProductionRecords = wmsProductPutRecordsMapper.selectProductProductionRecords(wmsProductProductionRecord); + if (wmsProductProductionRecords.size() > 0) { + WmsProductProductionRecords wmsProductProductionRecords1 = wmsProductProductionRecords.get(0); wmsProductPut1.setSn(wmsProductProductionRecords1.getSn()); - WmsProductPutRecords wmsProductPutRecords=new WmsProductPutRecords(); + WmsProductPutRecords wmsProductPutRecords = new WmsProductPutRecords(); wmsProductPutRecords.setUserDefined1(wmsProductPut.getPallet()); - List wmsProductPutRecords1= wmsProductPutRecordsMapper.selectWmsProductPutRecordsList(wmsProductPutRecords); - if(wmsProductPutRecords1.size()>0){ + List wmsProductPutRecords1 = wmsProductPutRecordsMapper.selectWmsProductPutRecordsList(wmsProductPutRecords); + if (wmsProductPutRecords1.size() > 0) { wmsProductPut1.setRemark("1");//已经入库 wmsProductPut1.setNumber(wmsProductPutRecords1.get(0).getNumber()); - }else { + } else { wmsProductPut1.setRemark("0");//未入库 } - }else { + } else { //他们又不想在成品下线的时候绑托盘，--让标识卡代替托盘码，如果没有绑的话，就标识卡代替托盘码 wmsProductPut1.setSn(wmsProductPut.getPallet()); - WmsProductPutRecords wmsProductPutRecords=new WmsProductPutRecords(); + WmsProductPutRecords wmsProductPutRecords = new WmsProductPutRecords(); wmsProductPutRecords.setUserDefined1(wmsProductPut.getPallet()); - List wmsProductPutRecords1= wmsProductPutRecordsMapper.selectWmsProductPutRecordsList(wmsProductPutRecords); - if(wmsProductPutRecords1.size()>0){ + List wmsProductPutRecords1 = wmsProductPutRecordsMapper.selectWmsProductPutRecordsList(wmsProductPutRecords); + if (wmsProductPutRecords1.size() > 0) { wmsProductPut1.setRemark("1");//已经入库 wmsProductPut1.setNumber(wmsProductPutRecords1.get(0).getNumber()); - }else { + } else { wmsProductPut1.setRemark("0");//未入库 } // return null; } - if (wmsProductPut1.getAttr3()==null){ + if (wmsProductPut1.getAttr3() == null) { wmsProductPut1.setAttr3(wmsProductPut1.getPlanQuantity().toString()); } wmsProductPut1.setPallet(wmsProductPut.getPallet()); return wmsProductPut1; - }finally { + } finally { DynamicDataSourceContextHolder.poll(); } @@ -1220,24 +1211,24 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { try { //String[] attributes = proOrderWorkorder.getAttr1().split("-"); // 通过索引访问分割后的数组，获取所需的三个属性 - WmsProductPut wmsProductPutTEM= wmsProductPutMapper.selectProOrderWorkorderBatchPalletAtter(proOrderWorkorder); + WmsProductPut wmsProductPutTEM = wmsProductPutMapper.selectProOrderWorkorderBatchPalletAtter(proOrderWorkorder); String attribute1 = wmsProductPutTEM.getAttribute1(); // 获取第一个属性 String attribute2 = wmsProductPutTEM.getAttribute2(); // 获取第二个属性 String attribute3 = wmsProductPutTEM.getAttribute3(); // 获取第三个属性 proOrderWorkorder.setWorkorderCodeSap(attribute1); proOrderWorkorder.setBatchCode(attribute2); - WmsProductPut wmsProductPut =new WmsProductPut(); + WmsProductPut wmsProductPut = new WmsProductPut(); wmsProductPut.setWorkOrder(attribute1); wmsProductPut.setBatchNumber(attribute2); wmsProductPut.setPallet(attribute3); - WmsProductPut wmsProductPut1= wmsProductPutMapper.selectProOrderWorkorderBatchPallet(wmsProductPut); + WmsProductPut wmsProductPut1 = wmsProductPutMapper.selectProOrderWorkorderBatchPallet(wmsProductPut); proOrderWorkorder.setQuantity(wmsProductPut1.getAttr3()); proOrderWorkorder.setProdLineCode(wmsProductPut1.getAttr4()); proOrderWorkorder.setProductCode(wmsProductPut1.getProductCode()); proOrderWorkorder.setProductName(wmsProductPut1.getProductName()); // proOrderWorkorder.setAttribute3(attribute3); return proOrderWorkorder; - }finally { + } finally { DynamicDataSourceContextHolder.poll(); } @@ -1283,34 +1274,28 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { wmsProductPutk.setPlanQuantity(wmsProductPut1.getPlanQuantity()); wmsProductPutk.setUnitOfMeasure(wmsProductPut1.getUnitOfMeasure()); wmsProductPutk.setBatchNumber(wmsProductPut1.getBatchNumber());// - List wmsProductPutLists= wmsProductPutMapper.selectWmsProductPutList(wmsProductPutk); - if (wmsProductPutLists.size()>0){ + List wmsProductPutLists = wmsProductPutMapper.selectWmsProductPutList(wmsProductPutk); + if (wmsProductPutLists.size() > 0) { //有 - WmsProductPut wmsProductPut2= wmsProductPutLists.get(0); - BigDecimal planQuantity= wmsProductPut2.getPlanQuantity(); - BigDecimal putQuantity= wmsProductPut2.getPutQuantity(); + WmsProductPut wmsProductPut2 = wmsProductPutLists.get(0); + BigDecimal planQuantity = wmsProductPut2.getPlanQuantity(); + BigDecimal putQuantity = wmsProductPut2.getPutQuantity(); // if (planQuantity.equals(putQuantity.add(new BigDecimal(wmsProductPut1.getNumber())))){ // wmsProductPutk.setStatus("1"); // }else { // wmsProductPutk.setStatus("2"); // } - BigDecimal putQuantityT=putQuantity.add(new BigDecimal(wmsProductPut1.getNumber()));//入库数量 + BigDecimal putQuantityT = putQuantity.add(new BigDecimal(wmsProductPut1.getNumber()));//入库数量 wmsProductPut2.setPutQuantity(putQuantityT); wmsProductPut2.setUpdateTime(new Date()); wmsProductPut2.setUpdateBy(wmsProductPut.getCreateBy()); wmsProductPutMapper.updateWmsProductPut(wmsProductPut2); wmsProductPutMapper.updateWmsProductStatus(wmsProductPut2);//修改订单 - }else { + } else { wmsProductPutk.setStatus("2");// wmsProductPutk.setSapStatus("0"); wmsProductPutk.setAttr3(formattedDate);// - if (wmsProductPutk.getBatchNumber().trim().length()==24){ - //String batch = mesReportWork.getBatch().substring(12); - String batch = InterceptionRules(wmsProductPutk.getBatchNumber()); - wmsProductPutk.setAttr4(batch); - }else { - wmsProductPutk.setAttr4(wmsProductPutk.getBatchNumber()); - } + wmsProductPutk.setAttr4(InterceptionRules(wmsProductPutk.getBatchNumber())); wmsProductPutk.setCreateBy(wmsProductPut.getCreateBy()); wmsProductPutk.setCreateTime(new Date()); wmsProductPutk.setPutQuantity(new BigDecimal(wmsProductPut1.getNumber())); @@ -1384,24 +1369,26 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { } remoteSapService.handMadeInStorage(sapHandMadeInStorageList); return SUCCESS; - }finally { + } finally { DynamicDataSourceContextHolder.poll(); } } - /** 获取批次号 **/ - private String getBatchCode(String str){ + /** + * 获取批次号 + **/ + private String getBatchCode(String str) { String batchCode = ""; - if (StringUtils.isBlank(str)){ + if (StringUtils.isBlank(str)) { throw new RuntimeException("批次号为空！"); } - if (str.length() == 24){ + if (str.length() == 24) { //截取12位到22位 - batchCode = str.substring(12,22); - }else { + batchCode = str.substring(12, 22); + } else { batchCode = str; } @@ -1415,9 +1402,9 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { DynamicDataSourceContextHolder.push("ds_" + wmsSellOutEmbryo.getFactoryCode()); try { wmsSellOutEmbryo.setActiveFlag("1"); - List wmsSellOutEmbryoList= wmsSellOutEmbryoMapper.selectWmsSellOutEmbryoListTS(wmsSellOutEmbryo); + List wmsSellOutEmbryoList = wmsSellOutEmbryoMapper.selectWmsSellOutEmbryoListTS(wmsSellOutEmbryo); return wmsSellOutEmbryoList; - }finally { + } finally { DynamicDataSourceContextHolder.poll(); } @@ -1427,10 +1414,10 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { @Override @DS("#header.poolName") public String handleUpdateSAP102(List wmsProductPutList) { - String result="操作成功"; + String result = "操作成功"; - for (WmsProductPut wmsProductPut: wmsProductPutList){ - WmsProductPut wmsProductPut1= wmsProductPutMapper.selectWmsProductPutByIdANDStatus(wmsProductPut.getId()); + for (WmsProductPut wmsProductPut : wmsProductPutList) { + WmsProductPut wmsProductPut1 = wmsProductPutMapper.selectWmsProductPutByIdANDStatus(wmsProductPut.getId()); //LFBJA //LFBNR //LFPOS @@ -1441,26 +1428,26 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { //WERKS //LGORT //这个地方 - Map paramMap=new HashMap<>(); + Map paramMap = new HashMap<>(); List mapList = new ArrayList<>(); - paramMap.put("AUFNR",wmsProductPut1.getProductOrder());//单号 - paramMap.put("WERKS",wmsProductPut1.getFactoryCode());//工厂 - paramMap.put("LGORT",wmsProductPut1.getWhCode());//库存地点 - // paramMap.put("STCK_TYPE",wmsProductPut1.getPoLine());//采购凭证的项目编号 - paramMap.put("MATNR",wmsProductPut1.getProductCode());//物料号 - paramMap.put("QUANTITY",wmsProductPut1.getPlanQuantity());//数量 - paramMap.put("ERFME",wmsProductPut1.getUnitOfMeasure());//条目单位 - paramMap.put("BATCH",wmsProductPut1.getAttr4());//批号 + paramMap.put("AUFNR", wmsProductPut1.getProductOrder());//单号 + paramMap.put("WERKS", wmsProductPut1.getFactoryCode());//工厂 + paramMap.put("LGORT", wmsProductPut1.getWhCode());//库存地点 + // paramMap.put("STCK_TYPE",wmsProductPut1.getPoLine());//采购凭证的项目编号 + paramMap.put("MATNR", wmsProductPut1.getProductCode());//物料号 + paramMap.put("QUANTITY", wmsProductPut1.getPlanQuantity());//数量 + paramMap.put("ERFME", wmsProductPut1.getUnitOfMeasure());//条目单位 + paramMap.put("BATCH", wmsProductPut1.getAttr4());//批号 mapList.add(paramMap); - R result2 = remoteSapService.handleUpdateSAP102(mapList); - if (result2.getCode()==200){ + R result2 = remoteSapService.handleUpdateSAP102(mapList); + if (result2.getCode() == 200) { // //应该是修改订单，然后修改库存 Map map = new HashMap(); map = (Map) result2.getData(); String MATERIALDOCUMENT = (String) map.get("MATERIALDOCUMENT"); String MATDOCUMENTYEAR = (String) map.get("MATDOCUMENTYEAR"); //成功了--成功了,根据 - WmsProductPut wmsProductPut2=new WmsProductPut();//成品生产入库对象 + WmsProductPut wmsProductPut2 = new WmsProductPut();//成品生产入库对象 // List wmsRawOrderInSnList= wmsProductPutMapper.selectWmsProductPutList(wmsProductPut2); // for (WmsRawOrderInSn wmsRawOrderInSn1: @@ -1482,7 +1469,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { // wmsOdsMateStorageNews.setStorageAmount(wmsRawOrderInSn1.getAmount()); // wmsOdsMateStorageNewsMapper.updateWmsOdsMateStorageNewsUpdateStorageAmount(wmsOdsMateStorageNews); // } - wmsProductPut2= wmsProductPut1; + wmsProductPut2 = wmsProductPut1; // wmsProductPut2.setPutQuantity(new BigDecimal("0")); wmsProductPut2.setSapStatus("0");//暂收 wmsProductPut2.setAttr5(MATERIALDOCUMENT); @@ -1491,10 +1478,10 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { wmsProductPutMapper.updateWmsProductPut(wmsProductPut2); - }else { + } else { //失败了 - WmsProductPut wmsProductPut2=new WmsProductPut();//成品生产入库对象 - wmsProductPut2= wmsProductPut1; + WmsProductPut wmsProductPut2 = new WmsProductPut();//成品生产入库对象 + wmsProductPut2 = wmsProductPut1; // wmsProductPut2.setPutQuantity(new BigDecimal("0")); //wmsProductPut2.setSapStatus("0");//暂收 // wmsProductPut2.setAttr5(MATERIALDOCUMENT); @@ -1502,17 +1489,18 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { wmsProductPut2.setAttr7(result2.getMsg()); wmsProductPutMapper.updateWmsProductPut(wmsProductPut2); - } + } } return result; } + @Override public List FinishedProductSalesReturn(WmsRuturnPutEmbryo wmsRuturnPutEmbryo) { DynamicDataSourceContextHolder.push("ds_" + wmsRuturnPutEmbryo.getFactoryCode()); try { - List wmsRuturnPutEmbryoList= wmsRuturnPutEmbryoMapper.selectWmsRuturnPutEmbryo(wmsRuturnPutEmbryo); + List wmsRuturnPutEmbryoList = wmsRuturnPutEmbryoMapper.selectWmsRuturnPutEmbryo(wmsRuturnPutEmbryo); return wmsRuturnPutEmbryoList; - }finally { + } finally { DynamicDataSourceContextHolder.poll(); } @@ -1530,9 +1518,9 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { //wms_product_put wmsRuturnPutEmbryo1.setId(wmsRuturnPutEmbryo.getId()); //先查询一下，看看这次是不是可以出完 - WmsRuturnPutEmbryo wmsRuturnPutEmbryo2= wmsRuturnPutEmbryoMapper.selectWmsRuturnPutEmbryoByid(wmsRuturnPutEmbryo1); - BigDecimal allTem= wmsRuturnPutEmbryo2.getPlanQuantity(); - BigDecimal putTem= wmsRuturnPutEmbryo2.getPutQuantity(); + WmsRuturnPutEmbryo wmsRuturnPutEmbryo2 = wmsRuturnPutEmbryoMapper.selectWmsRuturnPutEmbryoByid(wmsRuturnPutEmbryo1); + BigDecimal allTem = wmsRuturnPutEmbryo2.getPlanQuantity(); + BigDecimal putTem = wmsRuturnPutEmbryo2.getPutQuantity(); //BigDecimal putQuantity= putTem.add(new BigDecimal(wmsRuturnPutEmbryo.get())); int result = wmsRuturnPutEmbryo.getPutQuantity().compareTo(allTem); if (result == 0) { @@ -1604,7 +1592,7 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { } } return SUCCESS; - }finally { + } finally { DynamicDataSourceContextHolder.poll(); } @@ -1614,9 +1602,9 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { public List selectFinishedProductTransferAndOutbound(WmsAllocationOutEmbryo wmsAllocationOutEmbryo) { DynamicDataSourceContextHolder.push("ds_" + wmsAllocationOutEmbryo.getFactoryCode()); try { - List wmsAllocationOutEmbryoList= wmsSellOutEmbryoMapper.selectWmsAllocationOutEmbryoList(wmsAllocationOutEmbryo); + List wmsAllocationOutEmbryoList = wmsSellOutEmbryoMapper.selectWmsAllocationOutEmbryoList(wmsAllocationOutEmbryo); return wmsAllocationOutEmbryoList; - }finally { + } finally { DynamicDataSourceContextHolder.poll(); } @@ -1624,43 +1612,43 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { @Override public String confirmFinishedProductTransferAndOutbound(WmsAllocationOutEmbryo wmsRuturnPutEmbryo) { - String result1="出库成功"; + String result1 = "出库成功"; DynamicDataSourceContextHolder.push("ds_" + wmsRuturnPutEmbryo.getFactoryCode()); try { - List wmsProductPutTrayCodeList= wmsRuturnPutEmbryo.getWmsProductPutTrayCodeList(); + List wmsProductPutTrayCodeList = wmsRuturnPutEmbryo.getWmsProductPutTrayCodeList(); //成品销售出库--确认接口---修改出库单，--出库库存 - WmsAllocationOutEmbryo wmsSellOutEmbryo1 = wmsSellOutEmbryoMapper.selectWmsAllocationOutEmbryoById(wmsRuturnPutEmbryo.getId()); - Integer tem= wmsProductPutTrayCodeList.size(); - BigDecimal OutQuantity= wmsSellOutEmbryo1.getOutQuantity().add(new BigDecimal(tem));//2 + WmsAllocationOutEmbryo wmsSellOutEmbryo1 = wmsSellOutEmbryoMapper.selectWmsAllocationOutEmbryoById(wmsRuturnPutEmbryo.getId()); + Integer tem = wmsProductPutTrayCodeList.size(); + BigDecimal OutQuantity = wmsSellOutEmbryo1.getOutQuantity().add(new BigDecimal(tem));//2 int result = wmsSellOutEmbryo1.getPlanQuantity().compareTo(OutQuantity); - WmsAllocationOutEmbryo wmsAllocationOutEmbryo=new WmsAllocationOutEmbryo(); - if (result == 0){//出库完 + WmsAllocationOutEmbryo wmsAllocationOutEmbryo = new WmsAllocationOutEmbryo(); + if (result == 0) {//出库完 wmsAllocationOutEmbryo.setStatus("1"); - }else { + } else { wmsAllocationOutEmbryo.setStatus("0"); } wmsAllocationOutEmbryo.setId(wmsRuturnPutEmbryo.getId()); wmsAllocationOutEmbryo.setOutQuantity(OutQuantity); wmsSellOutEmbryoMapper.updateWmsAllocationOutEmbryo(wmsAllocationOutEmbryo); //订单修改完成 - for(WmsProductPutTrayCode wmsProductPutTrayCode: wmsProductPutTrayCodeList){ + for (WmsProductPutTrayCode wmsProductPutTrayCode : wmsProductPutTrayCodeList) { //库存修改 //解除绑定 wmsProductPutTrayCode.setRelatStatus("0"); wmsProductPutTrayCodeMapper.updateWmsProductPutTrayCode(wmsProductPutTrayCode); //改明细 - WmsFpStorageNewsSn wmsFpStorageNewsSn=new WmsFpStorageNewsSn(); + WmsFpStorageNewsSn wmsFpStorageNewsSn = new WmsFpStorageNewsSn(); wmsFpStorageNewsSn.setSn(wmsProductPutTrayCode.getSn()); wmsFpStorageNewsSn.setWlCode(wmsProductPutTrayCode.getWlCode()); wmsFpStorageNewsSn.setActiveFlag("1"); wmsFpStorageNewsSn.setProductCode(wmsSellOutEmbryo1.getProductCode()); wmsFpStorageNewsSnMapper.updateWmsFpStorageNewsSnOut(wmsFpStorageNewsSn); //判断如果托盘数据被出完，就关闭这个明细 - List wmsFpStorageNewsSns= wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnList(wmsFpStorageNewsSn); - if (wmsFpStorageNewsSns.size()>0){ - WmsFpStorageNewsSn wmsFpStorageNewsSn1= wmsFpStorageNewsSns.get(0); + List wmsFpStorageNewsSns = wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnList(wmsFpStorageNewsSn); + if (wmsFpStorageNewsSns.size() > 0) { + WmsFpStorageNewsSn wmsFpStorageNewsSn1 = wmsFpStorageNewsSns.get(0); - BigDecimal ken= new BigDecimal(wmsFpStorageNewsSn1.getUserDefined2()); + BigDecimal ken = new BigDecimal(wmsFpStorageNewsSn1.getUserDefined2()); int comparisonResult = ken.compareTo(wmsFpStorageNewsSn1.getAmount()); if (comparisonResult == 0) { // ken和amount相等 @@ -1669,14 +1657,14 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { } } //改主表 - WmsFpStorageNews wmsFpStorageNews=new WmsFpStorageNews(); + WmsFpStorageNews wmsFpStorageNews = new WmsFpStorageNews(); wmsFpStorageNews.setActiveFlag("1"); wmsFpStorageNews.setWlCode(wmsProductPutTrayCode.getWlCode()); wmsFpStorageNews.setProductCode(wmsSellOutEmbryo1.getProductCode()); wmsFpStorageNewsMapper.updateWmsFpStorageNewsOut(wmsFpStorageNews); } return result1; - }finally { + } finally { DynamicDataSourceContextHolder.poll(); } @@ -1687,11 +1675,11 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { DynamicDataSourceContextHolder.push("ds_" + wmsFpStorageNewsSn.getFactoryCode()); try { wmsFpStorageNewsSn.setActiveFlag("1"); - List wmsFpStorageNewsSnList= wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnList(wmsFpStorageNewsSn); - if (wmsFpStorageNewsSnList.size()>0){ - return wmsFpStorageNewsSnList.get(0); + List wmsFpStorageNewsSnList = wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnList(wmsFpStorageNewsSn); + if (wmsFpStorageNewsSnList.size() > 0) { + return wmsFpStorageNewsSnList.get(0); } - }finally { + } finally { DynamicDataSourceContextHolder.poll(); } @@ -1700,16 +1688,16 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { @Override public String palletTransferConfirmation(WmsFpStorageNewsSn wmsFpStorageNewsSn) { - String result1="移库成功"; + String result1 = "移库成功"; DynamicDataSourceContextHolder.push("ds_" + wmsFpStorageNewsSn.getFactoryCode()); try { - String toWlCode=wmsFpStorageNewsSn.getTowlCode(); - WmsFpStorageNewsSn wmsFpStorageNewsSn1= wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnByStorageId(wmsFpStorageNewsSn.getStorageId()); + String toWlCode = wmsFpStorageNewsSn.getTowlCode(); + WmsFpStorageNewsSn wmsFpStorageNewsSn1 = wmsFpStorageNewsSnMapper.selectWmsFpStorageNewsSnByStorageId(wmsFpStorageNewsSn.getStorageId()); //减库存明细 wmsFpStorageNewsSn1.setActiveFlag("0"); wmsFpStorageNewsSnMapper.updateWmsFpStorageNewsSn(wmsFpStorageNewsSn1); //减库存 - WmsFpStorageNews wmsFpStorageNews= wmsFpStorageNewsMapper.selectWmsFpStorageNewsByProductCodeAndWlCode(wmsFpStorageNewsSn.getProductCode(),wmsFpStorageNewsSn.getWlCode()); + WmsFpStorageNews wmsFpStorageNews = wmsFpStorageNewsMapper.selectWmsFpStorageNewsByProductCodeAndWlCode(wmsFpStorageNewsSn.getProductCode(), wmsFpStorageNewsSn.getWlCode()); BigDecimal amount = wmsFpStorageNews.getAmount(); BigDecimal amountsub = amount.subtract(wmsFpStorageNewsSn1.getAmount()); wmsFpStorageNews.setAmount(amountsub); @@ -1755,12 +1743,13 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { } else { wmsFpStorageNewsMapper.insertWmsFpStorageNews(wmsFpStorageNews1); } - }finally { + } finally { DynamicDataSourceContextHolder.poll(); } return result1; } + /** * 查询成品退货入库列表 * @@ -1774,24 +1763,68 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService { } - - - //去除空格，截取规则，例子：20270106LJ20240107CBCD0J——》240107CBCD - public String InterceptionRules(String batchString){ - boolean containsSpace = batchString.contains(" "); - if (containsSpace) {//去除空格 - batchString = batchString.replace(" ", ""); + /** + * TODO: 入库批次生成规则 + * + *

处理逻辑： + *

    + *
  • 长度11：截取第3位起全部字符（索引2~末尾）
    • + *
  • 长度13/14：截取第3位至倒数第3位（索引2~倒数第3位）
    • + *
  • 长度16：截取第3-8位字符（索引2~7）
    • + *
  • 长度22：截取后11位字符（索引11~末尾）
    • + *
  • 长度24：截取第13-22位字符（索引12~倒数第3位）
    • + *
  • 其他长度：返回清理空格后的原始字符串
    • + *
+ * + *

示例： + * 

+     *   InterceptionRules("AB123456789") → "123456789"  // 11位：去前2位
+     *   InterceptionRules("AB123456789XY") → "123456789"  // 14位：去头尾各2位
+     *   InterceptionRules("AB123456CDEFGHIJ") → "123456"  // 16位：取中间6位
+     *
+ * + * @param input + * @return String + * @auther huangjinxian + * @version 1.0 + * @see String + */ + public String InterceptionRules(String input) { + if (StringUtils.isBlank(input)) { + return input; + } + String clean = input.replace(" ", ""); + int len = clean.length(); + switch (len) { + case 11: { + return clean.substring(2); + } + case 13: + case 14: { + return clean.substring(2, len - 2); + } + case 16:{ + return clean.substring(2, 8); + } + case 22:{ + return clean.substring(11); + } + case 24:{ + return clean.substring(12, len - 2); + } + default: + return clean; } - batchString =batchString.substring(12,22); - return batchString; } + + //去除空格，截取规则，例子：20270106LJ20240107CBCD0J——》240107CBCD - public String InterceptionSJRules(String batchString){ + public String InterceptionSJRules(String batchString) { boolean containsSpace = batchString.contains(" "); if (containsSpace) {//去除空格 batchString = batchString.replace(" ", ""); } batchString = batchString.substring(10, 18); - return batchString; + return batchString; } }