czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

入库修改

Browse Source
This commit is contained in:
张松
2025-11-27 09:29:31 +08:00
parent e2e4265d1e
commit 9c2133774e
3 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cash-api/product-server/src/main/java/com/czg/controller/admin/ConsStockFlowController.java
View File

@@ -21,10 +21,8 @@ import org.springframework.web.bind.annotation.*;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.Serializable;
import java.net.URL; import java.net.URL;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
@@ -69,7 +67,7 @@ public class ConsStockFlowController {
@OperationLog("耗材入库") @OperationLog("耗材入库")
//@SaStaffCheckPermission("yun_xu_hao_cai_ru_ku") //@SaStaffCheckPermission("yun_xu_hao_cai_ru_ku")
//@SaAdminCheckPermission("consStockFlow:in") //@SaAdminCheckPermission("consStockFlow:in")
public CzgResult<Map<String, Serializable>> inStock(@RequestBody ConsInOutStockHeadParam param) { public CzgResult<ConsInOutStockHeadParam> inStock(@RequestBody ConsInOutStockHeadParam param) {
ValidatorUtil.validateEntity(param, DefaultGroup.class); ValidatorUtil.validateEntity(param, DefaultGroup.class);
ValidatorUtil.validateEntity(param.getBodyList(), DefaultGroup.class); ValidatorUtil.validateEntity(param.getBodyList(), DefaultGroup.class);
return CzgResult.success(consStockFlowService.inStock(param)); return CzgResult.success(consStockFlowService.inStock(param));

4
cash-common/cash-common-service/src/main/java/com/czg/product/service/ConsStockFlowService.java
View File

@@ -11,9 +11,7 @@ import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.service.IService; import com.mybatisflex.core.service.IService;
import java.io.InputStream; import java.io.InputStream;
import java.io.Serializable;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* 耗材库存变动记录 * 耗材库存变动记录
@@ -29,7 +27,7 @@ public interface ConsStockFlowService extends IService<ConsStockFlow> {
* @param param 手动出库入参 * @param param 手动出库入参
* @return * @return
*/ */
Map<String, Serializable> inStock(ConsInOutStockHeadParam param); ConsInOutStockHeadParam inStock(ConsInOutStockHeadParam param);
/** /**
* 手动出库 * 手动出库

11
cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsStockFlowServiceImpl.java
View File

@@ -41,7 +41,6 @@
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.*; import java.util.*;
@@ -79,7 +78,7 @@
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Map<String, Serializable> inStock(ConsInOutStockHeadParam param) { public ConsInOutStockHeadParam inStock(ConsInOutStockHeadParam param) {
Long shopId = StpKit.USER.getShopId(0L); Long shopId = StpKit.USER.getShopId(0L);
Long createUserId = StpKit.USER.getLoginIdAsLong(); Long createUserId = StpKit.USER.getLoginIdAsLong();
String createUserName = StpKit.USER.getAccount(); String createUserName = StpKit.USER.getAccount();
@@ -87,10 +86,8 @@
List<ConsStockFlow> entityList = BeanUtil.copyToList(param.getBodyList(), ConsStockFlow.class); List<ConsStockFlow> entityList = BeanUtil.copyToList(param.getBodyList(), ConsStockFlow.class);
List<ConsStockFlow> insertList = new ArrayList<>(); List<ConsStockFlow> insertList = new ArrayList<>();
List<ConsInfo> updateStockList = new ArrayList<>(); List<ConsInfo> updateStockList = new ArrayList<>();
ArrayList<ConsStockFlow> unInConList = new ArrayList<>();
for (ConsStockFlow entity : entityList) { for (ConsStockFlow entity : entityList) {
if (entity.getId() == null) { if (entity.getId() == null) {
unInConList.add(entity);
continue; continue;
} }
BeanUtil.copyProperties(head, entity, CopyOptions.create().ignoreNullValue()); BeanUtil.copyProperties(head, entity, CopyOptions.create().ignoreNullValue());
@@ -102,7 +99,6 @@
Long conId = entity.getConId(); Long conId = entity.getConId();
ConsInfo consInfo = consInfoMapper.selectOneById(conId); ConsInfo consInfo = consInfoMapper.selectOneById(conId);
if (consInfo == null) { if (consInfo == null) {
unInConList.add(entity);
continue; continue;
} }
entity.setBeforeNumber(consInfo.getStockNumber()); entity.setBeforeNumber(consInfo.getStockNumber());
@@ -116,10 +112,7 @@
consInfoMapper.update(consInfo); consInfoMapper.update(consInfo);
} }
return Map.of( return param;
"reason", "成功入库" + (entityList.size() - unInConList.size()) + "个耗材, " + unInConList.size() + "个耗材未入库",
"unInConList", unInConList
);
} }
@Override @Override