【贝腾】【销售订单增加部分字段】

src/main/java/com/uas/eis/convertor/SaleConvertor.java

@@ -83,6 +83,11 @@ public class SaleConvertor {
         saleResp.setTs_user(saleDTO.getSa_ts_user());
         saleResp.setSa1_user(saleDTO.getSa_1_user());
         saleResp.setSjbh_user(saleDTO.getSa_sjbh_user());
+        saleResp.setPidate_max(saleDTO.getPidate_max());
+        saleResp.setTsh_user(saleDTO.getSa_tsh_user());
+        saleResp.setZqit_user(saleDTO.getSa_zqit_user());
+        saleResp.setYasntt_user(saleDTO.getSa_yasntt_user());
+        saleResp.setZbtas_user(saleDTO.getSa_zbtas_user());
         return saleResp;
     }
 }

src/main/java/com/uas/eis/sdk/dto/SaleDTO.java

@@ -81,4 +81,9 @@ public class SaleDTO {
     private BigDecimal sa_ts_user;
     private String sa_1_user;
     private String sa_sjbh_user;
+    private String pidate_max;
+    private String sa_tsh_user;
+    private String sa_zqit_user;
+    private String sa_yasntt_user;
+    private String sa_zbtas_user;
 }

src/main/java/com/uas/eis/sdk/dto/SaleResp.java

@@ -82,6 +82,11 @@ public class SaleResp {
     private BigDecimal ts_user;
     private String sa1_user;
     private String sjbh_user;
+    private String pidate_max;
+    private String tsh_user;
+    private String zqit_user;
+    private String yasntt_user;
+    private String zbtas_user;
 
     private List<SaleDetailResp> saleItems;
 }

src/main/java/com/uas/eis/service/Impl/STKServiceImpl.java

@@ -194,7 +194,10 @@ public class STKServiceImpl implements STKService {
         int start = ((pageNum - 1) * pageSize + 1);
         int end = pageNum * pageSize;
 
-        List<SaleDTO> saleDTOS = baseDao.query("select * from (select rownum rn,AA.* from (select sa_code,sa_date,sa_transport,sa_kind,sa_status,sa_custcode,sa_custname,sa_currency,sa_rate,sa_salemethod,sa_apcustcode,sa_apcustname,sa_need4,sa_need10,sa_paymentscode,sa_payments,sa_shcustcode,sa_shcustname,sa_toplace,sa_contact,sa_contacttel,sa_pocode,sa_cop,sa_departmentcode,sa_departmentname,sa_need11,sa_need5,sa_quyu_user,sa_sellercode,sa_seller,sa_need2,sa_need3,sa_need1,sa_chfs,sa_prepayamount,sa_sourcecode,sa_sourcetype,sa_turnstatus,sa_sendstatus,sa_printstatus,sa_count,sa_recorder,sa_recorddate,sa_updateman,sa_updatedate,sa_auditman,sa_auditdate,sa_remark,sa_getprice,sa_custid,sa_statuscode,sa_id,sa_sourceid,sa_recorderid,sa_paymentsid,sa_sync,sa_bcid,sa_minus,sa_b2cpucode,sa_total,sa_ts_user,sa_1_user,sa_sjbh_user from Sale where sa_statuscode in ('AUDITED','FINISH') order by sa_id desc)  AA ) where rn>="+start+" and rn<="+end , SaleDTO.class);
+        List<SaleDTO> saleDTOS = baseDao.query("select * from (select rownum rn,AA.* from (select sa_code,sa_date,sa_transport,sa_kind,sa_status,sa_custcode,sa_custname,sa_currency,sa_rate,sa_salemethod,sa_apcustcode,sa_apcustname,sa_need4,sa_need10,sa_paymentscode,sa_payments,sa_shcustcode,sa_shcustname,sa_toplace,sa_contact,sa_contacttel,sa_pocode,sa_cop,sa_departmentcode,sa_departmentname,sa_need11,sa_need5,sa_quyu_user,sa_sellercode,sa_seller,sa_need2,sa_need3,sa_need1,sa_chfs,sa_prepayamount,sa_sourcecode,sa_sourcetype,sa_turnstatus,sa_sendstatus,sa_printstatus,sa_count,sa_recorder,sa_recorddate,sa_updateman,sa_updatedate,sa_auditman,sa_auditdate,sa_remark,sa_getprice,sa_custid,sa_statuscode,sa_id,sa_sourceid,sa_recorderid,sa_paymentsid,sa_sync,sa_bcid,sa_minus,sa_b2cpucode,sa_total,sa_ts_user,sa_1_user,sa_sjbh_user" +
+                ",(select max(pi_date) pidate_max from prodinout left join prodiodetail on pi_id=pd_piid where pd_ordercode=sa_code and pi_statuscode='POSTED') pidate_max" +
+                ",sa_yfbl_user||'/'||sa_tsh_user sa_tsh_user, sa_fhbl_user||'/'||sa_zqit_user sa_zqit_user, sa_ysbil_user||'/'||sa_yasntt_user sa_yasntt_user, sa_zbbli_user||'/'||sa_zbtas_user sa_zbtas_user" +
+                " from Sale where sa_statuscode in ('AUDITED','FINISH') order by sa_id desc)  AA ) where rn>="+start+" and rn<="+end , SaleDTO.class);
 
         if (saleDTOS.size() == 0 ){
             return Result.error("销售订单无数据!");