Merge branch 'master' into csc

chengsc

9 天以前 2d809c12abe87c21d6090ce6c5b3c75959cf4a2b

 Wms/Wms/Controllers/DownApiController.cs

@@ -347,7 +347,7 @@
                var jsonData = JsonConvert.SerializeObject(model);
                LogFile.SaveLogToFile($"WCS申请空托跺组托入库：( {jsonData} ),", logStr);

                var list = _http.RequestPalletIn(model.PalletNo, model.HouseNo, model.palletNum,model.locate);
                var list = _http.RequestPalletIn(model.PalletNo, model.HouseNo, model.PallNum,model.locate);

                LogFile.SaveLogToFile($"WCS申请空托跺组托入库返回：( {JsonConvert.SerializeObject(list)} ),", logStr);