【集团EDI-新思&歌尔】【新思】

src/main/java/com/uas/eis/core/X12Converter.java

@@ -117,7 +117,7 @@ public class X12Converter {
                     .writeElement("VP") // 产品ID限定符
                     .writeElement(pd.getPr_orispeccode()) // 供应商零件编号
                     .writeElement("BP")
-                    .writeElement(pd.getPd_prodcode()).writeEndSegment();
+                    .writeElement((pd.getPd_custprodcode()==null?"":pd.getPd_custprodcode())).writeEndSegment();
             txCount++;
             writer.writeStartSegment("REF")
                     .writeElement("PR")
@@ -194,7 +194,7 @@ public class X12Converter {
 
         writer.writeStartSegment("REF")
                 .writeElement("SA")
-                .writeElement(pc.getPc_isr()) .writeEndSegment();
+                .writeElement(pc.getPc_isr()).writeEndSegment();
         txCount++;
         for(PurchaseChangeDetail pcd:pc.getItems()){
             writer.writeStartSegment("POC")
@@ -213,13 +213,15 @@ public class X12Converter {
                     * */
                     .writeElement(pcd.getChangetype())
                     .writeElement(String.valueOf(pcd.getPcd_newqty()))//数量
-                    .writeElement(String.valueOf(pcd.getPd_leftqty()))//Quantity Left to Receive 剩余数量
+                    .writeElement(String.valueOf(pcd.getPcd_newqty()))//数量
+                    /*.writeElement(String.valueOf(pcd.getPd_leftqty()))//Quantity Left to Receive 剩余数量*/
                     .writeElement("EA")
-                    .writeElement(String.valueOf(pcd.getPcd_newprice())) // 单价
+                    .writeElement(String.valueOf(pcd.getPd_ori_price())) // 单价
+                    .writeElement("")
                     .writeElement("VP")
                     .writeElement(pcd.getPr_orispeccode())
                     .writeElement("BP")
-                    .writeElement(pcd.getPcd_newprodcode()).writeEndSegment();
+                    .writeElement((pcd.getPd_custprodcode()==null?"":pcd.getPd_custprodcode())).writeEndSegment();
             txCount++;
             writer.writeStartSegment("REF")
                     .writeElement("PR")

src/main/java/com/uas/eis/entity/PurchaseChangeDetail.java

@@ -16,7 +16,10 @@ public class PurchaseChangeDetail {
     private String pcd_so;
     private String changetype;
 
+    private String pd_custprodcode;
+    private double pd_ori_price;
     private int pd_leftqty;//剩余数量pd_qty-pd_yqty
 
     private String pr_orispeccode;
+
 }

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

@@ -116,7 +116,7 @@ public class SynaServiceImpl implements SynaService {
                 " pu_code ,pu_date,Pu_shipaddresscode " +
                 " from PurchaseChange left join purchase on pc_purccode=pu_code where pc_id=?", new BeanPropertyRowMapper<PurchaseChange>(PurchaseChange.class), id);
         List<PurchaseChangeDetail> detail = baseDao.getJdbcTemplate().query(
-                "select  pcd_id, pcd_newprodcode, pcd_newqty, pcd_newprice,pcd_pddetno,pcd_newdelivery,pcd_so," +
+                "select  pcd_id, pcd_newprodcode, pcd_newqty, pcd_newprice,pcd_pddetno,pcd_newdelivery,pcd_so,pd_custprodcode,pd_ori_price," +
                         "nvl(pcd_quote,pd_quote) quote," +
                         "(case when nvl(pcd_oldprice,0)<>nvl(pcd_newprice,0) and nvl(pcd_oldqty,0)<>nvl(pcd_newqty,0) and trunc(pcd_newdelivery) <>trunc(pcd_olddelivery) then 'MU' " +
                         "      when nvl(pcd_oldprice,0)<>nvl(pcd_newprice,0) and nvl(pcd_oldqty,0)<>nvl(pcd_newqty,0)  then 'PQ' " +