【越加红】【WMS对接】【出库单对接新增“外部收款方式”字段，“出货单价”字段对接字段替换为“retailPrice”】

src/main/java/com/uas/eis/entity/vwms/entity/DeliveryOrder.java

@@ -21,6 +21,7 @@ public class DeliveryOrder {
     private String supplierName; // 客户名称 标准发货通知单、VMI发货通知单取客户名称, 标准退货通知单取供应商名称, 分销调拨发货通知单取调出方名称、其他出库取公司名称
     private String remark; //备注
     private String documenter; // 制单人
+    private String externalCollection; // 外部收款方式
 
     private ReceiverInfo receiverInfo;//收货信息
 

src/main/java/com/uas/eis/entity/vwms/entity/OrderLineOut.java

@@ -6,8 +6,7 @@ import lombok.Data;
 public class OrderLineOut extends OrderLine {
 
     private String inLogicWarehouseCode;//目标逻辑仓 转库出库、调拨出库类型时转入的逻辑仓编号
-    private Double retailPrice; //零售价 -> 定价
-    private Double actualPrice; //实际成交价 -> 出货单价
+    private Double retailPrice; //零售价 -> 出货单价
     private String remark;
 
     private String custItemCode;//客户商品编码 客户料号 pd_custprodcode

src/main/java/com/uas/eis/entity/vwms/entity/ProdInout.java

@@ -35,6 +35,7 @@ public class ProdInout {
     private String toMasterCode;//目标账套
     private String piDeliverytime;//要求交货日期
     private String custShortName;//客户简称
+    private String piWbsk;//客户简称 pi_wbsk_user
 
 
 }

src/main/java/com/uas/eis/entity/vwms/entity/Prodiodetail.java

@@ -22,7 +22,6 @@ public class Prodiodetail {
 //    private String pdWhnameTo;
 
     private Double pdSendPrice;
-    private Double standardPrice;
     private String pdRemark;
     private String pdOrderCode;
 

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

@@ -87,7 +87,7 @@ public class DocCommonServiceImpl implements DocCommonService {
                 .append("to_char(pi_date,'yyyy-mm-dd hh24:mi:ss') piDate,pi_Cardcode piCardcode,pi_Title piTitle,")
                 .append("pi_Recordman piRecordman,to_char(pi_recorddate,'yyyy-mm-dd hh24:mi:ss') piRecorddate,pi_Remark piRemark,")
                 .append("abs(nvl(pi_sendwmsflag,0)) piSendwmsflag,nvl(pi_WmsInType,'in') piWmsInType,pi_wmsstatus piWmsstatus,")
-                .append("pi_invostatuscode piInvoStatusCode,'"+master+"' currentMaster,pi_tomaster toMasterCode,pi_purposename piLxr,pi_expresscode piLxdh,pi_address piKhdz  ")
+                .append("pi_invostatuscode piInvoStatusCode,'"+master+"' currentMaster,pi_tomaster toMasterCode,pi_purposename piLxr,pi_expresscode piLxdh,pi_address piKhdz,pi_wbsk_user piWbsk ")
                 .append("from ").append(master).append(".prodinout where pi_id = ").append(id)
                 .toString();
         List<ProdInout> prodInOuts = baseDao.getJdbcTemplate().query(sql,
@@ -110,7 +110,7 @@ public class DocCommonServiceImpl implements DocCommonService {
                         .append("pr_detail pdProdname,pr_brand pdBrandName,(nvl(pd_inqty,0)+nvl(pd_outqty,0)) pdQty,")
                         .append("pd_whcode pdWhcode,wh_description pdWhname,tsd_inwhcode pdWhcodeTo,")
                         .append("pd_custprodcode pdCustprodcode,pd_custproddetail pdCustProdDetail,pd_custprodspec pdCustProdSpec, pd_pocode pdPocode ,pd_ordercode pdOrderCode,pd_Remark pdRemark" +
-                                ",pd_sendprice pdSendPrice,nvl(sd_purcprice,0) standardPrice ")
+                                ",pd_sendprice pdSendPrice ")
                         .append("from ").append(master).append(".prodiodetail ")
                         .append(" left join ").append(master).append(".prodinout on pi_id = pd_piid ")
                         .append(" left join ").append(master).append(".product on pr_code = pd_prodcode ")
@@ -128,7 +128,7 @@ public class DocCommonServiceImpl implements DocCommonService {
                         .append("pr_detail pdProdname,pr_brand pdBrandName,(nvl(pd_inqty,0)+nvl(pd_outqty,0)) pdQty,")
                         .append("pd_whcode pdWhcode,wh_description pdWhname,(case when pi_class='出货单' and pi_type='库存转移' then pd_whcode when pi_class='拨出单' then pd_inwhcode else null end) pdWhcodeTo,")
                         .append("pd_custprodcode pdCustprodcode,pd_custproddetail pdCustProdDetail,pd_custprodspec pdCustProdSpec, pd_pocode pdPocode ,pd_ordercode pdOrderCode,pd_Remark pdRemark" +
-                                ",pd_sendprice pdSendPrice,nvl(sd_purcprice,0) standardPrice ")
+                                ",pd_sendprice pdSendPrice ")
                         .append("from ").append(master).append(".prodiodetail ")
                         .append(" left join ").append(master).append(".prodinout on pi_id = pd_piid ")
                         .append(" left join ").append(master).append(".product on pr_code = pd_prodcode ")
@@ -176,9 +176,9 @@ public class DocCommonServiceImpl implements DocCommonService {
         }else{
             String insertDetailSql = new StringBuilder()
                     .append("INSERT INTO ").append(master).append(".prodiowms_Lines(ITIME,PL_PIID,LOGICWAREHOUSECODE,LINENO, ITEMCODE, PLANQTY" +
-                            ",custItemCode,custItemName,custItemSkuProperty,custLotNumber,custPO,contractNo,retailPrice,actualPrice)")
+                            ",custItemCode,custItemName,custItemSkuProperty,custLotNumber,custPO,contractNo,retailPrice)")
                     .append(" select sysdate,pdPiid,pdWhcode,pdPdno,pdProdcode,pdQty" +
-                            ",PDCUSTPRODCODE,PDCUSTPRODDETAIL, PDCUSTPRODSPEC, PDPOCODE, PDORDERCODE, PDREMARK, PDSENDPRICE, STANDARDPRICE " +
+                            ",PDCUSTPRODCODE,PDCUSTPRODDETAIL, PDCUSTPRODSPEC, PDPOCODE, PDORDERCODE, PDREMARK, PDSENDPRICE " +
                             " from (").append(detSql).append(")")
                     .toString();
             baseDao.execute(insertDetailSql);
@@ -203,8 +203,7 @@ public class DocCommonServiceImpl implements DocCommonService {
                     ((OrderLineOut) orderLine).setInLogicWarehouseCode(detail.getPdWhcodeTo());
                 }
                 if("out".equals(prodInOut.getPiWmsInType())){
-                    ((OrderLineOut) orderLine).setRetailPrice(detail.getStandardPrice());
-                    ((OrderLineOut) orderLine).setActualPrice(detail.getPdSendPrice());
+                    ((OrderLineOut) orderLine).setRetailPrice(detail.getPdSendPrice());
                 }
             }else {
                 orderLine = new OrderLineIn();
@@ -231,6 +230,7 @@ public class DocCommonServiceImpl implements DocCommonService {
         deliveryOrder.setWarehouseCode(vwmsConfig.getWarehouseCode());// 仓库编码
         deliveryOrder.setOwnerCode(prodInOut.getCurrentMaster());// 货主编码
         deliveryOrder.setCreateTime(StringUtil.nvl(prodInOut.getPiRecordDate(),prodInOut.getPiDate()));
+        deliveryOrder.setExternalCollection(prodInOut.getPiWbsk());
         //调拨业务
         if(prodInOut.getPiWmsInType().equals("transfer")){
             deliveryOrder.setInWarehouseCode(vwmsConfig.getWarehouseCode());