purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新计量单位为多单位

Browse Source
This commit is contained in:
jishenghua
2024-12-18 00:02:06 +08:00
parent 1ba766b2dc
commit 6f294fad62
7 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jshERP-boot/src/main/java/com/jsh/erp/constants/ExceptionConstants.java
View File

@@ -286,7 +286,7 @@ public class ExceptionConstants {
public static final String MATERIAL_BARCODE_EXISTS_MSG = "商品条码:%s重复";
//商品-单位匹配不上
public static final int MATERIAL_UNIT_MATE_CODE = 8000006;
public static final String MATERIAL_UNIT_MATE_MSG = "抱歉，商品条码:%s的单位匹配不上，请完善计量单位信息！";
public static final String MATERIAL_UNIT_MATE_MSG = "抱歉，商品条码:%s的单位匹配不上，请完善多单位信息！";
//商品条码长度应该为4到40位
public static final int MATERIAL_BARCODE_LENGTH_ERROR_CODE = 8000007;
public static final String MATERIAL_BARCODE_LENGTH_ERROR_MSG = "商品条码:%s的长度应该为4到40位";

2
jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
View File

@@ -229,7 +229,7 @@ public class DepotItemController {
item.put("mfrs", diEx.getMMfrs());
item.put("materialOther", depotItemService.getOtherInfo(mpArr, diEx));
BigDecimal stock;
Unit unitInfo = materialService.findUnit(diEx.getMaterialId()); //查询计量单位信息
Unit unitInfo = materialService.findUnit(diEx.getMaterialId()); //查询多单位信息
String materialUnit = diEx.getMaterialUnit();
if(StringUtil.isNotEmpty(diEx.getSku())){
stock = depotItemService.getSkuStockByParam(diEx.getDepotId(),diEx.getMaterialExtendId(),null,null);

4
jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java
View File

@@ -505,7 +505,7 @@ public class DepotItemService {
depotItem.setLinkId(rowObj.getLong("linkId"));
}
//以下进行单位换算
Unit unitInfo = materialService.findUnit(materialExtend.getMaterialId()); //查询计量单位信息
Unit unitInfo = materialService.findUnit(materialExtend.getMaterialId()); //查询多单位信息
if (StringUtil.isExist(rowObj.get("operNumber"))) {
depotItem.setOperNumber(rowObj.getBigDecimal("operNumber"));
String unit = rowObj.get("unit").toString();
@@ -1071,7 +1071,7 @@ public class DepotItemService {
public void updateCurrentUnitPrice(DepotItem depotItem) throws Exception {
Boolean forceFlag = systemConfigService.getForceApprovalFlag();
Boolean inOutManageFlag = systemConfigService.getInOutManageFlag();
//查询计量单位信息
//查询多单位信息
Unit unitInfo = materialService.findUnit(depotItem.getMaterialId());
List<DepotItemVo4DetailByTypeAndMId> itemList = findDetailByDepotIdsAndMaterialIdList(null, forceFlag, inOutManageFlag, depotItem.getSku(),
depotItem.getBatchNumber(), null, null, null, depotItem.getMaterialId(), null, null);

8
jshERP-boot/src/main/java/com/jsh/erp/service/unit/UnitService.java
View File

@@ -108,7 +108,7 @@ public class UnitService {
parseNameByUnit(unit);
unit.setEnabled(true);
result=unitMapper.insertSelective(unit);
logService.insertLog("计量单位",
logService.insertLog("多单位",
new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_ADD).append(unit.getName()).toString(), request);
}catch(Exception e){
JshException.writeFail(logger, e);
@@ -129,7 +129,7 @@ public class UnitService {
if(unit.getRatioThree()==null) {
unitMapperEx.updateRatioThreeById(unit.getId());
}
logService.insertLog("计量单位",
logService.insertLog("多单位",
new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(unit.getName()).toString(), request);
}catch(Exception e){
JshException.writeFail(logger, e);
@@ -186,7 +186,7 @@ public class UnitService {
for(Unit unit: list){
sb.append("[").append(unit.getName()).append("]");
}
logService.insertLog("计量单位", sb.toString(),
logService.insertLog("多单位", sb.toString(),
((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
User userInfo=userService.getCurrentUser();
//校验通过执行删除操作
@@ -291,7 +291,7 @@ public class UnitService {
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
public int batchSetStatus(Boolean status, String ids)throws Exception {
logService.insertLog("计量单位",
logService.insertLog("多单位",
new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_ENABLED).toString(),
((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
List<Long> unitIds = StringUtil.strToLongList(ids);