gyzz/openerp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

给单据保存中增加更新成本价的逻辑

Browse Source
This commit is contained in:
jishenghua 2024-05-22 00:56:03 +08:00
parent 72b2af86d8
commit 3727271fd0
3 changed files with 50 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/MaterialCurrentStockMapperEx.java
View File

@ -4,6 +4,7 @@ import com.jsh.erp.datasource.entities.MaterialCurrentStock;
import com.jsh.erp.datasource.entities.MaterialCurrentStockExample;
import org.apache.ibatis.annotations.Param;
import java.math.BigDecimal;
import java.util.List;
public interface MaterialCurrentStockMapperEx {
@ -12,4 +13,8 @@ public interface MaterialCurrentStockMapperEx {
List<MaterialCurrentStock> getCurrentStockMapByIdList(
@Param("materialIdList") List<Long> materialIdList);
void updateUnitPriceByMId(
@Param("currentUnitPrice") BigDecimal currentUnitPrice,
@Param("materialId") Long materialId);
}

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

@ -31,10 +31,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
@Service
public class DepotItemService {
@ -72,6 +69,8 @@ public class DepotItemService {
@Resource
private MaterialCurrentStockMapper materialCurrentStockMapper;
@Resource
private MaterialCurrentStockMapperEx materialCurrentStockMapperEx;
@Resource
private LogService logService;
public DepotItem getDepotItem(long id)throws Exception {
@ -178,7 +177,7 @@ public class DepotItemService {
}
public List<DepotItemVo4DetailByTypeAndMId> findDetailByDepotIdsAndMaterialIdList(String depotIds, Boolean forceFlag, Boolean inOutManageFlag, String sku, String batchNumber,
String number, String beginTime, String endTime, Long mId, int offset, int rows)throws Exception {
String number, String beginTime, String endTime, Long mId, Integer offset, Integer rows)throws Exception {
Long depotId = null;
if(StringUtil.isNotEmpty(depotIds)) {
depotId = Long.parseLong(depotIds);
@ -666,6 +665,8 @@ public class DepotItemService {
this.insertDepotItemWithObj(depotItem);
//更新当前库存
updateCurrentStock(depotItem);
//更新当前成本价
updateCurrentUnitPrice(depotItem);
//更新商品的价格
updateMaterialExtendPrice(materialExtend.getId(), depotHead.getSubType(), depotHead.getBillType(), rowObj);
}
@ -1047,6 +1048,39 @@ public class DepotItemService {
}
}
/**
* 根据单据明细来批量更新当前成本价
* @param depotItem
*/
@Transactional(value = "transactionManager", rollbackFor = Exception.class)
public void updateCurrentUnitPrice(DepotItem depotItem) throws Exception {
Boolean forceFlag = systemConfigService.getForceApprovalFlag();
Boolean inOutManageFlag = systemConfigService.getInOutManageFlag();
List<DepotItemVo4DetailByTypeAndMId> itemList = findDetailByDepotIdsAndMaterialIdList(null, forceFlag, inOutManageFlag, depotItem.getSku(),
depotItem.getBatchNumber(), null, null, null, depotItem.getMaterialId(), null, null);
Collections.reverse(itemList); //倒序之后变成按时间从前往后排序
BigDecimal currentNumber = BigDecimal.ZERO;
BigDecimal currentUnitPrice = BigDecimal.ZERO;
BigDecimal currentAllPrice = BigDecimal.ZERO;
for(DepotItemVo4DetailByTypeAndMId item: itemList) {
//入库
if(BusinessConstants.DEPOTHEAD_TYPE_IN.equals(item.getType())) {
currentAllPrice = currentAllPrice.add(item.getAllPrice());
currentNumber = currentNumber.add(item.getBnum());
currentUnitPrice = currentAllPrice.divide(currentNumber, 2, BigDecimal.ROUND_HALF_UP);
}
//出库
if(BusinessConstants.DEPOTHEAD_TYPE_OUT.equals(item.getType())) {
currentNumber = currentNumber.add(item.getBnum());
BigDecimal outNum = item.getBnum()!=null?item.getBnum():BigDecimal.ZERO;
//出库的数量*当前的成本单价
currentAllPrice = currentAllPrice.add(outNum.multiply(currentUnitPrice));
}
}
//更新实时库存中的当前单价
materialCurrentStockMapperEx.updateUnitPriceByMId(currentUnitPrice, depotItem.getMaterialId());
}
/**
* 根据商品和仓库来更新当前库存
* @param mId

6
jshERP-boot/src/main/resources/mapper_xml/MaterialCurrentStockMapperEx.xml
View File

@ -21,4 +21,10 @@
group by material_id
</select>
<update id="updateUnitPriceByMId">
update jsh_material_current_stock set current_unit_price = #{currentUnitPrice}
where material_id = #{materialId}
and ifnull(delete_flag,'0') !='1'
</update>
</mapper>