|
@@ -1103,6 +1103,8 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
|
|
|
System.out.println("by=" + by);
|
|
|
System.out.println("yf=" + yf);
|
|
|
System.out.println("total=" + total);
|
|
|
+// System.out.println("猪场="+dataJo.getString("mz"));
|
|
|
+// System.out.println("母猪后备"+dataJo.getInteger("mzhb"));
|
|
|
//母猪存栏
|
|
|
ProdStockEntity stockEntity1 = new ProdStockEntity();
|
|
|
stockEntity1.setFarmId(farmId);
|
|
@@ -1215,7 +1217,8 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
|
|
|
stockEntity10.setFarmId(farmId);
|
|
|
stockEntity10.setStockType("sow_stock_5");
|
|
|
stockEntity10.setStockName("后备");
|
|
|
- stockEntity10.setStockQuantity(String.valueOf(dataJo.getInteger("hb")));
|
|
|
+// stockEntity10.setStockQuantity(String.valueOf(dataJo.getInteger("hb")));
|
|
|
+ stockEntity10.setStockQuantity(String.valueOf(dataJo.getInteger("mzhb")));
|
|
|
stockEntity10.setMonth(Integer.valueOf(month));
|
|
|
stockEntity10.setYear(Integer.parseInt(year));
|
|
|
prodStockRepo.saveAndFlush(stockEntity10);
|
|
@@ -1272,7 +1275,7 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
|
|
|
// paramsMap.put("month", dateUtil.getThisMonth());
|
|
|
// test data
|
|
|
paramsMap.put("year", "2021");
|
|
|
- paramsMap.put("month", "8");
|
|
|
+ paramsMap.put("month", "11");
|
|
|
//
|
|
|
Map<String, Integer> timeoutMap = new HashMap<String, Integer>();
|
|
|
timeoutMap.put("connectTimeout", Integer.parseInt(connectTimeout));
|
|
@@ -1373,9 +1376,10 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
|
|
|
warningMsgRepo.deleteAll(warningMsgRepo.findAll(example));
|
|
|
//获取牧场所有名称数据
|
|
|
List<ProdFarmNameEntity> farmNameEntityList = prodFarmNameRepo.findAll();
|
|
|
-// for (ProdFarmNameEntity farmNameEntity : farmNameEntityList) {
|
|
|
-// System.out.println("" + farmNameEntity.toString());
|
|
|
-// }
|
|
|
+ int x=0;
|
|
|
+ for (ProdFarmNameEntity farmNameEntity : farmNameEntityList) {
|
|
|
+ System.out.println((++x) + "" + farmNameEntity.toString());
|
|
|
+ }
|
|
|
// 添加入库
|
|
|
for (int a = 0; a < dataJa.size(); a++) {
|
|
|
JSONObject dataJo = dataJa.getJSONObject(a);
|
|
@@ -1393,7 +1397,7 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
|
|
|
}
|
|
|
// System.out.println((a+1)+" "+dateUtil.formatDateTime(dataJo.getString("tsrq"))+","+pigfarm+","+message+" length="+contentArray.length);
|
|
|
ProdWarningMsgEntity newWarningMsgEntity = new ProdWarningMsgEntity();
|
|
|
- newWarningMsgEntity.setTipTime(dateUtil.formatDateTime(dataJo.getString("tsrq")));
|
|
|
+ newWarningMsgEntity.setTipTime(dateUtil.formatDate(dataJo.getString("tsrq")));
|
|
|
newWarningMsgEntity.setFarmName(pigfarm);
|
|
|
newWarningMsgEntity.setWarningContent(message);
|
|
|
//
|
|
@@ -1772,9 +1776,9 @@ public class AutoGetErpDataImpl implements IAutoGetErpData {
|
|
|
paramsMap.put("startDate", dateUtil.getStartDateInThisMonth());
|
|
|
paramsMap.put("endDate", dateUtil.getEndDateInThisMonth());
|
|
|
|
|
|
-
|
|
|
JSONArray psyJa = new JSONArray();
|
|
|
for (ProdFarmNameEntity farmNameEntity : farmNameEntityList) {
|
|
|
+ System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"+farmNameEntity.toString());
|
|
|
if (null != farmNameEntity.getErpFarmId()) {
|
|
|
// Thread.sleep(5000);
|
|
|
//
|