From ffa9b04fbb25726c77458da5607c1b43bdd62603 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期二, 15 七月 2025 08:25:46 +0800 Subject: [PATCH] no message --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java | 37 ++++++++++++------------------------- 1 files changed, 12 insertions(+), 25 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java index 44c66d2..4033ee4 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java @@ -10,14 +10,13 @@ import com.vincent.rsf.framework.common.Cools; import com.vincent.rsf.framework.common.R; import com.vincent.rsf.framework.exception.CoolException; +import com.vincent.rsf.server.manager.entity.WkOrder; import com.vincent.rsf.server.manager.enums.OrderType; import com.vincent.rsf.server.manager.enums.OrderWorkType; import com.vincent.rsf.server.common.domain.BaseParam; import com.vincent.rsf.server.common.domain.PageParam; -import com.vincent.rsf.server.common.utils.CommonUtil; import com.vincent.rsf.server.common.utils.ExcelUtil; import com.vincent.rsf.server.common.utils.FieldsUtils; -import com.vincent.rsf.server.manager.entity.AsnOrder; import com.vincent.rsf.server.manager.entity.Companys; import com.vincent.rsf.server.manager.entity.Matnr; import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate; @@ -96,9 +95,6 @@ public synchronized R excelImport(MultipartFile file, HashMap<String, Object> hashMap, Long loginUserId) throws Exception { ExcelImportResult result = ExcelImportUtil.importExcelMore(file.getInputStream(), AsnOrderTemplate.class, ExcelUtil.getDefaultImportParams()); if (result.getList().isEmpty()) { - throw new CoolException("鐗╂枡瀵煎叆澶辫触锛侊紒"); - } - if (result.getList().isEmpty()) { throw new CoolException("琛ㄦ牸鍐呭涓嶈兘涓虹┖锛侊紒"); } List<AsnOrderTemplate> resultList = result.getList(); @@ -109,12 +105,12 @@ throw new CoolException("鍗曞彿涓嶈兘涓虹┖锛侊紒"); } AsnOrderTemplate template = listMap.get(key).stream().findFirst().get(); - AsnOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, key)); + WkOrder order = asnOrderMapper.getOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, key)); if (!Objects.isNull(order)) { sbFaild.append(template.getCode()).append(",宸叉坊鍔狅紒锛�"); throw new CoolException(sbFaild.toString()); } - order = new AsnOrder(); + order = new WkOrder(); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); Date date = dateFormat.parse(template.getArrTime()); if (Objects.isNull(date)) { @@ -134,6 +130,7 @@ .setMemo(template.getMemo()) .setArrTime(date) .setUpdateBy(loginUserId) + .setLogisNo(template.getLogicNo()) .setCreateBy(loginUserId) .setType(OrderType.getTypeVal(template.getType())) .setWkType(OrderWorkType.getWorkType(template.getWkType())); @@ -171,6 +168,9 @@ .setIsptResult(QlyIsptResult.getDescVal(orderTemplate.getIsptResult())) // .setTrackCode(trackCode) .setBarcode(trackCode) + .setPlatOrderCode(orderTemplate.getPlatOrderCode()) + .setPlatWorkCode(orderTemplate.getPlatWorkCode()) + .setProjectCode(orderTemplate.getProjectCode()) .setPoCode(orderTemplate.getPoCode()) .setPurUnit(matnr.getUnit()) .setCreateBy(loginUserId) @@ -203,10 +203,10 @@ if (!items.isEmpty()) { // double qty = items.stream().mapToDouble(AsnOrderItem::getQty).sum(); double anfme = items.stream().mapToDouble(AsnOrderItem::getAnfme).sum(); - if (!asnOrderMapper.update(new LambdaUpdateWrapper<AsnOrder>() + if (!asnOrderMapper.update(new LambdaUpdateWrapper<WkOrder>() // .set(AsnOrder::getQty, qty) - .set(AsnOrder::getAnfme, anfme) - .eq(AsnOrder::getId, order.getId()))) { + .set(WkOrder::getAnfme, anfme) + .eq(WkOrder::getId, order.getId()))) { throw new CoolException("鍗曟嵁鏁伴噺淇敼澶辫触锛侊紒"); } } @@ -227,11 +227,6 @@ @Transactional(rollbackFor = Exception.class) public boolean fieldsSave(Map<String, Object> params, Long loginUserId) { AsnOrderItem asnOrderItem = JSONObject.parseObject(JSONObject.toJSONString(params), AsnOrderItem.class); - asnOrderItem.setUpdateBy(loginUserId).setCreateBy(loginUserId); -// if (StringUtils.isBlank(asnOrderItem.getTrackCode())) { -// String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LABEL_CODE, asnOrderItem); -// asnOrderItem.setTrackCode(ruleCode).setBarcode(ruleCode); -// } if (StringUtils.isNoneBlank(asnOrderItem.getSplrCode())) { Companys companys = companysService.getOne(new LambdaQueryWrapper<Companys>() .eq(Companys::getId, asnOrderItem.getSplrCode()) @@ -243,20 +238,11 @@ if (Objects.isNull(asnOrderItem.getAnfme()) || Double.compare(asnOrderItem.getAnfme(), 0.0) <= 0) { throw new CoolException("璁″垝鏁颁笉鑳戒负绌猴紒锛�"); } -// if (StringUtils.isBlank(asnOrderItem.getSplrBatch())) { -// throw new CoolException("渚涘簲鍟嗘壒娆′笉鑳戒负绌猴紒锛�"); -// } //淇濆瓨鎵╁睍瀛楁 try { StringBuffer sb = new StringBuffer(); if (Objects.isNull(asnOrderItem.getFieldsIndex()) || StringUtils.isBlank(asnOrderItem.getFieldsIndex())) { - if (!Objects.isNull(asnOrderItem.getExtendFields()) && !asnOrderItem.getExtendFields().isEmpty()) { - Map<String, String> fields = asnOrderItem.getExtendFields(); - asnOrderItem.getExtendFields().keySet().forEach(key -> { - sb.append(fields.get(key)); - }); - } - sb.append(asnOrderItem.getAsnCode() + asnOrderItem.getMatnrId() + asnOrderItem.getSplrBatch() + asnOrderItem.getIsptResult$()); + sb.append(asnOrderItem.getMatnrId() + asnOrderItem.getSplrBatch() ); //鑾峰彇16浣島uid String uuid16 = Cools.md5Chinese(sb.toString()); asnOrderItem.setFieldsIndex(uuid16); @@ -267,6 +253,7 @@ } catch (Exception e) { throw new RuntimeException(e); } + asnOrderItem.setUpdateBy(loginUserId).setCreateBy(loginUserId); if (!this.saveOrUpdate(asnOrderItem)) { throw new CoolException("鏀惰揣閫氱煡鍗曟槑缁嗕繚瀛樺け璐ワ紒锛�"); } -- Gitblit v1.9.1