修改

adm/src/main/java/com/minpay/guomao/contractmanage/action/FinanceToExecl.java

@@ -488,7 +488,7 @@ public class FinanceToExecl implements IMINAction{
 		}
 		
 		//获取表头信息
-		String exportExcel = "   日期   #dates, 长江价 #cjPrice, 南储价 #ncPrice,上海有色网价#shPrice,沪铝结算价#shPrice";
+		String exportExcel = "   日期   #dates, 长江价 #cjPrice, 南储价 #ncPrice,上海有色网价#shPrice,沪铝结算价#hlPrice,钢联南储均价#glPrice";
 		String[] excelHeader = exportExcel.split(",");
 		
 		//导出Excel

adm/src/main/java/com/minpay/guomao/datamanage/action/PriceManageAction.java

@@ -448,6 +448,8 @@ public class PriceManageAction implements IMINAction {
 			arrType.add("00");
 			arrType.add("01");
 			arrType.add("06");
+			arrType.add("07");
+			arrType.add("08");
 			ApPriceInfExample apiEx = new ApPriceInfExample();
 			apiEx.createCriteria().andSpecsIdEqualTo(arId).andDateEqualTo(dateTime)
 										.andTypeIn(arrType).andAreaEqualTo("00").andStateEqualTo("00")
@@ -510,6 +512,18 @@ public class PriceManageAction implements IMINAction {
 			aei.setType("06");
 			aei.setPrice(map.get("shPrice"));
 			Service.lookup(IMINDataBaseService.class).getMybatisMapper(ApPriceInfMapper.class).insertSelective(aei);
+			//新增沪铝结算价
+			String hlId = Service.lookup(IPublicService.class).getSequence("AP_PRICE_INF_ID");
+			aei.setId(hlId);
+			aei.setType("07");
+			aei.setPrice(map.get("hlPrice"));
+			Service.lookup(IMINDataBaseService.class).getMybatisMapper(ApPriceInfMapper.class).insertSelective(aei);
+			//新增钢联南储均价
+			String glId = Service.lookup(IPublicService.class).getSequence("AP_PRICE_INF_ID");
+			aei.setId(glId);
+			aei.setType("08");
+			aei.setPrice(map.get("glPrice"));
+			Service.lookup(IMINDataBaseService.class).getMybatisMapper(ApPriceInfMapper.class).insertSelective(aei);
 		}
 		return res;
 	}
@@ -536,7 +550,7 @@ public class PriceManageAction implements IMINAction {
 			throw new BusinessCodeException("JINM0501");//文件格式不对，请下载模板后上传
 		}
 		// 获取表格信息
