From f0786e779666d67a50cd57d82cfe1e278b47d397 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 04 七月 2024 11:54:11 +0800
Subject: [PATCH] fix
---
service/input_history_search.go | 3 +++
controllers/operation.go | 8 ++------
conf/config.yaml | 2 +-
start.sh | 6 ++++++
4 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/conf/config.yaml b/conf/config.yaml
index 3098340..9f137e2 100644
--- a/conf/config.yaml
+++ b/conf/config.yaml
@@ -9,7 +9,7 @@
serverId: wms
# 閫氳繃鍏徃鍚嶇О鍖哄垎鍑哄叆搴撴槑缁嗘墦鍗版ā鐗�,鐩墠鏀寔:geruimi,jialian
companyName: jialian
- env: dev
+ env: test
db:
# dsn: root:c++java123@tcp(192.168.20.119:3306)/wms?charset=utf8&parseTime=True&loc=Local
dsn: root:c++java123@tcp(127.0.0.1:3306)/aps_server2?charset=utf8&parseTime=True&loc=Local
diff --git a/controllers/operation.go b/controllers/operation.go
index d4c32c5..a841978 100644
--- a/controllers/operation.go
+++ b/controllers/operation.go
@@ -259,12 +259,8 @@
if params.OperationTypeId == 0 && int(params.BaseOperationType) == 0 {
return errors.New("鏈瘑鍒璁板綍绫诲瀷1")
- }
-
- if params.BaseOperationType != 0 {
- if params.WarehouseId == 0 {
- return errors.New("鏈瘑鍒璁板綍绫诲瀷2")
- }
+ } else if params.OperationTypeId == 0 && params.BaseOperationType != 0 && params.WarehouseId == 0 {
+ return errors.New("鏈瘑鍒璁板綍绫诲瀷2")
}
if params.OperationDate == "" {
diff --git a/service/input_history_search.go b/service/input_history_search.go
index c2d96bb..144d9ed 100644
--- a/service/input_history_search.go
+++ b/service/input_history_search.go
@@ -61,6 +61,9 @@
}
for _, record := range records {
+ if operationMap[record.OperationId] == nil {
+ continue
+ }
AddNewHistoryReportRecord(record, operationMap[record.OperationId])
}
return nil
diff --git a/start.sh b/start.sh
new file mode 100755
index 0000000..dc13e60
--- /dev/null
+++ b/start.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+pkill wms
+sleep 1s
+chmod 777 wms
+nohup ./wms &>/dev/null &
+
--
Gitblit v1.8.0