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

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

@@ -3,6 +3,7 @@ package com.uas.eis.core;
 import com.uas.eis.config.SynaConfig;
 import com.uas.eis.dao.BaseDao;
 import com.uas.eis.entity.*;
+import com.uas.eis.utils.StringUtil;
 import io.xlate.edi.schema.EDISchemaException;
 import io.xlate.edi.schema.Schema;
 import io.xlate.edi.schema.SchemaFactory;
@@ -123,10 +124,14 @@ public class X12Converter {
                     .writeElement("PR")
                     .writeElement(pd.getPd_quote()).writeEndSegment();
             txCount++;
+            String shippingInstruction="";
+            if(StringUtil.hasText(pd.getPd_shippinginstruction())){
+                shippingInstruction=pd.getPd_shippinginstruction();
+            }
             writer.writeStartSegment("FOB")
                     .writeElement("DF")
                     .writeElement("ZZ")
-                    .writeElement(po.getPu_article()).writeEndSegment();// Shipping Instruction
+                    .writeElement(shippingInstruction).writeEndSegment();// Shipping Instruction
             txCount++;
             writer.writeStartSegment("SCH")
                     .writeElement(String.valueOf(pd.getPd_qty()))

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

@@ -14,4 +14,5 @@ public class PurchaseDetail {
     private String pd_prodcode;
     private String pd_quote;
     private String pr_orispeccode;
+    private String pd_shippinginstruction;
 }

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

@@ -142,7 +142,7 @@ public class SynaServiceImpl implements SynaService {
     private Purchase getPO( Integer id){
         Purchase po=baseDao.getJdbcTemplate().queryForObject("select * from Purchase where pu_id=?", new BeanPropertyRowMapper<Purchase>(Purchase.class), id);
         List<PurchaseDetail> detail = baseDao.getJdbcTemplate().query(
-                "select  pd_detno, pd_qty, pd_price, pd_delivery,pd_custprodcode,pd_prodcode,pd_quote,pr_orispeccode " +
+                "select  pd_detno, pd_qty, pd_price, pd_delivery,pd_custprodcode,pd_prodcode,pd_quote,pr_orispeccode,PD_SHIPPINGINSTRUCTION " +
                         "from Purchasedetail left join product on pd_prodcode=pr_code where pd_puid=? order by pd_detno", new BeanPropertyRowMapper<PurchaseDetail>(PurchaseDetail.class),
                 id);
         po.setItems(detail);