ecshop/OMS
1
0
Fork 0
mirror of https://gitee.com/ShopeX/OMS synced 2026-04-05 22:55:32 +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

18
app/console/controller/admin/inventory/apply.php
View File

@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
class console_ctl_admin_inventory_apply extends desktop_controller{
var $workground = "console_center";
function index(){
@@ -31,6 +30,16 @@ class console_ctl_admin_inventory_apply extends desktop_controller{
function do_confirm($apply_id=0){
$objInAp = app::get('console')->model('inventory_apply');
$main = $objInAp->db_dump(['inventory_apply_id'=>$apply_id], '*');
if (empty($main)) {
header("content-type:text/html; charset=utf-8");
echo "<script>alert('盘点单不存在');window.close();</script>";
exit;
}
if ($main['status'] == 'confirmed') {
header("content-type:text/html; charset=utf-8");
echo "<script>alert('盘点单已确认');window.close();</script>";
exit;
}
$branch = app::get('ome')->model('branch')->db_dump(['branch_id'=>$main['branch_id']], 'name');
if(empty($branch)) {
header("content-type:text/html; charset=utf-8");
@@ -61,6 +70,11 @@ class console_ctl_admin_inventory_apply extends desktop_controller{
function finish_confirm(){
$this->begin($this->url);
$apply_id = (int) $_POST['inventory_apply_id'];
$objInAp = app::get('console')->model('inventory_apply');
$main = $objInAp->db_dump(['inventory_apply_id'=>$apply_id], 'status');
if (!empty($main) && $main['status'] == 'confirmed') {
$this->end(true, '已确认');
}
list($rs, $rsData) = kernel::single('console_inventory_apply')->confirm($apply_id);
$this->end($rs, $rsData['msg']);
}
@@ -100,4 +114,4 @@ class console_ctl_admin_inventory_apply extends desktop_controller{
);
$this->finder('console_mdl_inventory_apply_items',$params);
}
}
}