|
@@ -574,11 +574,11 @@ public class InventoryService extends BaseService<Inventory> {
|
|
|
this.insertInboundRecord(inOutRecordVO);
|
|
this.insertInboundRecord(inOutRecordVO);
|
|
|
//endregion
|
|
//endregion
|
|
|
|
|
|
|
|
- //region 采购退货 出库成本 正数
|
|
|
|
|
- if (Constant.InventoryDocCode.PURCHASE_RETURN.getValue().equals(inOutRecordVO.getInventoryDocCode())) {
|
|
|
|
|
- this.insertOutboundItemCost(inOutRecordVO);
|
|
|
|
|
- }
|
|
|
|
|
- //endregion
|
|
|
|
|
|
|
+// //region 采购退货 出库成本 正数
|
|
|
|
|
+// if (Constant.InventoryDocCode.PURCHASE_RETURN.getValue().equals(inOutRecordVO.getInventoryDocCode())) {
|
|
|
|
|
+// this.insertOutboundItemCost(inOutRecordVO);
|
|
|
|
|
+// }
|
|
|
|
|
+// //endregion
|
|
|
}
|
|
}
|
|
|
//endregion
|
|
//endregion
|
|
|
}
|
|
}
|
|
@@ -663,12 +663,12 @@ public class InventoryService extends BaseService<Inventory> {
|
|
|
this.insertInboundRecord(inOutRecordVO);
|
|
this.insertInboundRecord(inOutRecordVO);
|
|
|
//endregion
|
|
//endregion
|
|
|
|
|
|
|
|
- //region 出库成本
|
|
|
|
|
- //除了销售退货出库 其他类型出库要新建出库成本
|
|
|
|
|
- if (!Constant.InventoryDocCode.SALE_RETURN.getValue().equals(inOutRecordVO.getInventoryDocCode())) {
|
|
|
|
|
- this.insertOutboundItemCost(inOutRecordVO);
|
|
|
|
|
- }
|
|
|
|
|
- //endregion
|
|
|
|
|
|
|
+// //region 销售退货 其他类型出库
|
|
|
|
|
+// if (!Constant.InventoryDocCode.SALE_RETURN.getValue().equals(inOutRecordVO.getInventoryDocCode())) {
|
|
|
|
|
+// this.insertOutboundItemCost(inOutRecordVO);
|
|
|
|
|
+// }
|
|
|
|
|
+// //endregion
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
//endregion
|
|
//endregion
|
|
|
|
|
|
|
@@ -1068,6 +1068,16 @@ public class InventoryService extends BaseService<Inventory> {
|
|
|
inOutRecordVO.setIntoAmt(inOutRecordVO.getIntoQty().multiply(inventoryBatchResponse.getCostPrice()));
|
|
inOutRecordVO.setIntoAmt(inOutRecordVO.getIntoQty().multiply(inventoryBatchResponse.getCostPrice()));
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+ //todo 2024年5月20日15:46:01 库存批次有几条出库成本就有几条
|
|
|
|
|
+ //region 出库成本
|
|
|
|
|
+ //除了销售退货出库 其他类型出库要新建出库成本 采购退货 出库成本 正数
|
|
|
|
|
+ if (!Constant.InventoryDocCode.SALE_RETURN.getValue().equals(inOutRecordVO.getInventoryDocCode()) ||
|
|
|
|
|
+ Constant.InventoryDocCode.PURCHASE_RETURN.getValue().equals(inOutRecordVO.getInventoryDocCode())) {
|
|
|
|
|
+ //存货批次明细ID
|
|
|
|
|
+ inOutRecordVO.setBatchId(inventoryBatchResponse.getBatchId());
|
|
|
|
|
+ this.insertOutboundItemCost(inOutRecordVO);
|
|
|
|
|
+ }
|
|
|
|
|
+ //endregion
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
|
throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.CAN_OUTBOUND_QUANTITY_INSUFFICIENT.getMessage());
|
|
throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.CAN_OUTBOUND_QUANTITY_INSUFFICIENT.getMessage());
|