From e5cd5597aad68f294fcfff465e0a312713804c0d Mon Sep 17 00:00:00 2001
From: shishuaikang <280848880@qq.com>
Date: 星期二, 12 十二月 2023 13:40:25 +0800
Subject: [PATCH] h5大屏伴和站样式修改
---
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/impl/TMaterialReleaseServiceImpl.java | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/impl/TMaterialReleaseServiceImpl.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/impl/TMaterialReleaseServiceImpl.java
index 3f9021f..778f6af 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/impl/TMaterialReleaseServiceImpl.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/impl/TMaterialReleaseServiceImpl.java
@@ -1,5 +1,6 @@
package com.thhy.materials.modules.biz.concret.service.impl;
+import com.alibaba.nacos.api.utils.StringUtils;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.thhy.general.common.BasicResult;
@@ -213,7 +214,7 @@
PageHelper.startPage(pageNum,pageSize);
List<PieceDto> pieceDtos = materialReleaseMappper.pieceList(values);
for (PieceDto pieceDto : pieceDtos){
- List<TRawMaterial> rawMaterials = materialReleaseMappper.materialRew(pieceDto.getById());
+ List<TRawMaterial> rawMaterials = materialReleaseMappper.materialRew(pieceDto.getById(),pieceDto.getTypes());
pieceDto.setRawMaterials(rawMaterials);
}
PageInfo<PieceDto> pieceDtoPageInfo = new PageInfo<>(pieceDtos);
@@ -256,15 +257,19 @@
@Override
@Transactional
public BasicResult mixingConsumeIn(Map<String, Object> values) {
- values.put("mixingSignboardId","");
- materialReleaseMappper.mixingConsumeIn(values);
+// values.put("mixingSignboardId","");
+// materialReleaseMappper.mixingConsumeIn(values);
String mixingSignboardId = values.get("mixingSignboardId").toString();
Integer star = materialReleaseMappper.starInt();
List<Map<String,Object>> mixingConsumes = (List<Map<String,Object>>) values.get("mixingConsume");
for (Map<String,Object> mixingConsume :mixingConsumes){
mixingConsume.put("mixingSignboardId",mixingSignboardId);
- mixingConsume.put("star",star+1);
- mixingConsume.put("mixingConsumeId","");
+ if(star!=null){
+ mixingConsume.put("star",star+1);
+ }else {
+ mixingConsume.put("star",1);
+ }
+ //mixingConsume.put("mixingConsumeId","");
materialReleaseMappper.mixingConsumeInTwo(mixingConsume);
}
return BasicResult.success();
@@ -278,6 +283,7 @@
List<TMixingSignboard> mixingSignboards = materialReleaseMappper.mixingSignboardList(values);
for (TMixingSignboard mixingSignboard : mixingSignboards){
Integer star = materialReleaseMappper.starIntSig(mixingSignboard.getMixingSignboardId());
+ //values.put("")
List<TMixingConsume> mixingConsumes = materialReleaseMappper.mixingConsumes(mixingSignboard.getMixingSignboardId(),star);
mixingSignboard.setTMixingConsumes(mixingConsumes);
}
@@ -320,4 +326,29 @@
}
return BasicResult.success();
}
+
+ @Override
+ public BasicResult mixingConsumeUp(Map<String, Object> values) {
+ String mixingSignboardId = values.get("mixingSignboardId").toString();
+ Integer star = materialReleaseMappper.starInt();
+ materialReleaseMappper.mixingConsumeDelSign(mixingSignboardId,star);
+ List<Map<String,Object>> mixingConsumes = (List<Map<String,Object>>) values.get("mixingConsume");
+ for (Map<String,Object> mixingConsume :mixingConsumes){
+ mixingConsume.put("mixingSignboardId",mixingSignboardId);
+ mixingConsume.put("star",star);
+ //mixingConsume.put("mixingConsumeId","");
+ materialReleaseMappper.mixingConsumeInTwo(mixingConsume);
+ }
+ return BasicResult.success();
+ }
+
+ @Override
+ public BasicResult mixingConsumeDel(HashMap<String, Object> values) {
+ Integer star = Integer.valueOf(values.get("star").toString());
+ List<String> mixingConsumeIds = (List<String>) values.get("mixingConsumeIds");
+ for (String mixingConsumeId : mixingConsumeIds){
+ materialReleaseMappper.mixingConsumeDel(mixingConsumeId,star);
+ }
+ return BasicResult.success();
+ }
}
--
Gitblit v1.9.3