From 111a401f033749c965f02f58c586a8feafd9afd1 Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期一, 27 十一月 2023 11:23:46 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/controller/MixingPlantNewScheduled.java | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 45 insertions(+), 0 deletions(-)
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/controller/MixingPlantNewScheduled.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/controller/MixingPlantNewScheduled.java
index bcd04d3..c70f37a 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/controller/MixingPlantNewScheduled.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/controller/MixingPlantNewScheduled.java
@@ -4,6 +4,7 @@
import com.thhy.materials.modules.biz.concret.entity.dto.DicetName;
import com.thhy.materials.modules.biz.concret.entity.dto.TMinxingPlant;
import com.thhy.materials.modules.biz.concret.entity.dto.WeighDto;
+import com.thhy.materials.modules.biz.weigh.entity.TWeighbridge;
import com.thhy.materials.modules.biz.weigh.mapper.WeighMapper;
import com.thhy.materials.modules.biz.weigh.service.WeighService;
import org.redisson.api.RLock;
@@ -192,6 +193,50 @@
}
+ //苏州项目------- 地磅入库 记录，及库存修改
+ @Scheduled(fixedRate = 2000000) // 每隔3秒执行一次任务
+ public void weighbridge() {
+ //查询搅拌 所有类型
+ List<DicetName> dictList = weighService.dictList();
+ List<TWeighbridge> tWeighbridges = weighMapper.weighbridgeListType();
+ for (DicetName dicetName : dictList){
+ for (TWeighbridge weighbridge :tWeighbridges){
+ if(dicetName.getDictName().equals(weighbridge.getMatname())){
+ //开始的库存
+ Double materialValue = weighMapper.materialStockValue(dicetName.getDictId());
+ //净重
+ String jweight = weighbridge.getJweight();
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("id","");
+ hashMap.put("type",1);
+ hashMap.put("opType",1);
+ hashMap.put("materialName",dicetName.getDictId());
+ hashMap.put("materialValue",Double.valueOf(jweight));
+ hashMap.put("beforeStock",materialValue);
+ BigDecimal b1 = new BigDecimal(jweight);
+ BigDecimal b2 = new BigDecimal(materialValue);
+ double v1 = b1.add(b2).doubleValue();
+ hashMap.put("afterStock",v1);
+ hashMap.put("companyId","031e3dd577e8ed28e96aa69b");
+ RLock lock = redissonclient.getLock("materlock");
+ if(!lock.isLocked()) {
+ lock.lock(10, TimeUnit.SECONDS);
+ //插入记录表//苏州项目（入库计入增加）
+ weighMapper.materialStockRecordIns(hashMap);
+ //更改记录值
+ weighMapper.materialStockRecordUp(dicetName.getDictId(),b1.add(b2).doubleValue());
+ lock.unlock();
+ }
+
+ weighMapper.weighbridgeUpdateType(weighbridge.getWeighbridgeId());
+ }
+ }
+
+
+ }
+
+
+ }
}
--
Gitblit v1.9.3