attiya/ebike-share
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改入库问题

Browse Source
This commit is contained in:
小朱 2025-05-26 17:21:06 +08:00
parent 6d84c3100f
commit ac6e269e3f
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqComponentEnterRecordDto.java
View File

@ -50,6 +50,10 @@ public class ReqComponentEnterRecordDto {
*/ */
private Integer stockInType; private Integer stockInType;
/**
* 单价
*/
private Double price;
/** /**
* 中控信息列表，包含所有ECU部件的入库记录。 * 中控信息列表，包含所有ECU部件的入库记录。
*/ */

4
ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeComponentInventorycount.java
View File

@ -1,5 +1,6 @@
package com.cdzy.ebikeoperate.model.pojo; package com.cdzy.ebikeoperate.model.pojo;
import com.mybatisflex.annotation.Column;
import com.mybatisflex.annotation.Id; import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.Table; import com.mybatisflex.annotation.Table;
import java.io.Serializable; import java.io.Serializable;
@ -57,7 +58,8 @@ public class EbikeComponentInventorycount implements Serializable {
/** /**
* 部件数量 * 部件数量
*/ */
private Integer count; @Column(onInsertValue = "0")
private long itemCount;
/** /**
* 单位 * 单位

14
ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeComponentServiceImpl.java
View File

@ -79,7 +79,6 @@ public class EbikeComponentServiceImpl implements EbikeComponentService {
String userId = getStaffId(); // 获取当前操作用户ID String userId = getStaffId(); // 获取当前操作用户ID
Long orgId = getOrgId(); // 获取当前操作用户所在组织ID Long orgId = getOrgId(); // 获取当前操作用户所在组织ID
EbikeComponentTypeInfo ebikeComponentTypeInfo = getComponentTypeInfo(params.getComponentType()); // 获取部件信息 EbikeComponentTypeInfo ebikeComponentTypeInfo = getComponentTypeInfo(params.getComponentType()); // 获取部件信息
// 获取或新增部件记录 // 获取或新增部件记录
EbikeComponentEnterRecords ebikeComponentEnterRecords = buildEnterRecord(params, ebikeComponentTypeInfo, stockInType, orgId); EbikeComponentEnterRecords ebikeComponentEnterRecords = buildEnterRecord(params, ebikeComponentTypeInfo, stockInType, orgId);
saveOrUpdateEnterRecord(ebikeComponentEnterRecords, params.getComponentEnterRecordId(), userId); saveOrUpdateEnterRecord(ebikeComponentEnterRecords, params.getComponentEnterRecordId(), userId);
@ -154,7 +153,8 @@ public class EbikeComponentServiceImpl implements EbikeComponentService {
ebikeComponentEnterRecords.setComponentType(params.getComponentType()); ebikeComponentEnterRecords.setComponentType(params.getComponentType());
ebikeComponentEnterRecords.setEnterQuantity(params.getEnterQuantity()); ebikeComponentEnterRecords.setEnterQuantity(params.getEnterQuantity());
ebikeComponentEnterRecords.setComponentOutRecordId(params.getComponentOutRecordId()); ebikeComponentEnterRecords.setComponentOutRecordId(params.getComponentOutRecordId());
ebikeComponentEnterRecords.setComponentPrice(ebikeComponentTypeInfo.getPrice()); // ebikeComponentEnterRecords.setComponentPrice(ebikeComponentTypeInfo.getPrice());
ebikeComponentEnterRecords.setComponentPrice(params.getPrice());
ebikeComponentEnterRecords.setState(stockInType == 1 ? "1" : "0"); // 暂存为 0 入库为1 ebikeComponentEnterRecords.setState(stockInType == 1 ? "1" : "0"); // 暂存为 0 入库为1
return ebikeComponentEnterRecords; return ebikeComponentEnterRecords;
} }
@ -257,9 +257,9 @@ public class EbikeComponentServiceImpl implements EbikeComponentService {
ebikeComponentInventorycountMapper.insert(ebikeComponentInventorycount); ebikeComponentInventorycountMapper.insert(ebikeComponentInventorycount);
} else { } else {
if (type == 1) {//入库 if (type == 1) {//入库
ebikeComponentInventorycount.setCount(ebikeComponentInventorycount.getCount() + size); ebikeComponentInventorycount.setItemCount(ebikeComponentInventorycount.getItemCount() + size);
} else {//出库 } else {//出库
ebikeComponentInventorycount.setCount(ebikeComponentInventorycount.getCount() - size); ebikeComponentInventorycount.setItemCount(ebikeComponentInventorycount.getItemCount() - size);
} }
ebikeComponentInventorycountMapper.update(ebikeComponentInventorycount); ebikeComponentInventorycountMapper.update(ebikeComponentInventorycount);
} }
@ -376,7 +376,7 @@ public class EbikeComponentServiceImpl implements EbikeComponentService {
query1.eq("code", componentType); query1.eq("code", componentType);
EbikeComponentInventorycount ebikeComponentInventorycount = ebikeComponentInventorycountMapper.selectOneByQuery(query1); EbikeComponentInventorycount ebikeComponentInventorycount = ebikeComponentInventorycountMapper.selectOneByQuery(query1);
if (ebikeComponentInventorycount != null) { if (ebikeComponentInventorycount != null) {
ebikeComponentInventorycount.setCount(ebikeComponentInventorycount.getCount() - size); ebikeComponentInventorycount.setItemCount(ebikeComponentInventorycount.getItemCount() - size);
ebikeComponentInventorycountMapper.update(ebikeComponentInventorycount); ebikeComponentInventorycountMapper.update(ebikeComponentInventorycount);
} }
} }
@ -393,7 +393,7 @@ public class EbikeComponentServiceImpl implements EbikeComponentService {
query1.eq("code", componentType); query1.eq("code", componentType);
EbikeComponentInventorycount ebikeComponentInventorycount = ebikeComponentInventorycountMapper.selectOneByQuery(query1); EbikeComponentInventorycount ebikeComponentInventorycount = ebikeComponentInventorycountMapper.selectOneByQuery(query1);
if (ebikeComponentInventorycount != null) { if (ebikeComponentInventorycount != null) {
ebikeComponentInventorycount.setCount(ebikeComponentInventorycount.getCount() + size); ebikeComponentInventorycount.setItemCount(ebikeComponentInventorycount.getItemCount() + size);
ebikeComponentInventorycountMapper.update(ebikeComponentInventorycount); ebikeComponentInventorycountMapper.update(ebikeComponentInventorycount);
} }
} }
@ -424,7 +424,7 @@ public class EbikeComponentServiceImpl implements EbikeComponentService {
if (ebikeComponentInventorycount == null) { if (ebikeComponentInventorycount == null) {
return JsonResult.failed("未找到相应的部件库存信息"); return JsonResult.failed("未找到相应的部件库存信息");
} }
Integer count = ebikeComponentInventorycount.getCount(); // 获取剩余数量 long count = ebikeComponentInventorycount.getItemCount(); // 获取剩余数量
String name = ebikeComponentInventorycount.getName(); // 获取部件名称 String name = ebikeComponentInventorycount.getName(); // 获取部件名称
// 判断库存是否足够 // 判断库存是否足够
if (stockInType == 1 && count < outQuantity) { if (stockInType == 1 && count < outQuantity) {