1. 【新增】售后单售后原因类型支持搜索

2. 【新增】手工创建订单折扣可输入正数

3. 【优化】盘点申请单确认

4. 【修复】采购退货单模拟出库失败问题

5. 【新增】订单金额客户实付与结算金额

6. 【优化】仓库发货统计报表物料名称显示

7. 【优化】自有仓储虚拟发货逻辑

8. 【修复】基础物料分类管理问题
This commit is contained in:
chenping
2026-04-01 11:59:17 +08:00
parent 9341122827
commit 61783b7d01
754 changed files with 46179 additions and 5700 deletions

View File

@@ -179,6 +179,10 @@ class omeauto_auto_plugin_store extends omeauto_auto_plugin_abstract implements
$branchObj = app::get('ome')->model("branch");
$basicMStockFreezeLib = kernel::single('material_basic_material_stock_freeze');
$theSelectBranchId = array();
// 获取指定不需要管控库存的基础物料
$notCtrlStoreBmList = kernel::single('material_basic_material')->getNotCtrlStoreProducts($groupStore['pids']);
//根据获取到的仓库来判断库存
foreach ((array) $bids as $bkey => $bid ) {
if(isset($tid)) {
@@ -224,7 +228,14 @@ class omeauto_auto_plugin_store extends omeauto_auto_plugin_abstract implements
//检查订单组内的货品数量是否足够
$allow = true;
foreach ($groupStore['store'] as $pid => $nums) {
foreach ($groupStore['store'] as $pid => $nums)
{
// 检查不需要管控库存的基础物料
if(isset($notCtrlStoreBmList[$pid]) && $notCtrlStoreBmList[$pid]){
continue;
}
// check store
if (($store[$pid]['store'] - $nums) < 0) {
$allow = false;
}
@@ -305,5 +316,5 @@ class omeauto_auto_plugin_store extends omeauto_auto_plugin_abstract implements
public function getInputUI() {
}
}