修改上传

src/main/java/com/qlm/controller/jinzai/MobileController.java

@@ -38,7 +38,6 @@ public class MobileController extends Controller{
 	public void search(){
 		String code = getPara("code","");
 		
-		code = code.toUpperCase();
 		
 		String latitude = getPara("latitude");
 		
@@ -183,8 +182,9 @@ public class MobileController extends Controller{
 			}
 			
 			
-		}else if(code.length() == 22){
+		}else if(code.length() == 20){
 			String master_code = code;
+			master_code = master_code.toUpperCase();
 			Record masterInfo = Db.findFirst("select * from jinzai_upload_master where id = ?",master_code);
 			
 			String pinxiang = masterInfo.getStr("pinxiang");

src/main/java/com/qlm/service/UploadService.java

@@ -15,6 +15,7 @@ import com.jfinal.aop.Before;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Record;
 import com.jfinal.plugin.activerecord.tx.Tx;
+import com.qlm.log.Log;
 import com.qlm.tools.MD5Utils;
 import com.qlm.tools.WxUtil;
 
@@ -22,6 +23,7 @@ public class UploadService {
 
 	@Before(Tx.class)
 	public void upload(String data){
+		Log.info("receive data:"+data);
 		JSONObject parseObject = JSONObject.parseObject(data);
 		String deviceId = parseObject.getString("d");
 		List<Record> list = new ArrayList();
@@ -72,6 +74,7 @@ public class UploadService {
 			JSONObject jsonObject = entry.getValue();
 			String addTime = jsonObject.getString("g");
 			String duoma = jsonObject.getString("t");
+			duoma = duoma.toUpperCase();
 			String taskNo = jsonObject.getString("s");
 			String sku = jsonObject.getString("k");
 			String productDate = jsonObject.getString("d");
@@ -87,7 +90,7 @@ public class UploadService {
 				kouwei = record.getStr("kouwei");
 			}
 			masterInfo.set("id", master).set("create_time", new Date()).set("produce_date", productDate)
-			.set("duo_code", duoma).set("device_no", deviceId).set("guo_time", addTime)
+			.set("duo_code", duoma.toUpperCase()).set("device_no", deviceId).set("guo_time", addTime)
 			.set("pinxiang", pinXiang).set("kouwei", kouwei).set("sku", sku).set("task_no", taskNo).set("banzu", banzu);
 			
 			xiangList.add(masterInfo);
@@ -121,65 +124,76 @@ public class UploadService {
 	
 	//同步订单到我们自己的库
 	public static void update(){
-		String udfSqlString = "select * from WMS_PROD.V_TMSO_RETURN_H WHERE ROWNUM = 1";
-//		String sql = "select * from WMS_PROD.V_SERIAL_INFO WHERE ROWNUM = 1";
-		List<Record> find = Db.use("oracle").find(udfSqlString);
 		
-		List<Record> list = new ArrayList<Record>();
-		for (Record record : find) {
-			String orderNo = record.getStr("ORDERNO");//发货单号
-			
-			String OUTWAREHOUSE = record.getStr("OUTWAREHOUSE");//工厂名称
-			
-			
-			String WAREHOUSEID = record.getStr("WAREHOUSEID");//工厂ID
-			
-			
-			Date Deliverytime = record.getDate("DELIVERYTIME");//出库时间
-			
-			String caseCode = record.getStr("CASECODE");//箱码
-			
-			String palletCode = record.getStr("PALLETCODE");//垛码
-			
-			
-			String PRODUCTNAME = record.getStr("PRODUCTNAME");//产品名称
-			
-			
-			
-			String CUSTOMERNAME = record.getStr("CUSTOMERNAME");//客户姓名
-		
-			String SKUNAME = record.getStr("SKUNAME");//SKU名称
-			
-			String LICENSEPLATE = record.getStr("LICENSEPLATE");//车牌号
-			
-			String OUTWAREHOUSENO = record.getStr("OUTWAREHOUSENO");//工厂编号
-			
-			String SKUNO = record.getStr("SKUNO");//sku编号
-			
-			String OPERATEUSER = record.getStr("OPERATEUSER");//操作人
-			
-			String PRODUCTNO = record.getStr("PRODUCTNO");//产品编号
-			
-			String CUSTOMERNO = record.getStr("CUSTOMERNO");//客户编号
-			
-			Record info = new Record();
-			
-			info.set("OrderNo", orderNo).set("OutWarehouse", OUTWAREHOUSE).set("WarehouseID", WAREHOUSEID)
-			
-			.set("DeliveryTime", Deliverytime).set("CaseCode", caseCode).set("PalletCode", palletCode)
-			
-			.set("ProductName", PRODUCTNAME).set("CustomerName", CUSTOMERNAME).set("SKUName", SKUNAME)
-			
-			
-			.set("LicensePlate", LICENSEPLATE).set("OutWarehouseNo", OUTWAREHOUSENO).set("SKUNo", SKUNO)
-			
-			.set("OperateUser", OPERATEUSER).set("ProductNo", PRODUCTNO).set("CustomerNo", CUSTOMERNO);
-			
-			
-			list.add(info);
+		int pageSize = 500;
+		for (int i = 1; i <100000000; i++) {
+			int pageStart = (i-1)*pageSize;
+			int pageEnd = pageSize*i;
+			String udfSqlString = "select * from WMS_PROD.V_TMSO_RETURN_H where ROWNUM>="+pageStart+" and ROWNUM<"+pageEnd;
+//			String sql = "select * from WMS_PROD.V_SERIAL_INFO WHERE ROWNUM = 1";
+			List<Record> find = Db.use("oracle").find(udfSqlString);
+			if(find.isEmpty()){
+				break;
+			}
 			
+			List<Record> list = new ArrayList<Record>();
+			for (Record record : find) {
+				String orderNo = record.getStr("ORDERNO");//发货单号
+				
+				String OUTWAREHOUSE = record.getStr("OUTWAREHOUSE");//工厂名称
+				
+				
+				String WAREHOUSEID = record.getStr("WAREHOUSEID");//工厂ID
+				
+				
+				Date Deliverytime = record.getDate("DELIVERYTIME");//出库时间
+				
+				String caseCode = record.getStr("CASECODE");//箱码
+				
+				String palletCode = record.getStr("PALLETCODE");//垛码
+				
+				
+				String PRODUCTNAME = record.getStr("PRODUCTNAME");//产品名称
+				
+				
+				
+				String CUSTOMERNAME = record.getStr("CUSTOMERNAME");//客户姓名
+			
+				String SKUNAME = record.getStr("SKUNAME");//SKU名称
+				
+				String LICENSEPLATE = record.getStr("LICENSEPLATE");//车牌号
+				
+				String OUTWAREHOUSENO = record.getStr("OUTWAREHOUSENO");//工厂编号
+				
+				String SKUNO = record.getStr("SKUNO");//sku编号
+				
+				String OPERATEUSER = record.getStr("OPERATEUSER");//操作人
+				
+				String PRODUCTNO = record.getStr("PRODUCTNO");//产品编号
+				
+				String CUSTOMERNO = record.getStr("CUSTOMERNO");//客户编号
+				
+				Record info = new Record();
+				
+				info.set("OrderNo", orderNo).set("OutWarehouse", OUTWAREHOUSE).set("WarehouseID", WAREHOUSEID)
+				
+				.set("DeliveryTime", Deliverytime).set("CaseCode", caseCode).set("PalletCode", palletCode)
+				
+				.set("ProductName", PRODUCTNAME).set("CustomerName", CUSTOMERNAME).set("SKUName", SKUNAME)
+				
+				
+				.set("LicensePlate", LICENSEPLATE).set("OutWarehouseNo", OUTWAREHOUSENO).set("SKUNo", SKUNO)
+				
+				.set("OperateUser", OPERATEUSER).set("ProductNo", PRODUCTNO).set("CustomerNo", CUSTOMERNO);
+				
+				
+				list.add(info);
+				
+			}
+			WxUtil.batchSaveIgnore("deliveryorders", list, "");
+			Log.info("执行同步数据:，页数:"+i+"");
 		}
-		WxUtil.batchSaveIgnore("deliveryorders", list, "");
+		
 	}
 	
 	private static String key = "wYG(nx%Xlc7vb%Ss1=2L#JZ*gSk^WXuV";

src/main/java/com/qlm/service/WmesService.java

@@ -59,7 +59,6 @@ public class WmesService {
 			
 			String duo_code = record.getStr("duo_code");
 			
-			
 			String pinxiang = record.getStr("sku");
 			
 			Date guo_time = record.getDate("guo_time");

src/main/resources/config.properties

@@ -1,21 +1,17 @@
 #mysql 
-#jdbcUrl = jdbc:mysql://127.0.0.1:3306/jieyou?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2B8
-#user=root
-#password =root
-#
-jdbcUrl = jdbc:mysql://61.183.212.90:57911/jinzai?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
-user=root
-password =Qyy#2023.Wzh!
+jdbcUrl = jdbc:mysql://127.0.0.1:6177/jinzai?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2B8
+user=jinzai
+password =rTdBsjA636XkarRa
 
 #qrcode
 dbname=jinzai
-authoUrl=http://jinzai.dnzc.vip
+authoUrl=https://jzfch.jinzaifood.com.cn:6178
 oracleUrl = jdbc:oracle:thin:@192.168.0.183:61521/orcl
 oracleUser = pxl
 oraclePass = xuwei417
 
 
-appid=wxe25fed34f9f70ef4
-appsecret=3b9f0ea12741d739c2b513820fa74c9d
+appid=wxf09c24f8384518fd
+appsecret=ad94208a7df3f0bc3aeec2100a546555
 
 

src/main/webapp/mobile/index.jsp

@@ -625,6 +625,7 @@
 			  success: function (res) {
 			    var result = res.resultStr; // 当needResult 为 1 时，扫码返回的结果
 			    $("#code").val(result);
+			    search();
 			  },fail:function(res){
 //	 			  var result = res.resultStr; // 当needResult 为 1 时，扫码返回的结果
 //	 			    result = "https://d.dnzc.vip/aa4a75416f250";