ecshop/OMS
1
0
Fork 0
mirror of https://gitee.com/ShopeX/OMS synced 2026-04-20 20:10:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

10
app/material/lib/sales/check.php
View File

@@ -39,6 +39,11 @@ class material_sales_check
$is_new_add = $params['edit'] ? false : true;
unset($params['edit']);
// 去除销售物料编码前后空格
if (isset($params['sales_material_bn'])) {
$params['sales_material_bn'] = trim($params['sales_material_bn']);
}
if(empty($params['sales_material_name'])){
$err_msg ="销售物料名称不能为空";
return false;
@@ -53,9 +58,10 @@ class material_sales_check
if($is_new_add)
{
//判断物料编码只能是由数字英文下划线组成
$reg_bn_code = "/^[0-9a-zA-Z\_\#\-\/]*$/";
// 销售物料编码：支持数字、英文、下划线、横线、井号、斜杠、空格
$reg_bn_code = "/^[0-9a-zA-Z\_\#\-\/ ]*$/";
if(!preg_match($reg_bn_code,$params["sales_material_bn"])){
$err_msg = "物料编码只支持(数字、英文、_下划线、-横线、#井号、/斜杠)";
$err_msg = "物料编码只支持(数字、英文、_下划线、-横线、#井号、/斜杠、空格)";
return false;
}

2
app/material/lib/sales/material.php
View File

@@ -143,7 +143,7 @@ class material_sales_material{
* @return Boolean
*/
public function getBasicMBySalesMId($sm_id){
$salesBasicMInfos = $this->_salesBasicMaterialObj->getList('bm_id,sm_id,number,rate',array('sm_id'=>$sm_id), 0, -1);
$salesBasicMInfos = $this->_salesBasicMaterialObj->getList('*',array('sm_id'=>$sm_id), 0, -1);
if($salesBasicMInfos){
foreach($salesBasicMInfos as $k => $salesBasicMInfo){
$bmIds[] = $salesBasicMInfo['bm_id'];