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

@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/**
* 销售物料数据结构
*
@@ -49,7 +48,7 @@ $db['sales_material']=array(
array(
'type' => 'varchar(200)',
'label' => '销售物料编码',
'width' => 120,
'width' => 230,
'editable' => false,
'in_list' => true,
'default_in_list' => true,
@@ -95,8 +94,8 @@ $db['sales_material']=array(
'type' => 'table:customer_classify@material',
'default' => 0,
'editable' => false,
'label' => '客户分类ID',
'width' => 130,
'label' => '客户分类',
'width' => 160,
'in_list' => true,
'default_in_list' => true,
),
@@ -111,6 +110,8 @@ $db['sales_material']=array(
'label' => '创建时间',
'in_list' => true,
'default_in_list' => true,
'filtertype' => 'time',
'filterdefault' => true,
'default' => 0,
),
'last_modify' => array(
@@ -118,6 +119,8 @@ $db['sales_material']=array(
'label' => '最后更新时间',
'in_list' => true,
'default_in_list' => true,
'filtertype' => 'time',
'filterdefault' => true,
'order' => 11,
),
'disabled' =>
@@ -187,6 +190,15 @@ $db['sales_material']=array(
'filtertype' => 'yes',
'filterdefault' => true,
),
'source' => array(
'type' => 'varchar(50)',
'required' => true,
'label' => '数据来源',
'default' => 'local',
// 'default_in_list' => true,
'in_list' => true,
'comment' => '数据来源,可选值:local(本地),api(接口)',
),
),
'comment' => '销售物料表,用于匹配销售平台订单商品编码',
'index' =>
@@ -206,13 +218,16 @@ $db['sales_material']=array(
0 => 'visibled',
),
),
'last_modify' =>
array (
'columns' =>
array (
'last_modify' => array (
'columns' => array (
0 => 'last_modify',
),
),
),
'create_time' => array (
'columns' => array (
0 => 'create_time',
),
),
),
'engine' => 'innodb',
'version' => '$Rev: $',