mirror of
https://gitee.com/ShopeX/OMS
synced 2026-04-20 20:10:28 +08:00
1. 【新增】售后单售后原因类型支持搜索
2. 【新增】手工创建订单折扣可输入正数 3. 【优化】盘点申请单确认 4. 【修复】采购退货单模拟出库失败问题 5. 【新增】订单金额客户实付与结算金额 6. 【优化】仓库发货统计报表物料名称显示 7. 【优化】自有仓储虚拟发货逻辑 8. 【修复】基础物料分类管理问题
This commit is contained in:
@@ -14,7 +14,6 @@
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
class wms_mdl_inventory extends dbeav_model{
|
||||
var $export_name = '盘点表';
|
||||
|
||||
@@ -41,7 +40,7 @@ class wms_mdl_inventory extends dbeav_model{
|
||||
}
|
||||
|
||||
/*
|
||||
* 获取货品
|
||||
* 获取基础物料
|
||||
*/
|
||||
function getBranchProduct($branch_id, $barcode)
|
||||
{
|
||||
@@ -179,7 +178,7 @@ class wms_mdl_inventory extends dbeav_model{
|
||||
return $arr;
|
||||
}
|
||||
/*
|
||||
* 获取货品信息
|
||||
* 获取基础物料信息
|
||||
*/
|
||||
function getProduct($data=null, $lim=0, $limit=1, $type='search'){
|
||||
|
||||
@@ -855,7 +854,7 @@ class wms_mdl_inventory extends dbeav_model{
|
||||
return $titleRs;
|
||||
}else{
|
||||
if( $row[0] ){
|
||||
# 盘点货品处理
|
||||
# 盘点基础物料处理
|
||||
if( array_key_exists( '*:商品名称',$title ) )
|
||||
{
|
||||
$product = $basicMaterialObj->dump(array('material_bn'=>trim($row[1])), 'bm_id');
|
||||
@@ -1020,7 +1019,7 @@ class wms_mdl_inventory extends dbeav_model{
|
||||
}
|
||||
|
||||
/*
|
||||
* 根据条码获取货品
|
||||
* 根据条码获取基础物料
|
||||
*/
|
||||
function getProductbybarcode($branch_id, $barcode)
|
||||
{
|
||||
@@ -1045,7 +1044,7 @@ class wms_mdl_inventory extends dbeav_model{
|
||||
}
|
||||
|
||||
/*
|
||||
* 根据货号获取货品
|
||||
* 根据基础物料编码获取基础物料
|
||||
*/
|
||||
function getProductbybn($branch_id, $bn)
|
||||
{
|
||||
@@ -1110,4 +1109,4 @@ class wms_mdl_inventory extends dbeav_model{
|
||||
}
|
||||
|
||||
}
|
||||
?>
|
||||
?>
|
||||
|
||||
Reference in New Issue
Block a user