-			String[] titleKey = new String[]{"date","cjPrice","ncPrice","shPrice"};
+			String[] titleKey = new String[]{"date","cjPrice","ncPrice","shPrice","hlPrice","glPrice"};
 			list = FilesUtil.readExecleasy(fileItem, titleKey, 2);
 		
 		if (list.size() == 0) {

adm/src/main/java/com/minpay/guomao/giveoutmanage/GiveStockManageAction.java

@@ -236,6 +236,7 @@ public class GiveStockManageAction implements IMINAction {
 			wareDetail.setTax("13");
 			wareDetail.setOrderId(orderId);
 			wareDetail.setBranchId(user.getBranchId());
+			wareDetail.setRemarks(orderLogistics.getRemarks());
 			detailList.add(wareDetail);
 			//
 			orderLogistics.setWareId(wareDetailId);				//库存明细id
@@ -874,6 +875,7 @@ public class GiveStockManageAction implements IMINAction {
 			wareDetail.setTax("13");
 			wareDetail.setOrderId(orderId);
 			wareDetail.setBranchId(user.getBranchId());
+			wareDetail.setRemarks(orderLogistics.getRemarks());
 			inDetailList.add(wareDetail);
 			
 			orderLogistics.setWareId(wareDetailId);				//库存明细id

adm/src/main/java/com/minpay/guomao/giveoutmanage/giveOutManageAction.java

@@ -1,7 +1,9 @@
 package com.minpay.guomao.giveoutmanage;
 
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.lang.reflect.InvocationTargetException;
+import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -11,6 +13,7 @@ import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.lang.StringUtils;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 
+import com.min.base64.Base64;
 import com.minpay.common.bean.User;
 import com.minpay.common.exception.BusinessCodeException;
 import com.minpay.common.format.IFormatService;
@@ -1803,6 +1806,7 @@ public class giveOutManageAction implements IMINAction {
 	 * @param session
 	 * @return
 	 * @throws MINBusinessException
+	 * @throws UnsupportedEncodingException 
 	 */
 	@MINAction(value = FREIGHT_PRINTING_SAVE, transaction = IMINTransactionEnum.CMT)
 	public MINActionResult freightPrintingSave(
@@ -1810,7 +1814,9 @@ public class giveOutManageAction implements IMINAction {
 			@MINParam(key = "datesTwo") String datesTwo,
 			@MINParam(key = "transporter") String transporter,
 			@MINParam(key = "saveHtml") String saveHtml,
-			MINSession session) throws MINBusinessException{
+			MINSession session) throws MINBusinessException, UnsupportedEncodingException{
+		saveHtml = Base64.decode(saveHtml);
+		saveHtml = URLDecoder.decode(saveHtml, "UTF-8");
 		saveHtml = CommonUtil.replaceSTRN(saveHtml);
 		MINActionResult res = new MINActionResult();
 		User u = session.getUser();

adm/src/main/java/com/minpay/guomao/personmanage/action/PersonManageAction.java

@@ -10,6 +10,7 @@ import com.minpay.common.util.CheckPassword;
 import com.minpay.common.util.RegexUtil;
 import com.minpay.db.table.mapper.ImUserMapper;
 import com.minpay.db.table.model.ImUser;
+import com.rrtx.jedis.RedisUtil;
 import com.startup.minpay.frame.business.IMINAction;
 import com.startup.minpay.frame.business.res.MINActionResult;
 import com.startup.minpay.frame.exception.MINBusinessException;
@@ -172,6 +173,8 @@ public class PersonManageAction implements IMINAction {
 		Service.lookup(ILogService.class).logging(session, logInfo);
 		
 		try {
+			String token = request.getHeader("Authorization");
+			RedisUtil.delete(token);
 			//处理正常状态
 			if( session != null ){
 				MINServiceLocator.getInstance()

adm/src/main/java/com/minpay/guomao/transManage/TransManageAction.java

@@ -482,15 +482,17 @@ public class TransManageAction implements IMINAction{
 		//获取ERP单号
 		String erpNo = orderInfo.getErpNo();
 		//SAP销售订单号
-		Map EBELNMap = (Map)(returnObject.get(0));
-		String EBELN = EBELNMap.get("EBELN").toString();
-		//ERP单号为空
-		if(!CommonUtil.isEmpty(erpNo)){
-			//erp单号
-			orderInfo.setErpNo(erpNo+"/"+EBELN);
-		}else{
-			//erp单号
-			orderInfo.setErpNo(EBELN);
+		for(int i = 0; i < returnObject.size(); i ++) {
+			Map EBELNMap = (Map)(returnObject.get(i));
+			String EBELN = EBELNMap.get("EBELN").toString();
+			//ERP单号为空
+			if(!CommonUtil.isEmpty(orderInfo.getErpNo())){
+				//erp单号
+				orderInfo.setErpNo(orderInfo.getErpNo()+"/"+EBELN);
+			}else{
+				//erp单号
+				orderInfo.setErpNo(EBELN);
+			}
 		}
 		
 		//修改时间
@@ -525,7 +527,15 @@ public class TransManageAction implements IMINAction{
 			//实际结算总价
 			flow.setRealTotal(data.get("amount").toString());
 			//erp单号
-			flow.setErpNo(EBELN);
+			if(tableList.size() == returnObject.size()) {
+				Map EBELNMap = (Map)(returnObject.get(i));
+				String EBELN = EBELNMap.get("EBELN").toString();
+				flow.setErpNo(EBELN);
+			} else {
+				Map EBELNMap = (Map)(returnObject.get(0));
+				String EBELN = EBELNMap.get("EBELN").toString();
+				flow.setErpNo(EBELN);
+			}
 			//创建时间
 			flow.setCreateTime(TIMESTAMP);
 			//创建人		TODO
@@ -688,18 +698,20 @@ public class TransManageAction implements IMINAction{
 		//获取订单信息
 		ApOrderInf orderInfo = Service.lookup(IMINDataBaseService.class).getMybatisMapper(ApOrderInfMapper.class).selectByPrimaryKey(orderId);
 		//获取ERP单号
-		String erpNo = orderInfo.getErpNo();
-		Map VBELNMap = (Map)(returnObject.get(0));
-		String VBELN = VBELNMap.get("VBELN").toString();
-		//ERP单号为空
-		if(!CommonUtil.isEmpty(erpNo)){
-			//erp单号
-			orderInfo.setErpNo(erpNo+"/"+VBELN);
-		}else{
-			//erp单号
-			orderInfo.setErpNo(VBELN);
+		for(int i = 0; i < returnObject.size(); i ++) {
+			Map VBELNMap = (Map)(returnObject.get(0));
+			String VBELN = VBELNMap.get("VBELN").toString();
+			//ERP单号为空
+			if(!CommonUtil.isEmpty(orderInfo.getErpNo())){
+				//erp单号
+				orderInfo.setErpNo(orderInfo.getErpNo()+"/"+VBELN);
+			}else{
+				//erp单号
+				orderInfo.setErpNo(VBELN);
+			}
 		}
 		
+		
 		//修改时间
 		orderInfo.setModifyTime(TIMESTAMP);
 		//修改订单
@@ -733,7 +745,15 @@ public class TransManageAction implements IMINAction{
 			//实际结算总价
 			flow.setRealTotal(data.get("amount").toString());
 			//erp单号
-			flow.setErpNo(VBELN);
+			if(tableList.size() == returnObject.size()) {
+				Map EBELNMap = (Map)(returnObject.get(i));
+				String VBELN = EBELNMap.get("VBELN").toString();
+				flow.setErpNo(VBELN);
+			} else {
+				Map EBELNMap = (Map)(returnObject.get(0));
+				String VBELN = EBELNMap.get("VBELN").toString();
+				flow.setErpNo(VBELN);
+			}
 			//创建时间
 			flow.setCreateTime(TIMESTAMP);
 			//创建人		TODO

adm/src/main/resources/com/minpay/db/table/own/mapper/ProductionPlanStatisticMapper.xml

@@ -10,7 +10,8 @@
 		cast(ROUND(SUM(CASE WHEN AEI_TYPE = '00' THEN AEI_PRICE ELSE 0 END),2) as char) 'ncPrice',
 		cast(ROUND(SUM(CASE WHEN AEI_TYPE = '01' THEN AEI_PRICE ELSE 0 END),2) as char) 'cjPrice',
 		cast(ROUND(SUM(CASE WHEN AEI_TYPE = '06' THEN AEI_PRICE ELSE 0 END),2) as char) 'shPrice',
-		cast(ROUND(SUM(CASE WHEN AEI_TYPE = '07' THEN AEI_PRICE ELSE 0 END),2) as char) 'hlPrice'
+		cast(ROUND(SUM(CASE WHEN AEI_TYPE = '07' THEN AEI_PRICE ELSE 0 END),2) as char) 'hlPrice',
+		cast(ROUND(SUM(CASE WHEN AEI_TYPE = '08' THEN AEI_PRICE ELSE 0 END),2) as char) 'glPrice'
 		FROM ap_price_inf
 		LEFT JOIN ap_product_spec_rel 
 		ON ASR_SPEC_NO = AEI_SPECS_ID

adm/src/main/resources/rebel.xml

@@ -2,20 +2,15 @@
 
 <!--
   This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
-  Refer to https://manuals.zeroturnaround.com/jrebel/standalone/config.html for more information.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
 -->
-<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_1.xsd">
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
+
+	<id>adm</id>
 
 	<classpath>
-		<dir name="D:/workspace/shly/adm/target/classes">
+		<dir name="D:/workspace/shanghai/guomao/adm/target/classes">
 		</dir>
 	</classpath>
 
-	<web>
-		<link target="/">
-			<dir name="D:/workspace/shly/adm/src/main/webapp">
-			</dir>
-		</link>
-	</web>
-
 </application>

adm/src/main/webapp/WEB-INF/config.properties

@@ -3,19 +3,16 @@
 #dataSource.driverClassName=com.mysql.jdbc.Driver
 
 #ceshi
-#dataSource.url=jdbc:mysql://123.138.111.28:3506/guomaotest?useUnicode=true&characterEncoding=UTF8&autoReconnect=true
-#dataSource.username=root
-#dataSource.password=123456
-#dataSource.url=jdbc:mysql://106.12.253.71:3306/guomaotest?useUnicode=true&characterEncoding=UTF8&autoReconnect=true
-#dataSource.username=root
-#dataSource.password=Keao@2022
+dataSource.url=jdbc:mysql://106.12.253.71:3306/guomaotest?useUnicode=true&characterEncoding=UTF8&autoReconnect=true
+dataSource.username=root
+dataSource.password=Keao@2022
 #shengchan
 #dataSource.url=jdbc:mysql://rm-bp1fic3mnw98q3149to.mysql.rds.aliyuncs.com:3306/guomaodb?useUnicode=true&characterEncoding=UTF8
 #dataSource.username=guomaouser
 #dataSource.password=Aa111111
-dataSource.url=jdbc:mysql://172.16.128.210:3306/guomaodb?useUnicode=true&characterEncoding=UTF8
-dataSource.username=root
-dataSource.password=123456
+#dataSource.url=jdbc:mysql://172.16.128.210:3306/guomaodb?useUnicode=true&characterEncoding=UTF8
+#dataSource.username=root
+#dataSource.password=123456
 
 
 config.MINDebug=false

adm/src/main/webapp/admin/customerManage/editCustomer.html

@@ -69,7 +69,7 @@
 		<div class="layui-inline">
 			<label class="layui-form-label">ERP客商编码：</label>
 			<div class="layui-input-inline">
-				<input type="tel" name="aciErpCode" maxlength="10" id="aciErpCode" disabled="disabled" autocomplete="off" placeholder="请输入ERP客商编码" class="layui-input">
+				<input type="tel" name="aciErpCode" maxlength="10" id="aciErpCode" autocomplete="off" placeholder="请输入ERP客商编码" class="layui-input">
 			</div>
 		</div>
 	</div>	

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

@@ -367,7 +367,7 @@
 			$.ErrorAlert("请先查询！");
 			return;
 		}
-     	var saveHtml = $("#big").html();
+     	var saveHtml = window.btoa(encodeURI($("#big").html()));
 	    $.request({
    			action : 'giveOutManageAction/freightPrintingSave',
    			data : {MINView:"JSON", datesTwo : datesTwo,transporter : transporter, saveHtml : saveHtml, id : id},

adm/src/main/webapp/admin/orderManage/transferDetail.html

@@ -36,38 +36,6 @@
 			</div>
 		</div>
 	</div>
-	<!-- <div class="layui-form-item">
-		<div class="layui-inline">
-			<label class="layui-form-label">*本次传输数量：</label>
-			<div class="layui-input-inline">
-				<input type="tel" name="transferNum" maxlength="10" id="transferNum" oninput="getAmt('1')" lay-verify="transferNum" autocomplete="off" placeholder="请输入本次传输数量" class="layui-input">
-			</div>
-		</div>
-	</div>
-	<div class="layui-form-item">
-		<div class="layui-inline">
-			<label class="layui-form-label">*预结算单价：</label>
-			<div class="layui-input-inline">
-				<input type="tel" name="preSettlement" maxlength="10" id="preSettlement" oninput="getAmt('2')" lay-verify="preSettlement" autocomplete="off" placeholder="请输入预结算单价" class="layui-input">
-			</div>
-		</div>
-	</div>
-	<div class="layui-form-item">
-		<div class="layui-inline">
-			<label class="layui-form-label">本次实际结算总价：</label>
-			<div class="layui-input-inline">
-				<input type="tel" name="actualTotal" maxlength="10" id="actualTotal" disabled="disabled" lay-verify="actualTotal" autocomplete="off"  class="layui-input">
-			</div>
-		</div>
-	</div>
-	<div class="layui-form-item">
-		<div class="layui-inline">
-			<label class="layui-form-label">本次预结算总价：</label>
-			<div class="layui-input-inline">
-				<input type="tel" name="preTotal" maxlength="5" id="preTotal"  disabled="disabled" autocomplete="off"  class="layui-input">
-			</div>
-		</div>
-	</div> -->
 	<div class="a-lowerpart">
 		<div class="a-lowerpart-title">传输明细</div>
 			<div class="shadow-content">

adm/src/main/webapp/admin/priceManage/priceManage.html

@@ -58,6 +58,12 @@
 					<input type="text" class="layui-input" id="avgHl" name="avgHl" value="0" style="border:none;color: red" disabled="disabled" class="search-select">
 				</div>
 			</div>
+			<div class="layui-inline">
+				<label class="f12-gray4">钢联南储均价:</label>
+				<div class="layui-input-inline">
+					<input type="text" class="layui-input" id="avgGl" name="avgGl" value="0" style="border:none;color: red" disabled="disabled" class="search-select">
+				</div>
+			</div>
 		</div>
 	</form>
 	
@@ -198,6 +204,7 @@
    		      ,{field: 'ncPrice', title: '南储价', width:"15%"}
    		      ,{field: 'shPrice', title: '上海有色网价',width:"15%"}
    		      ,{field: 'hlPrice', title: '沪铝结算价',width:"15%"}
+   		   	  ,{field: 'glPrice', title: '钢联南储均价',width:"15%"}
    		   	  ,{field: 'operate', title: '操作', width:"20%", toolbar: '#barDemo',fixed:'right'}
 		    ]]
 		    ,done: function(res, curr, count){
@@ -207,6 +214,7 @@
 		        var avgNc = "0.00";
 		        var avgSh = "0.00";
 		        var avgHl = "0.00";
+		        var avgGl = "0.00";
 		        for (let o of avgPriceList) {
 		        	if (o.type == '00') {
 		        		avgNc = o.avgPrice;
@@ -216,12 +224,15 @@
 		        		avgSh = o.avgPrice;
 		        	} else if (o.type == '07') {
 		        		avgHl = o.avgPrice;
+		        	}  else if (o.type == '08') {
+		        		avgGl = o.avgPrice;
 		        	} 
 		        }
 		        $("#avgCj").val(avgCj);
 		        $("#avgNc").val(avgNc);
 		        $("#avgSh").val(avgSh);
 		        $("#avgHl").val(avgHl);
+		        $("#avgGl").val(avgGl);
 		      }
 		    ,even: true //开启隔行背景
 		  });

adm/src/main/webapp/admin/priceManage/uploadPrice.html

@@ -132,7 +132,7 @@
 	    layui.use('table', function(){
 	    	//创建一行参数
    			var tableData = new Array(); 
-   		 	var data1 = {"trid":"isdecision"+0,"date":"","cjPrice":"","ncPrice":"","shPrice":""};  
+   		 	var data1 = {"trid":"isdecision"+0,"date":"","cjPrice":"","ncPrice":"","shPrice":"","hlPrice":"","glPrice":""};  
   		 	tableData.push(data1); 
   		 	
    		 	table = layui.table;
@@ -143,10 +143,12 @@
             	,limit:5000
 		    	,cols : [[ //表头
                	   {type:'numbers',title: '序号',width:"5%"}   
-		  		   ,{field: 'date', title: '日期',width:"16%",edit: 'text'}
-		  		   ,{field: 'cjPrice', title: '长江价(元)',width:"16%",edit: 'text'}
-		  		   ,{field: 'ncPrice', title: '南储价(元)',width:"16%",edit: 'text'}
-		  		   ,{field: 'shPrice', title: '上海有色网价(元)',width:"16%",edit: 'text'}
+		  		   ,{field: 'date', title: '日期',width:"13%",edit: 'text'}
+		  		   ,{field: 'cjPrice', title: '长江价(元)',width:"13%",edit: 'text'}
+		  		   ,{field: 'ncPrice', title: '南储价(元)',width:"13%",edit: 'text'}
+		  		   ,{field: 'shPrice', title: '上海有色网价(元)',width:"13%",edit: 'text'}
+		  		   ,{field: 'hlPrice', title: '沪铝结算价(元)',width:"13%",edit: 'text'}
+		  		   ,{field: 'glPrice', title: '钢联南储均价(元)',width:"13%",edit: 'text'}
 				   ,{field : 'operate', title: '操作',fixed:'right', width: "18%", toolbar: '#handle'}	   
 				]]
 				,page: false
@@ -177,7 +179,7 @@
 		  		if(obj.event == 'add'){
 		  			var id = a++;
 					var oldData =  table.cache["tableTest"]; 
-					var data1 = {"trid":"isdecision"+0,"date":"","cjPrice":"","ncPrice":"","shPrice":""}
+					var data1 = {"trid":"isdecision"+0,"date":"","cjPrice":"","ncPrice":"","shPrice":"","hlPrice":"","glPrice":""}
 			        oldData.push(data1);  
 			        table.reload('tableTest',{  
 						data : oldData  
@@ -264,19 +266,20 @@
 	    				for (var i = 1; i < data.length; i++) {
 	    					var dataNew;
 		    				if(!isEmpty(data[i])){
-		    					dataNew = {"trid":"isdecision"+i,"date":data[i].date,"cjPrice":data[i].cjPrice,"ncPrice":data[i].ncPrice,"shPrice":data[i].shPrice}; 
+		    					dataNew = {"trid":"isdecision"+i,"date":data[i].date,"cjPrice":data[i].cjPrice,"ncPrice":data[i].ncPrice,"shPrice":data[i].shPrice,"hlPrice":data[i].hlPrice,"glPrice":data[i].glPrice}; 
 		    					oldData.push(dataNew);
 		    				}
 	    				}
 	    				var dateList = "";
 	    		    	var index = "";
-	    		    	for(var i = 0; i < oldData.length; i++) {debugger;
-	    		    		
+	    		    	for(var i = 0; i < oldData.length; i++) {
 	    		    		var date = oldData[i].date;
 	    		    		var cjPrice = oldData[i].cjPrice;
 	    		    		var ncPrice = oldData[i].ncPrice;
 	    		    		var shPrice = oldData[i].shPrice;
-	    		    		var inf = date+cjPrice+ncPrice+shPrice;
+	    		    		var hlPrice = oldData[i].hlPrice;
+	    		    		var glPrice = oldData[i].glPrice;
+	    		    		var inf = date+cjPrice+ncPrice+shPrice+hlPrice+glPrice;
 	    		    		if(dateList.indexOf(inf)!=-1){
 	    		    			var seq = i+1;
 	    		    			index += seq+",";