|
|
@@ -35,6 +35,10 @@ public class PnsDataSyncTask {
|
|
|
private PNSConfig pnsConfig;
|
|
|
@Autowired
|
|
|
private BaseDao baseDao;
|
|
|
+ /**
|
|
|
+ * 第一商品营业部 1453
|
|
|
+ * 第二商品营业部 733
|
|
|
+ * */
|
|
|
|
|
|
@Scheduled(cron = "0 0/5 * * * ?")
|
|
|
public void UploadSaleData(){
|
|
|
@@ -91,7 +95,8 @@ public class PnsDataSyncTask {
|
|
|
try {
|
|
|
List<PNSSendData> sendSales = baseDao
|
|
|
.getJdbcTemplate()
|
|
|
- .query("SELECT * FROM PNS_SENDDATADETAIL WHERE MAIN_ID=1 AND UPLOAD=0 ", new BeanPropertyRowMapper<PNSSendData>(PNSSendData.class));
|
|
|
+ .query(" SELECT SUBSTR(YEAR_MONTH,1,4)||'-'||SUBSTR(YEAR_MONTH,5,2) ymonth,MODEL_NO_CUST,MODEL_NO_ISP,FINAL_BUYER_CUST,FINAL_BUYER_NAME,CONFIRM_DATE,DATA_TYPE,DIVISION_NO,ROUND(SUM(QUANTITY),0) QUANTITY,CUST_ID,CUST_NAME FROM PNS_SENDDATADETAIL LEFT JOIN PNS_SENDDATAMAIN ON PNS_SENDDATADETAIL.MAIN_ID=PNS_SENDDATAMAIN.MAIN_ID " +
|
|
|
+ "WHERE BILLSTATUS='已审核' AND UPLOAD=0 GROUP BY YEAR_MONTH,MODEL_NO_CUST,MODEL_NO_ISP,FINAL_BUYER_CUST,FINAL_BUYER_NAME,CONFIRM_DATE,DATA_TYPE,DIVISION_NO,CUST_ID,CUST_NAME ORDER BY DATA_TYPE DESC,MODEL_NO_ISP ASC,CONFIRM_DATE ASC ", new BeanPropertyRowMapper<PNSSendData>(PNSSendData.class));
|
|
|
int num = 0;
|
|
|
for(PNSSendData sendSale : sendSales) {
|
|
|
num ++;
|
|
|
@@ -99,11 +104,11 @@ public class PnsDataSyncTask {
|
|
|
num = 1;
|
|
|
}
|
|
|
sendSale.setRow_number(num); //分页处理序号问题
|
|
|
- sendSale.setCust_id(pnsConfig.getCust_id());
|
|
|
+ /*sendSale.setCust_id(pnsConfig.getCust_id());
|
|
|
sendSale.setCust_name("华商龙商务互联");
|
|
|
- sendSale.setYmonth("2023-04");
|
|
|
+ sendSale.setYmonth("2023-04");*/
|
|
|
}
|
|
|
- baseDao.execute("UPDATE PNS_SENDDATADETAIL SET UPLOAD=1");
|
|
|
+ baseDao.execute("UPDATE PNS_SENDDATADETAIL SET UPLOAD=-1 WHERE UPLOAD=0");
|
|
|
return sendSales;
|
|
|
} catch (EmptyResultDataAccessException e) {
|
|
|
return null;
|
zhouy