From b8dc4ccc6ee580b084aa860e64af2d90d1cb5979 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期三, 29 十一月 2023 10:11:52 +0800
Subject: [PATCH] feat: 1、首页接口对接 2、部门物品分发
---
consum-base/src/main/java/com/consum/base/core/WarehouseCoreService.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/core/WarehouseCoreService.java b/consum-base/src/main/java/com/consum/base/core/WarehouseCoreService.java
index 5946a9f..96d5f9f 100644
--- a/consum-base/src/main/java/com/consum/base/core/WarehouseCoreService.java
+++ b/consum-base/src/main/java/com/consum/base/core/WarehouseCoreService.java
@@ -1,14 +1,16 @@
package com.consum.base.core;
-import com.consum.base.core.tools.SqlParameter;
-import com.consum.base.core.util.DateUtil;
+import com.consum.base.core.param.BaseWarehouseParam;
+import com.consum.base.core.utils.DateUtil;
+import com.consum.base.core.utils.SqlParameter;
import com.consum.model.po.*;
import com.walker.infrastructure.utils.NumberGenerator;
import com.walker.jdbc.service.BaseServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
-import org.springframework.security.core.parameters.P;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import java.util.ArrayList;
@@ -20,6 +22,7 @@
*/
@Service
@Slf4j
+@Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
public class WarehouseCoreService extends BaseServiceImpl {
public static void main(String[] args) {
@@ -45,7 +48,7 @@
List<CheckUsingResult> results;
- String key = param.getLending_id();
+ String key = param.getLending_id().toString();
/**
* 姝ゅ灏嗗悓涓�涓粨搴撲笅鐨勫悓涓�涓瀷鍙蜂笂閿侊紝涓嶅悓浠撳簱銆佷笉鍚屽瀷鍙蜂笉鍙楀奖鍝嶃��
@@ -68,7 +71,7 @@
/**
* 缁熶竴鍑哄叆搴�
*/
- public List<CheckWarehouseResult> unifyCheck(CheckWarehouseParam param) {
+ public List<CheckWarehouseResult> unifyCheck(BaseWarehouseParam param) {
// TODO: 10/10/2023 姝ゅ鍔犱簡鍞竴閿侊紝浼氬奖鍝嶆�ц兘锛屾�濊�冩槸鍚︽湁鏇村悎閫傜殑鍔炴硶
try {
Assert.notNull(param, "wareHouse param can not null !");
@@ -125,6 +128,12 @@
CheckUsingResult result = new CheckUsingResult();
DepFormLendingGoods goods = get(new DepFormLendingGoods(),"id=?",new Object[]{model.getDepFormLendingGoodsId()});
+
+ //濡傛灉鏄疉绫荤墿鍝侊紝鍒欓渶瑕佷笌鎸佹湁浜虹瓑鍚�
+ if (goods.getClassification() == "A" && (goods.getGoodsUserName().equals(param.getUser_name()))) {
+ continue;
+ }
+
//濡傛灉褰撳墠鎸佹湁浜烘寔鏈夌墿鍝佹暟閲忓ぇ浜庡嚭搴撴暟閲忥紝鍒欑洿鎺ュ噺鎺夋暟閲忓嵆鍙��
if (model.getUsingCount() > shengyu){
result.setInitial_count(model.getUsingCount());
@@ -214,7 +223,7 @@
/**
* 鍑哄簱
*/
- private List<CheckWarehouseResult> checkout(CheckWarehouseParam param) {
+ private List<CheckWarehouseResult> checkout(BaseWarehouseParam param) {
//鏌ヨ鍑烘寚瀹氫粨搴撱�佹寚瀹氬瀷鍙凤紝鐘舵�佷负姝ｅ父鐨勭殑搴撳瓨鐗╁搧锛屾寜鐓ч噰璐椂闂村�掑彊銆佷环鏍煎�掑彊鎺掑垪
String sql = "SELECT\n" +
" * \n" +
@@ -303,7 +312,7 @@
/**
* 鍏ュ簱
*/
- private CheckWarehouseResult checkin(CheckWarehouseParam param) throws RuntimeException {
+ private CheckWarehouseResult checkin(BaseWarehouseParam param) throws RuntimeException {
//濡傛灉鏄噰璐叆搴�
if (param.getFirst_input_type() ==1){
--
Gitblit v1.9.1