From e7a59235b41425b981b6d3ba99fde47e5b7584b6 Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期三, 30 七月 2025 09:59:27 +0800 Subject: [PATCH] * --- src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 41 +++++++++++++++++++++++++++++++++++------ 1 files changed, 35 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java index 39f9afb..35f4abc 100644 --- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java +++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java @@ -2,10 +2,7 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.Wrapper; -import com.core.common.Cools; -import com.core.common.DateUtils; -import com.core.common.R; -import com.core.common.SnowflakeIdWorker; +import com.core.common.*; import com.core.exception.CoolException; import com.zy.asrs.entity.*; import com.zy.asrs.entity.param.*; @@ -80,6 +77,8 @@ private StaDescService staDescService; @Autowired private LocMastService locMastService; + @Autowired + private RgvOneSignService rgvOneSignService; @Override @Transactional @@ -781,6 +780,20 @@ throw new CoolException("鎵樼洏鏉$爜锛�"+param.getBarcode()+"宸插瓨鍦紝璇峰嬁閲嶅缁勬墭"); } + try{ + int rgvOneType = rgvOneSignService.selectCount(new EntityWrapper<RgvOneSign>().eq("rgv_one_type", param.getPalletizingNo() + "barcode" + param.getBarcode())); + if (rgvOneType==0){ + RgvOneSign rgvOneSign = new RgvOneSign(); + rgvOneSign.setRgvOneSign(param.getPalletizingNo()); + rgvOneSign.setRgvOneType(param.getPalletizingNo() + "barcode" + param.getBarcode()); + boolean insert = rgvOneSignService.insert(rgvOneSign); + if (!insert){ + throw new CoolException("鎵樼洏鐮佹爣璁版坊鍔犲け璐ワ紝璇烽噸鏂颁笅鍙戯紒锛侊紒"); + } + } + }catch (Exception e){ + throw new CoolException("鎵樼洏鐮佹爣璁版坊鍔犲紓甯革紝璇烽噸鏂颁笅鍙戯紒锛侊紒"); + } Date now = new Date(); for (PalletizingCompleteTwoFloorParam.MatList matList:param.getMatList()){ @@ -803,13 +816,24 @@ waitPakin.sync(mat); waitPakin.setBatch(matList.getBatch()); //鏈ㄧ缂栫爜 //鎵规 鍞竴鍊� 绠卞彿 waitPakin.setModel(matList.getModel()); //鍗峰彿 鍞竴鍊� - waitPakin.setBrand(param.getBoxType()); //鏈ㄧ绫诲瀷 + String boxType = param.getBoxType(); + try{ + BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class); + BasBoxType basBoxType = basBoxTypeService.selectOne(new EntityWrapper<BasBoxType>().eq("box_specs", boxType)); + if (!Cools.isEmpty(basBoxType)){ + boxType = basBoxType.getBoxType(); + } + } catch (Exception e){ + + } + waitPakin.setBrand(boxType); //鏈ㄧ绫诲瀷 waitPakin.setZpallet(param.getBarcode()); //鎵樼洏鐮� waitPakin.setOrigin(matList.getPosition()); //鏈ㄧ鍦ㄦ墭鐩樹笂鐨勪綅缃� waitPakin.setWeight(matList.getWeight()); //鍑�閲� waitPakin.setVolume(matList.getRoughWeight()); //姣涢噸 waitPakin.setPrice(matList.getRollExtent()); //闀垮害 waitPakin.setSpecs(String.valueOf(matList.getJoint())); //鎺ュご + waitPakin.setDanger(matList.getQualified()); //寰呭垽 waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵�� waitPakin.setAnfme(matList.getAnfme()); // 鏁伴噺 waitPakin.setStatus("Y"); // 鐘舵�� @@ -820,6 +844,11 @@ if (!waitPakinService.insert(waitPakin)) { throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗eけ璐�"); } + + RgvOneSign armNo = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","armNo"+param.getPalletizingNo())); + armNo.setRgvOneSign(1); + rgvOneSignService.updateById(armNo); + } } @@ -973,7 +1002,7 @@ throw new CoolException("鍙傛暟锛氭浠诲姟鏈笂鎶ョ姝㈠畬鎴愶細"+param.getBarcode()); } - wrkMastMatrix.setSheetNo("2"); + wrkMastMatrix.setSheetNo("3"); if (!wrkMastService.updateById(wrkMastMatrix)){ throw new CoolException("鏇存柊宸ヤ綔妗eけ璐�==銆嬫鏋朵笂浣嶈蒋浠讹細鍗曟墭鎷嗗灈瀹屾垚閫氱煡"); } -- Gitblit v1.9.1