修改

adm/src/main/java/com/minpay/common/event/SSOFilter.java

@@ -70,11 +70,14 @@ public class SSOFilter implements Filter {
 			return;
 		}
 		JSONObject userJson = JSONObject.fromObject(userStr);
+		System.out.println(userJson);
 		
 		ImUser imUser = new ImUser();
 		imUser.setId(userJson.get("id").toString());
 		imUser.setName(userJson.get("name").toString());
 		imUser.setBranchid(userJson.get("branchid").toString());
+		imUser.setLogonname(userJson.get("logonname").toString());
+		imUser.setAuthpwd(userJson.get("authpwd").toString());
 		
 //		User user = new User();
 //		user.setId(String.valueOf(b)userJson.get(""));

adm/src/main/java/com/minpay/guomao/warehousemanage/action/WarehouseReceiptManageAction.java

@@ -316,6 +316,7 @@ public class WarehouseReceiptManageAction implements IMINAction{
 			de.setCompanyId(companyId);					//货权单位
 			de.setBranchId(branchId);					//部门
 			de.setExcelReceiptId(map.get("receiptId"));	//excel仓单号
+			de.setRemarks(map.get("remarks"));
 			//插入明细
 			detailList.add(de);
 		}

adm/src/main/webapp/admin/giveOutManage/printGiveOut.html

@@ -206,8 +206,8 @@
 							return;
 						}
 						
-						var expenses = res.expenses;		// 销售费用
-						var margin = res.margin;			// 税费差
+						var expenses = isEmpty(res.expenses) ? '0' : res.expenses;		// 销售费用
+						var margin = isEmpty(res.margin) ? '0' : res.margin;			// 税费差
 						
 						var tabData = res.data;
 						var html = '';

adm/src/main/webapp/admin/stockManage/enteringWarehouseCheckMore.html

@@ -130,7 +130,7 @@
 						<div style="margin-right: 150px;">
 							<span id="branchName" contenteditable="true"></span>：
 						</div>
-						<div style="margin-right: 150px;" contenteditable="true" id = "caiwubu">财务部：</div>
+						<div style="margin-right: 150px;" contenteditable="true" id = "caiwubu">运营管理部：</div>
 					</div>
 					<div class="display5" align="center" style="font-size: 12px;">
 						<div>电话：</div>

adm/src/main/webapp/admin/wareHouseManage/stockTransferReceiptNew.html

@@ -101,7 +101,7 @@
 		</div>
 		
 		
-		<div class="f-content display" style="overflow: hidden">
+		<div class="f-content" style="overflow: hidden">
 		    <table id="tableTest" lay-filter="tableFilter"></table>
 		</div>
 		<div id="big" class="printChuku">