From 54d271cb931f95976993eb69b1b71b91c65ebcc8 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 26 Aug 2022 10:09:30 +0800
Subject: [PATCH] 增加秧苗方式，修正今年农资使用量为0的问题
---
src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java b/src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java
index 8c8b82c..bbab6d4 100644
--- a/src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java
+++ b/src/main/java/org/springblade/modules/stockrecord/controller/StockrecordController.java
@@ -105,8 +105,13 @@
String s = specs + dic1 + "/" + dic2;
//出库
if (pages.getRecords().get(i).getStockType1() == 0) {
- String count = "-" + pages.getRecords().get(i).getAmount1() + dic2;
- pages.getRecords().get(i).setCount(count);
+ if (pages.getRecords().get(i).getType1().equals("4")){
+ String count = "+" + pages.getRecords().get(i).getAmount1() + dic2;
+ pages.getRecords().get(i).setCount(count);
+ }else {
+ String count = "-" + pages.getRecords().get(i).getAmount1() + dic2;
+ pages.getRecords().get(i).setCount(count);
+ }
} else {
String count = "+" + pages.getRecords().get(i).getAmount1() + dic2;
pages.getRecords().get(i).setCount(count);
@@ -144,6 +149,7 @@
@ApiOperation(value = "新增", notes = "传入stockrecord")
public R save(@Valid @RequestBody StockrecordVO stockrecord) {
Integer stockType1 = stockrecord.getStockType1();
+ //0出库 1入库
//出库
if (stockType1 == 0) {
//库存量
@@ -193,8 +199,8 @@
stock.setState("1");
stockService.UpdaeAmountc(stock);
//同时删除所有农资记录
- soldrecordService.delc(stockrecord.getStockId1());
- soldrService.del(stockrecord.getSid());
+// soldrecordService.delc(stockrecord.getStockId1());
+// soldrService.del(stockrecord.getSid());
} else {
stock.setState("0");
stockService.UpdaeAmountc(stock);
@@ -209,7 +215,7 @@
soldrecord.setType(stockrecord.getType1());
soldrecord.setSid(stockrecord.getSid());
String type1 = stockrecord.getType1();
- if (type1.equals("0")) {
+ if (type1.equals("0")) { //0 采购入库
//已出库农资数量记录
Soldr soldr = new Soldr();
soldr.setSid(stockrecord.getSid());
@@ -222,8 +228,8 @@
soldr.setCensus(v);
soldr.setDeptId(stockrecord.getDeptId());
//已出库农资数量
- List<Map<String, Object>> maps = soldrService.selectCz(stockrecord.getSid());
- if (maps.size()!=0) {
+ List<Map<String, Object>> maps = soldrService.selectCz(stockrecord.getSid(),stockrecord.getDeptId());
+ if (maps.size()!=0) {//已出库存表中有重复的
String a = maps.get(0).get("amount1").toString();
Integer amount11=Integer.parseInt(a);
String amount12 = maps.get(0).get("amount1").toString();
--
Gitblit v1.9.3