Skip to content

lzzzzl / liexin_scm_service

Go to a project
Commit ed8dbff7 by mushishixian
Options

修复更改供应商的问题

parent e5f9cb05
Inline Side-by-side
Showing with 18 additions and 6 deletions
.gitmodules
[submodule "common"]
path = common
url = ssh://git@119.23.72.7:22611/yyc/Common.git
[submodule "scm_wms_common"]
path = scm_wms_common
url = ssh://git@119.23.72.7:22611/ymx/scm_wms_common.git
app/Http/Model/SupplierModel.php
......@@ -78,8 +78,12 @@ class SupplierModel extends Model
*/
public function updateSupplierInfo($arr) {
if(!empty($arr['erp_supplier_sn'])) {
$this->supSn2Redis($arr['erp_supplier_sn'],$arr['supplier_id']);
$this->supId2Redis($arr['supplier_id'],json_encode($arr));
//先去找出supplier_id
$supplierId = $this->where('erp_supplier_id', $arr['erp_supplier_id'])->value('supplier_id');
if ($supplierId) {
$this->supSn2Redis($arr['erp_supplier_sn'],$supplierId);
$this->supId2Redis($supplierId,json_encode($arr));
}
}
return $this->where('erp_supplier_id', '=', $arr)->update($arr);
}
......
common @ a2ccb5e4
Subproject commit a2ccb5e4c01af94885bf8280f5e69802a0070150
scm_wms_common @ c096853c
Subproject commit c096853cde4ffc9ab95ac49577aa03617c6f8fee
storage/laravels.json
{"server":{"listen_ip":"0.0.0.0","listen_port":"40001","socket_type":1,"enable_coroutine_runtime":false,"server":"LaravelS","handle_static":false,"laravel_base_path":"/var/www/liexin_service_initial","inotify_reload":{"enable":false,"watch_path":"/var/www/liexin_service_initial","file_types":[".php"],"excluded_dirs":[],"log":true},"event_handlers":[],"websocket":{"enable":false},"sockets":[],"processes":[],"timer":{"enable":false,"jobs":[],"pid_file":"/var/www/liexin_service_initial/storage/laravels-timer.pid","max_wait_time":5},"events":[],"swoole_tables":[],"register_providers":[],"cleaners":[],"swoole":{"daemonize":true,"dispatch_mode":2,"reactor_num":4,"worker_num":"3","task_ipc_mode":1,"task_max_request":8000,"task_tmpdir":"/dev/shm","max_request":8000,"open_tcp_nodelay":true,"pid_file":"/var/www/liexin_service_initial/storage/laravels.pid","log_file":"/var/www/liexin_service_initial/storage/logs/swoole-2020-04.log","log_level":4,"document_root":"/var/www/liexin_service_initial/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":"/var/www/liexin_service_initial","ignore_check_pid":false},"laravel":{"root_path":"/var/www/liexin_service_initial","static_path":"/var/www/liexin_service_initial/public","cleaners":[],"register_providers":[],"is_lumen":true,"_SERVER":{"PHP_EXTRA_CONFIGURE_ARGS":"--enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data --disable-cgi","HOSTNAME":"1e472cf58def","PHP_INI_DIR":"/usr/local/etc/php","SHLVL":"1","HOME":"/root","OLDPWD":"/var/www","PHP_LDFLAGS":"-Wl,-O1 -Wl,--hash-style=both -pie","PHP_MD5":"","PHP_CFLAGS":"-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64","PHP_VERSION":"7.2.27","GPG_KEYS":"1729F83938DA44E27BA0F4D3DBDB397470D12172 B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F","PHP_ASC_URL":"https://www.php.net/get/php-7.2.27.tar.xz.asc/from/this/mirror","PHP_CPPFLAGS":"-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64","_":"/usr/local/bin/php","PHP_URL":"https://www.php.net/get/php-7.2.27.tar.xz/from/this/mirror","TERM":"xterm","PATH":"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin","PWD":"/var/www/liexin_service_initial","PHPIZE_DEPS":"autoconf \t\tdpkg-dev \t\tfile \t\tg++ \t\tgcc \t\tlibc-dev \t\tmake \t\tpkg-config \t\tre2c","PHP_SHA256":"7bd0fb9e3b63cfe53176d1f3565cd686f90b3926217158de5ba57091f49e4c32","PHP_SELF":"/var/www/liexin_service_initial/artisan","SCRIPT_NAME":"/var/www/liexin_service_initial/artisan","SCRIPT_FILENAME":"/var/www/liexin_service_initial/artisan","PATH_TRANSLATED":"/var/www/liexin_service_initial/artisan","DOCUMENT_ROOT":"","REQUEST_TIME_FLOAT":1586489789.744501,"REQUEST_TIME":1586489789,"argv":["/var/www/liexin_service_initial/artisan","laravels","config","--daemonize"],"argc":4,"APP_ENV":"local","APP_DEBUG":"true","APP_KEY":"","APP_TIMEZONE":"PRC","SYSTEM_CODE":"01","SYSTEM_NAME":"服务初始服务(开发环境)","LARAVELS_LISTEN_IP":"0.0.0.0","LARAVELS_LISTEN_PORT":"40001","worker_num":"3","DB_CONNECTION":"mysql","DB_HOST":"192.168.1.235","DB_USERNAME":"icDb29mLy2s","DB_PASSWORD":"icDb29mLy2s","DB_PORT":"3306","DB_DATABASE":"0","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","SHELL_VERBOSITY":0},"_ENV":{"PHP_EXTRA_CONFIGURE_ARGS":"--enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data --disable-cgi","HOSTNAME":"1e472cf58def","PHP_INI_DIR":"/usr/local/etc/php","SHLVL":"1","HOME":"/root","OLDPWD":"/var/www","PHP_LDFLAGS":"-Wl,-O1 -Wl,--hash-style=both -pie","PHP_MD5":"","PHP_CFLAGS":"-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64","PHP_VERSION":"7.2.27","GPG_KEYS":"1729F83938DA44E27BA0F4D3DBDB397470D12172 B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F","PHP_ASC_URL":"https://www.php.net/get/php-7.2.27.tar.xz.asc/from/this/mirror","PHP_CPPFLAGS":"-fstack-protector-strong -fpic -fpie -O2 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64","_":"/usr/local/bin/php","PHP_URL":"https://www.php.net/get/php-7.2.27.tar.xz/from/this/mirror","TERM":"xterm","PATH":"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin","PWD":"/var/www/liexin_service_initial","PHPIZE_DEPS":"autoconf \t\tdpkg-dev \t\tfile \t\tg++ \t\tgcc \t\tlibc-dev \t\tmake \t\tpkg-config \t\tre2c","PHP_SHA256":"7bd0fb9e3b63cfe53176d1f3565cd686f90b3926217158de5ba57091f49e4c32","APP_ENV":"local","APP_DEBUG":"true","APP_KEY":"","APP_TIMEZONE":"PRC","SYSTEM_CODE":"01","SYSTEM_NAME":"服务初始服务(开发环境)","LARAVELS_LISTEN_IP":"0.0.0.0","LARAVELS_LISTEN_PORT":"40001","worker_num":"3","DB_CONNECTION":"mysql","DB_HOST":"192.168.1.235","DB_USERNAME":"icDb29mLy2s","DB_PASSWORD":"icDb29mLy2s","DB_PORT":"3306","DB_DATABASE":"0","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","SHELL_VERBOSITY":0}}}
\ No newline at end of file
{"server":{"listen_ip":"0.0.0.0","listen_port":"40001","socket_type":1,"enable_coroutine_runtime":false,"server":"LaravelS","handle_static":false,"laravel_base_path":"/home/vagrant/Code/liexin_scm_service","inotify_reload":{"enable":false,"watch_path":"/home/vagrant/Code/liexin_scm_service","file_types":[".php"],"excluded_dirs":[],"log":true},"event_handlers":[],"websocket":{"enable":false},"sockets":[],"processes":[],"timer":{"enable":false,"jobs":[],"pid_file":"/home/vagrant/Code/liexin_scm_service/storage/laravels-timer.pid","max_wait_time":5},"events":[],"swoole_tables":[],"register_providers":[],"cleaners":[],"swoole":{"daemonize":true,"dispatch_mode":2,"reactor_num":4,"worker_num":"3","task_worker_num":3,"task_ipc_mode":1,"task_max_request":8000,"task_tmpdir":"/dev/shm","max_request":8000,"open_tcp_nodelay":true,"pid_file":"/home/vagrant/Code/liexin_scm_service/storage/laravels.pid","log_file":"/home/vagrant/Code/liexin_scm_service/storage/logs/swoole-2020-05.log","log_level":4,"document_root":"/home/vagrant/Code/liexin_scm_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":"/home/vagrant/Code/liexin_scm_service","ignore_check_pid":false},"laravel":{"root_path":"/home/vagrant/Code/liexin_scm_service","static_path":"/home/vagrant/Code/liexin_scm_service/public","cleaners":[],"register_providers":[],"is_lumen":true,"_SERVER":{"LESSOPEN":"| /usr/bin/lesspipe %s","MAIL":"/var/mail/vagrant","USER":"vagrant","SSH_CLIENT":"10.0.2.2 55087 22","LANGUAGE":"en_US:","SHLVL":"4","OLDPWD":"/home/vagrant/Code","HOME":"/home/vagrant","SSH_TTY":"/dev/pts/1","LOGNAME":"vagrant","_":"/usr/bin/php","XDG_SESSION_ID":"912","TERM":"cygwin","PATH":"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games","S_COLORS":"auto","XDG_RUNTIME_DIR":"/run/user/1000","LANG":"en_US.UTF-8","LS_COLORS":"rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:mi=00:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arc=01;31:*.arj=01;31:*.taz=01;31:*.lha=01;31:*.lz4=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.tzo=01;31:*.t7z=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.dz=01;31:*.gz=01;31:*.lrz=01;31:*.lz=01;31:*.lzo=01;31:*.xz=01;31:*.zst=01;31:*.tzst=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.alz=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.cab=01;31:*.wim=01;31:*.swm=01;31:*.dwm=01;31:*.esd=01;31:*.jpg=01;35:*.jpeg=01;35:*.mjpg=01;35:*.mjpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.m4a=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.oga=00;36:*.opus=00;36:*.spx=00;36:*.xspf=00;36:","SHELL":"/bin/bash","LESSCLOSE":"/usr/bin/lesspipe %s %s","LC_ALL":"en_US.UTF-8","PWD":"/home/vagrant/Code/liexin_scm_service","SSH_CONNECTION":"10.0.2.2 55087 10.0.2.15 22","XDG_DATA_DIRS":"/usr/local/share:/usr/share:/var/lib/snapd/desktop","PHP_SELF":"/home/vagrant/Code/liexin_scm_service/artisan","SCRIPT_NAME":"/home/vagrant/Code/liexin_scm_service/artisan","SCRIPT_FILENAME":"/home/vagrant/Code/liexin_scm_service/artisan","PATH_TRANSLATED":"/home/vagrant/Code/liexin_scm_service/artisan","DOCUMENT_ROOT":"","REQUEST_TIME_FLOAT":1590131449.026981,"REQUEST_TIME":1590131449,"argv":["/home/vagrant/Code/liexin_scm_service/artisan","laravels","config","--daemonize"],"argc":4,"APP_ENV":"local","APP_DEBUG":"true","APP_KEY":"","APP_TIMEZONE":"PRC","SYSTEM_CODE":"01","SYSTEM_NAME":"服务初始服务(开发环境)","LARAVELS_LISTEN_IP":"0.0.0.0","LARAVELS_LISTEN_PORT":"40001","worker_num":"3","DB_CONNECTION":"mysql","DB_HOST":"192.168.2.232","DB_USERNAME":"liexin_scm_wms","DB_PASSWORD":"liexin_scm_wms#zsyM","DB_DATABASE":"liexin_scm_wms","DB_PORT":"3306","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","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","SYSTEM_CODE":"01","SYSTEM_NAME":"服务初始服务(开发环境)","LARAVELS_LISTEN_IP":"0.0.0.0","LARAVELS_LISTEN_PORT":"40001","worker_num":"3","DB_CONNECTION":"mysql","DB_HOST":"192.168.2.232","DB_USERNAME":"liexin_scm_wms","DB_PASSWORD":"liexin_scm_wms#zsyM","DB_DATABASE":"liexin_scm_wms","DB_PORT":"3306","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","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
33613
\ No newline at end of file
15272
\ 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