Skip to content

CnChunfeng / scm_wms_outstore_service

Go to a project
Commit cf1a4c9a by Joneq
Options

修改错误

parent 61952809
Inline Side-by-side
Showing with 30 additions and 30 deletions
app/Http/Controllers/AdminOutstoreController.php
......@@ -67,7 +67,7 @@ class AdminOutstoreController extends Controller
try{
//获取需要修改的货品
if ($data['pick_task_detail_id'] == 'all'){
$data['pick_task_detail_id_arr'] = PickTaskDetailModel::where('out_store_id',$data['out_store_id'])->pluck('pick_task_detail_id')->toArray();
$data['pick_task_detail_id_arr'] = PickTaskDetailModel::where('out_store_id',$data['out_store_id'])->where('pick_status',3)->pluck('pick_task_detail_id')->toArray();
}else{
$data['pick_task_detail_id_arr'] = [$data['pick_task_detail_id']];
}
......@@ -84,10 +84,10 @@ class AdminOutstoreController extends Controller
$data = $request->all();
try{
//获取需要修改的货品
if ($data['out_store_detail_id'] == 'all'){
$data['out_store_detail_id_arr'] = OutStoreDetailModel::where('out_store_id',$data['out_store_id'])->pluck('out_store_detail_id');
if ($data['pick_task_detail_id'] == 'all'){
$data['pick_task_detail_id_arr'] = OutStoreDetailModel::where('out_store_id',$data['out_store_id'])->pluck('pick_task_detail_id')->toArray();
}else{
$data['out_store_detail_id_arr'] = [$data['out_store_detail_id']];
$data['pick_task_detail_id_arr'] = [$data['pick_task_detail_id']];
}
$returnData = (new PalletLogic())->confirmOutStore($data);
......@@ -104,10 +104,10 @@ class AdminOutstoreController extends Controller
$data = $request->all();
try{
//获取需要修改的货品
if ($data['out_store_detail_id'] == 'all'){
$data['out_store_detail_id_arr'] = OutStoreDetailModel::where('out_store_id',$data['out_store_id'])->pluck('out_store_detail_id');
if ($data['pick_task_detail_id'] == 'all'){
$data['pick_task_detail_id_arr'] = OutStoreDetailModel::where('out_store_id',$data['out_store_id'])->pluck('pick_task_detail_id')->toArray();
}else{
$data['out_store_detail_id_arr'] = [$data['out_store_detail_id']];
$data['pick_task_detail_id_arr'] = [$data['pick_task_detail_id']];
}
$returnData = (new PalletLogic())->cancelOutStore($data);
......
app/Http/Controllers/OutstoreController.php
......@@ -70,8 +70,7 @@ class OutstoreController extends Controller
{
$data = $request->all();
try{
$outStoreDetailIdArr = PickTaskDetailModel::where('pick_task_detail_id',$data['pick_task_detail_id'])->pluck('out_store_detail_id');
$data['out_store_detail_id_arr'] = $outStoreDetailIdArr;
$data['pick_task_detail_id_arr'] = [$data['pick_task_detail_id']];
$returnData = (new PalletLogic())->confirmOutStore($data);
}catch (\Exception $exception){
if (empty(self::$errCode))self::$errCode=101;
......@@ -86,8 +85,7 @@ class OutstoreController extends Controller
$data = $request->all();
try{
//获取所有的out_store_detail_id
$outStoreDetailIdArr = PickTaskDetailModel::where('pick_task_detail_id',$data['pick_task_detail_id'])->pluck('out_store_detail_id');
$data['out_store_detail_id_arr'] = $outStoreDetailIdArr;
$data['pick_task_detail_id_arr'] = [$data['pick_task_detail_id']];
$returnData = (new PalletLogic())->cancelOutStore($data);
}catch (\Exception $exception){
if (empty(self::$errCode))self::$errCode=101;
......
app/Http/Controllers/PicktaskController.php
......@@ -104,7 +104,7 @@ class PicktaskController extends Controller
$pickTaskDetailIdArr = PickTaskDetailModel::where('pick_task_detail_id',$data['pick_task_detail_id'])->where('pick_status',3)->pluck('pick_task_detail_id');
if (empty($pickTaskDetailIdArr)){
throw new \Exception('该任务下没有这个型号');
throw new \Exception('该任务下不是已拣货状态');
}
$pickTaskDetailIdArr = $pickTaskDetailIdArr->toArray();
......
app/Http/Model/Logic/PalletLogic.php
......@@ -44,7 +44,7 @@ class PalletLogic
public function palletActive($data)
{
if (empty($boxSnArr = explode(',',$data['box_sn_str']))){
if (empty($boxSnArr = array_filter(explode(',',$data['box_sn_str'])))){
throw new \Exception('装卡板箱子不能为空');
}
......@@ -91,11 +91,11 @@ class PalletLogic
//确认出库
public function confirmOutStore($data)
{
$outStoreDetailIdArr = $data['out_store_detail_id_arr'];
$outStoreDetailIdArr = $data['pick_task_detail_id_arr'];
$adminInfo = CommonLogic::getAdminInfo();
PickTaskDetailModel::whereIn('out_store_detail_id',$outStoreDetailIdArr)->update([
PickTaskDetailModel::whereIn('pick_task_detail_id',$outStoreDetailIdArr)->update([
'is_confirm'=>1,'confirm_time'=>time(),
'confirm_user_name'=>$adminInfo['admin_name'],
'confirm_user_id'=>$adminInfo['admin_id'],
......@@ -107,16 +107,16 @@ class PalletLogic
public function cancelOutStore($data)
{
//获取需要修改的货品
$outStoreDetailIdArr = $data['out_store_detail_id_arr'];
$outStoreDetailIdArr = $data['pick_task_detail_id_arr'];
PickTaskDetailModel::whereIn('out_store_detail_id',$outStoreDetailIdArr)->update(['is_confirm'=>0]);
PickTaskDetailModel::whereIn('pick_task_detail_id',$outStoreDetailIdArr)->update(['is_confirm'=>0]);
return [];
}
//发货
public function deliverGoods($data)
{
if (empty($pickTaskDetailIdArr = explode(',',$data['pick_task_detail_id_str']))){
if (empty($pickTaskDetailIdArr = array_filter(explode(',',$data['pick_task_detail_id_str'])))){
throw new \Exception('参数不完整');
}
......@@ -168,17 +168,19 @@ class PalletLogic
try{
//查找库存
foreach ($pickTaskDetailIdArr as $value){
$stockFrozen = StockFrozenModel::getWhereObj([])->where('pick_task_detail_id',$value)->get()->toArray();
$stockFrozen = StockFrozenModel::where('pick_task_detail_id',$value)->get()->toArray();
if (!empty($stockFrozen)){
foreach ($stockFrozen as $v){
$stock = StockModel::getWhereObj([])->where('stock_id',$v['stock_id'])->value('stock');
$stock = StockModel::where('stock_id',$v['stock_id'])->value('stock');
if ($stock < $v['number']){
throw new \Exception($v['goods_id'].'可扣减库存不足');
throw new \Exception(json_encode($v).json_encode($stock).'可扣减库存不足');
}
StockModel::getWhereObj([])->where('stock_id',$v['stock_id'])->update(['stock'=>bcsub($stock,$v['number'])]);
StockModel::where('stock_id',$v['stock_id'])->update(['stock'=>bcsub($stock,$v['number'])]);
//扣减实际库存
StockFrozenModel::getWhereObj([])->where('pick_task_detail_id',$value)->where('stock_id',$v['stock_id'])->update(['number'=>0,'status'=>3]);
StockFrozenModel::where('pick_task_detail_id',$value)->where('stock_id',$v['stock_id'])->update(['number'=>0,'status'=>3]);
}
}else{
throw new \Exception('出库库存为0');
}
}
......@@ -213,7 +215,7 @@ class PalletLogic
//装箱
public function packCheck($data)
{
if (empty($pickTaskDetailIdArr = explode(',',$data['pick_task_detail_id_str']))){
if (empty($pickTaskDetailIdArr = array_filter(explode(',',$data['pick_task_detail_id_str'])))){
throw new \Exception('装箱型号不能为空');
}
......
app/Http/Model/Logic/PickTaskLogic.php
......@@ -304,7 +304,7 @@ class PickTaskLogic
}
//确认拣货
PickTaskDetailModel::where('pick_task_detail_id',$pickTaskDetailIdArr)->update(['pick_status'=>3,'pick_time'=>time(),'pick_user_name'=>CommonLogic::getAdminInfo()['admin_name']]);
PickTaskDetailModel::whereIn('pick_task_detail_id',$pickTaskDetailIdArr)->update(['pick_status'=>3,'pick_time'=>time(),'pick_user_name'=>CommonLogic::getAdminInfo()['admin_name']]);
DB::commit();
}catch (\Exception $exception){
......@@ -479,7 +479,7 @@ class PickTaskLogic
StockFrozenModel::where('pick_task_detail_id',$value['pick_task_detail_id'])->update(['number'=>0]);
//取消拣货
PickTaskDetailModel::where('pick_task_detail_id',$pickTaskDetailIdArr)->update(['pick_status'=>4]);
PickTaskDetailModel::where('pick_task_detail_id',$value['pick_task_detail_id'])->update(['pick_status'=>4]);
}
DB::commit();
......
storage/laravels.json
{"server":{"listen_ip":"0.0.0.0","listen_port":"40003","socket_type":1,"enable_coroutine_runtime":false,"server":"LaravelS","handle_static":false,"laravel_base_path":"/usr/local/var/www/ichunt/scm_wms_outstore_service","inotify_reload":{"enable":false,"watch_path":"/usr/local/var/www/ichunt/scm_wms_outstore_service","file_types":[".php"],"excluded_dirs":[],"log":true},"event_handlers":[],"websocket":{"enable":false},"sockets":[],"processes":[],"timer":{"enable":false,"jobs":[],"pid_file":"/usr/local/var/www/ichunt/scm_wms_outstore_service/storage/laravels-timer.pid","max_wait_time":5},"events":[],"swoole_tables":[],"register_providers":[],"cleaners":[],"swoole":{"daemonize":false,"dispatch_mode":2,"reactor_num":4,"worker_num":"3","task_worker_num":3,"task_ipc_mode":1,"task_max_request":8000,"task_tmpdir":"/tmp","max_request":8000,"open_tcp_nodelay":true,"pid_file":"/usr/local/var/www/ichunt/scm_wms_outstore_service/storage/laravels.pid","log_file":"/usr/local/var/www/ichunt/scm_wms_outstore_service/storage/logs/swoole-2020-05.log","log_level":4,"document_root":"/usr/local/var/www/ichunt/scm_wms_outstore_service/public","buffer_output_size":2097152,"socket_buffer_size":134217728,"package_max_length":4194304,"reload_async":true,"max_wait_time":60,"enable_reuse_port":true,"enable_coroutine":false,"http_compression":false},"enable_gzip":false,"process_prefix":"/usr/local/var/www/ichunt/scm_wms_outstore_service","ignore_check_pid":false},"laravel":{"root_path":"/usr/local/var/www/ichunt/scm_wms_outstore_service","static_path":"/usr/local/var/www/ichunt/scm_wms_outstore_service/public","cleaners":[],"register_providers":[],"is_lumen":true,"_SERVER":{"SHELL":"/bin/bash","TERM":"xterm-256color","HOMEBREW_BOTTLE_DOMAIN":"https://mirrors.tuna.tsinghua.edu.cn/homebrew-bottles","TMPDIR":"/var/folders/vd/95yw3kdx65n1qw9ggmkkkp7c0000gn/T/","Apple_PubSub_Socket_Render":"/private/tmp/com.apple.launchd.Kf23TI0KAV/Render","USER":"gongyang","SSH_AUTH_SOCK":"/private/tmp/com.apple.launchd.DbjEFRUETz/Listeners","__CF_USER_TEXT_ENCODING":"0x1F5:0x19:0x34","PATH":"/usr/local/opt/mysql@5.7/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/go/bin","_":"/usr/bin/php","PWD":"/usr/local/var/www/ichunt/scm_wms_outstore_service","XPC_FLAGS":"0x0","XPC_SERVICE_NAME":"0","HOME":"/Users/gongyang","SHLVL":"2","LOGNAME":"gongyang","LC_CTYPE":"zh_CN.UTF-8","PHP_SELF":"/usr/local/var/www/ichunt/scm_wms_outstore_service/artisan","SCRIPT_NAME":"/usr/local/var/www/ichunt/scm_wms_outstore_service/artisan","SCRIPT_FILENAME":"/usr/local/var/www/ichunt/scm_wms_outstore_service/artisan","PATH_TRANSLATED":"/usr/local/var/www/ichunt/scm_wms_outstore_service/artisan","DOCUMENT_ROOT":"","REQUEST_TIME_FLOAT":1589703379.460019,"REQUEST_TIME":1589703379,"argv":["/usr/local/var/www/ichunt/scm_wms_outstore_service/artisan","laravels","config"],"argc":3,"APP_ENV":"local","APP_DEBUG":"true","APP_KEY":"","APP_TIMEZONE":"PRC","DB_TIMEZONE":"+08:00","SYSTEM_CODE":"01","SYSTEM_NAME":"服务初始服务(开发环境)","LARAVELS_LISTEN_IP":"0.0.0.0","LARAVELS_LISTEN_PORT":"40003","worker_num":"3","DB_CONNECTION":"mysql","DB_HOST":"192.168.2.232","DB_USERNAME":"liexin_scm_wms","DB_PASSWORD":"liexin_scm_wms#zsyM","DB_PORT":"3306","DB_DATABASE":"liexin_scm_wms","DB_PREFIX":"lie_","REDIS_HOST":"192.168.1.235","REDIS_PASSWORD":"icDb29mLy2s","REDIS_PORT":"6379","REDIS_READ_HOST":"192.168.1.237","REDIS_READ_PASSWORD":"icDb29mLy2s","REDIS_READ_PORT":"6379","CACHE_DRIVER":"file","QUEUE_DRIVER":"sync","RABBIT_IP":"192.168.1.237","RABBIT_PORT":"5672","RABBIT_USER":"huntadmin","RABBIT_PASS":"jy2y2900","RABBITMQ_LOG_HOST":"192.168.1.237","RABBITMQ_LOG_PORT":"5672","RABBITMQ_LOG_VHOST":"/","RABBITMQ_LOG_LOGIN":"huntadmin","RABBITMQ_LOG_PASSWORD":"jy2y2900","RABBITMQ_LOG_QUEUE":"scm_wms_log","SHELL_VERBOSITY":0},"_ENV":{"APP_ENV":"local","APP_DEBUG":"true","APP_KEY":"","APP_TIMEZONE":"PRC","DB_TIMEZONE":"+08:00","SYSTEM_CODE":"01","SYSTEM_NAME":"服务初始服务(开发环境)","LARAVELS_LISTEN_IP":"0.0.0.0","LARAVELS_LISTEN_PORT":"40003","worker_num":"3","DB_CONNECTION":"mysql","DB_HOST":"192.168.2.232","DB_USERNAME":"liexin_scm_wms","DB_PASSWORD":"liexin_scm_wms#zsyM","DB_PORT":"3306","DB_DATABASE":"liexin_scm_wms","DB_PREFIX":"lie_","REDIS_HOST":"192.168.1.235","REDIS_PASSWORD":"icDb29mLy2s","REDIS_PORT":"6379","REDIS_READ_HOST":"192.168.1.237","REDIS_READ_PASSWORD":"icDb29mLy2s","REDIS_READ_PORT":"6379","CACHE_DRIVER":"file","QUEUE_DRIVER":"sync","RABBIT_IP":"192.168.1.237","RABBIT_PORT":"5672","RABBIT_USER":"huntadmin","RABBIT_PASS":"jy2y2900","RABBITMQ_LOG_HOST":"192.168.1.237","RABBITMQ_LOG_PORT":"5672","RABBITMQ_LOG_VHOST":"/","RABBITMQ_LOG_LOGIN":"huntadmin","RABBITMQ_LOG_PASSWORD":"jy2y2900","RABBITMQ_LOG_QUEUE":"scm_wms_log","SHELL_VERBOSITY":0}}}
\ No newline at end of file
{"server":{"listen_ip":"0.0.0.0","listen_port":"40003","socket_type":1,"enable_coroutine_runtime":false,"server":"LaravelS","handle_static":false,"laravel_base_path":"/usr/local/var/www/ichunt/scm_wms_outstore_service","inotify_reload":{"enable":false,"watch_path":"/usr/local/var/www/ichunt/scm_wms_outstore_service","file_types":[".php"],"excluded_dirs":[],"log":true},"event_handlers":[],"websocket":{"enable":false},"sockets":[],"processes":[],"timer":{"enable":false,"jobs":[],"pid_file":"/usr/local/var/www/ichunt/scm_wms_outstore_service/storage/laravels-timer.pid","max_wait_time":5},"events":[],"swoole_tables":[],"register_providers":[],"cleaners":[],"swoole":{"daemonize":false,"dispatch_mode":2,"reactor_num":4,"worker_num":"3","task_worker_num":3,"task_ipc_mode":1,"task_max_request":8000,"task_tmpdir":"/tmp","max_request":8000,"open_tcp_nodelay":true,"pid_file":"/usr/local/var/www/ichunt/scm_wms_outstore_service/storage/laravels.pid","log_file":"/usr/local/var/www/ichunt/scm_wms_outstore_service/storage/logs/swoole-2020-05.log","log_level":4,"document_root":"/usr/local/var/www/ichunt/scm_wms_outstore_service/public","buffer_output_size":2097152,"socket_buffer_size":134217728,"package_max_length":4194304,"reload_async":true,"max_wait_time":60,"enable_reuse_port":true,"enable_coroutine":false,"http_compression":false},"enable_gzip":false,"process_prefix":"/usr/local/var/www/ichunt/scm_wms_outstore_service","ignore_check_pid":false},"laravel":{"root_path":"/usr/local/var/www/ichunt/scm_wms_outstore_service","static_path":"/usr/local/var/www/ichunt/scm_wms_outstore_service/public","cleaners":[],"register_providers":[],"is_lumen":true,"_SERVER":{"SHELL":"/bin/bash","TERM":"xterm-256color","HOMEBREW_BOTTLE_DOMAIN":"https://mirrors.tuna.tsinghua.edu.cn/homebrew-bottles","TMPDIR":"/var/folders/vd/95yw3kdx65n1qw9ggmkkkp7c0000gn/T/","Apple_PubSub_Socket_Render":"/private/tmp/com.apple.launchd.Kf23TI0KAV/Render","USER":"gongyang","SSH_AUTH_SOCK":"/private/tmp/com.apple.launchd.DbjEFRUETz/Listeners","__CF_USER_TEXT_ENCODING":"0x1F5:0x19:0x34","PATH":"/usr/local/opt/mysql@5.7/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/go/bin","_":"/usr/bin/php","PWD":"/usr/local/var/www/ichunt/scm_wms_outstore_service","XPC_FLAGS":"0x0","XPC_SERVICE_NAME":"0","HOME":"/Users/gongyang","SHLVL":"2","LOGNAME":"gongyang","LC_CTYPE":"zh_CN.UTF-8","PHP_SELF":"/usr/local/var/www/ichunt/scm_wms_outstore_service/artisan","SCRIPT_NAME":"/usr/local/var/www/ichunt/scm_wms_outstore_service/artisan","SCRIPT_FILENAME":"/usr/local/var/www/ichunt/scm_wms_outstore_service/artisan","PATH_TRANSLATED":"/usr/local/var/www/ichunt/scm_wms_outstore_service/artisan","DOCUMENT_ROOT":"","REQUEST_TIME_FLOAT":1589705740.93173,"REQUEST_TIME":1589705740,"argv":["/usr/local/var/www/ichunt/scm_wms_outstore_service/artisan","laravels","config"],"argc":3,"APP_ENV":"local","APP_DEBUG":"true","APP_KEY":"","APP_TIMEZONE":"PRC","DB_TIMEZONE":"+08:00","SYSTEM_CODE":"01","SYSTEM_NAME":"服务初始服务(开发环境)","LARAVELS_LISTEN_IP":"0.0.0.0","LARAVELS_LISTEN_PORT":"40003","worker_num":"3","DB_CONNECTION":"mysql","DB_HOST":"192.168.2.232","DB_USERNAME":"liexin_scm_wms","DB_PASSWORD":"liexin_scm_wms#zsyM","DB_PORT":"3306","DB_DATABASE":"liexin_scm_wms","DB_PREFIX":"lie_","REDIS_HOST":"192.168.1.235","REDIS_PASSWORD":"icDb29mLy2s","REDIS_PORT":"6379","REDIS_READ_HOST":"192.168.1.237","REDIS_READ_PASSWORD":"icDb29mLy2s","REDIS_READ_PORT":"6379","CACHE_DRIVER":"file","QUEUE_DRIVER":"sync","RABBIT_IP":"192.168.1.237","RABBIT_PORT":"5672","RABBIT_USER":"huntadmin","RABBIT_PASS":"jy2y2900","RABBITMQ_LOG_HOST":"192.168.1.237","RABBITMQ_LOG_PORT":"5672","RABBITMQ_LOG_VHOST":"/","RABBITMQ_LOG_LOGIN":"huntadmin","RABBITMQ_LOG_PASSWORD":"jy2y2900","RABBITMQ_LOG_QUEUE":"scm_wms_log","SHELL_VERBOSITY":0},"_ENV":{"APP_ENV":"local","APP_DEBUG":"true","APP_KEY":"","APP_TIMEZONE":"PRC","DB_TIMEZONE":"+08:00","SYSTEM_CODE":"01","SYSTEM_NAME":"服务初始服务(开发环境)","LARAVELS_LISTEN_IP":"0.0.0.0","LARAVELS_LISTEN_PORT":"40003","worker_num":"3","DB_CONNECTION":"mysql","DB_HOST":"192.168.2.232","DB_USERNAME":"liexin_scm_wms","DB_PASSWORD":"liexin_scm_wms#zsyM","DB_PORT":"3306","DB_DATABASE":"liexin_scm_wms","DB_PREFIX":"lie_","REDIS_HOST":"192.168.1.235","REDIS_PASSWORD":"icDb29mLy2s","REDIS_PORT":"6379","REDIS_READ_HOST":"192.168.1.237","REDIS_READ_PASSWORD":"icDb29mLy2s","REDIS_READ_PORT":"6379","CACHE_DRIVER":"file","QUEUE_DRIVER":"sync","RABBIT_IP":"192.168.1.237","RABBIT_PORT":"5672","RABBIT_USER":"huntadmin","RABBIT_PASS":"jy2y2900","RABBITMQ_LOG_HOST":"192.168.1.237","RABBITMQ_LOG_PORT":"5672","RABBITMQ_LOG_VHOST":"/","RABBITMQ_LOG_LOGIN":"huntadmin","RABBITMQ_LOG_PASSWORD":"jy2y2900","RABBITMQ_LOG_QUEUE":"scm_wms_log","SHELL_VERBOSITY":0}}}
\ No newline at end of file
storage/laravels.pid
97105
\ No newline at end of file
5205
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment