瀏覽代碼

新增
1、物资管理出库单新增出库金额并允许编辑

liangwenxuan 2 月之前
父節點
當前提交
122d523cfe

+ 2 - 0
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/biz/MaterialOutboundOrderItemDO.java

@@ -39,6 +39,8 @@ public class MaterialOutboundOrderItemDO extends BaseNoDeleteDO {
 
     /** 出库数量 */
     private BigDecimal quantity;
+    /** 出库单价 */
+    private BigDecimal price;
 
     /** 租户 ID */
     private Long tenantId;

+ 1 - 1
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/biz/MaterialIoService.java

@@ -38,7 +38,7 @@ public interface MaterialIoService {
 
     Long outbound(@Valid MaterialIoOrderSaveReqVO reqVO);
 
-    Long outboundByInbound(@Valid cn.iocoder.yudao.module.system.controller.admin.biz.vo.materialio.outbound.MaterialOutboundByInboundReqVO reqVO);
+    Long outboundByInbound(@Valid MaterialOutboundByInboundReqVO reqVO);
 
     Long outboundReturn(@Valid MaterialIoOrderSaveReqVO reqVO);
 

+ 3 - 1
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/biz/MaterialIoServiceImpl.java

@@ -165,6 +165,7 @@ public class MaterialIoServiceImpl implements MaterialIoService {
             outboundItem.setRefInboundItemId(inboundItem.getId());
             outboundItem.setMaterialId(inboundItem.getMaterialId());
             outboundItem.setQuantity(quantity);
+            outboundItem.setPrice(inboundItem.getInUnitPrice());
             outboundItem.setTenantId(reqVO.getTenantId());
             outboundOrderItemMapper.insert(outboundItem);
 
@@ -388,6 +389,7 @@ public class MaterialIoServiceImpl implements MaterialIoService {
             outboundItem.setRefInboundItemId(itemVO.getInboundItemId()); // 入库明细ID
             outboundItem.setMaterialId(itemVO.getMaterialId());
             outboundItem.setQuantity(itemVO.getQuantity());
+            outboundItem.setQuantity(itemVO.getSaleUnitPrice());
             outboundItem.setTenantId(createReqVO.getTenantId());
             outboundOrderItemMapper.insert(outboundItem);
 
@@ -973,6 +975,7 @@ public class MaterialIoServiceImpl implements MaterialIoService {
             itemRespVO.setOrderId(id);
             itemRespVO.setMaterialId(item.getMaterialId());
             itemRespVO.setQuantity(item.getQuantity());
+            itemRespVO.setSaleUnitPrice(item.getPrice());
             itemRespVO.setRefInboundItemId(item.getRefInboundItemId());
             itemRespVOs.add(itemRespVO);
             inboundItemIds.add(item.getRefInboundItemId());
@@ -999,7 +1002,6 @@ public class MaterialIoServiceImpl implements MaterialIoService {
                 MaterialInboundOrderItemDO inboundItem = inboundItemMap.get(itemRespVO.getRefInboundItemId());
                 if (inboundItem != null) {
                     itemRespVO.setInUnitPrice(inboundItem.getInUnitPrice());
-                    itemRespVO.setSaleUnitPrice(inboundItem.getSaleUnitPrice());
                     itemRespVO.setProduceDate(inboundItem.getProduceDate());
                     itemRespVO.setLatestAvailableQty(inboundItem.getAvailableQty().add(itemRespVO.getQuantity()));
                     // 填充入库单号