新增字段

mtp3-century/src/main/resources/mapper/TradeOrderdetailMapper.xml

@@ -1438,8 +1438,9 @@
         d.pdeliveryqty, d.deliverygoodsid, d.deliveryqty,
         d.deliveryorderstatus, d.ordertime,
         g1.goodsname as xgoodsname,
+        g1.goodscode as xgoodscode,
         g2.goodsname as pgoodsname,
-        wr.wrstandardid, wr.wrstandardcode || '/' || wr.wrstandardname as deliverygoodsname, dic.enumdicname unitname,
+        wr.wrstandardid, wr.wrstandardcode , wr.wrstandardname , dic.enumdicname unitname,
         lo.loginids || '/' || u.accountname as accountidname
         <choose>
             <when test="vo.ishis == null or vo.ishis == 0">
@@ -2036,6 +2037,7 @@
             resultType="com.muchinfo.mtp3pojos.vo.query.deliveryorder.OfflineDeliveryResult">
         select ua.userid || '/' || lo.loginids || '/' || ua.accountname "username",
         g.goodscode || '/' || g.goodsname "goodsdisplay",
+        g.goodscode,
         e1.enumdicname "buyorselldisplay",
         t.deliveryqty "deliveryqty",
         t.deliveryprice "deliveryprice",

mtp3-century/src/main/resources/mapper/WrtradeOrderdetailMapper.xml

@@ -92,6 +92,7 @@
         mk.marketname,
         wr.wrtradetype,
         wr.buyorsell ,
+        ws.wrstandardcode,
         ws.wrstandardcode || '/' ||  ws.wrstandardname as wrstandard,
         ft.optioncompare as wrfactortypename,
         wr.orderqty || '(' ||  ei.enumdicname || ')' as orderqtyname,
@@ -225,6 +226,7 @@
         mk.marketname,
         tr.wrtradetype ,
         wr.buyorsell ,
+        ws.wrstandardcode,
         ws.wrstandardcode || '/' ||  ws.wrstandardname as wrstandard,
         ft.optioncompare as wrfactortypename,
         wr.orderqty || '(' ||  ei.enumdicname || ')'  as orderqtyname,

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/query/deliveryorder/DeliveryOrderEntrustResult.java

@@ -31,11 +31,17 @@ public class DeliveryOrderEntrustResult {
     @ApiModelProperty(value = "主商品")
     private String xgoodsname;
 
+    private String xgoodscode;
+
     @ApiModelProperty(value = "主商品手数")
     private String xdeliveryqty;
 
     @ApiModelProperty(value = "现货商品")
-    private String deliverygoodsname;
+    private String wrstandardcode;
+
+    private String wrstandardid;
+
+    private String wrstandardname;
 
     @ApiModelProperty(value = "现货数量")
     private String deliveryqty;

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/query/deliveryorder/OfflineDeliveryResult.java

@@ -80,5 +80,9 @@ public class OfflineDeliveryResult {
     private Long buyorsell;
 
     private Integer trademode;
+
+    private String goodscode;
+
+    private Integer deliverystatus;
 }
 

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/query/warehouse/WarehouseCommissionResult.java

@@ -92,4 +92,6 @@ public class WarehouseCommissionResult {
     private String tradedate;
 
     private Integer ishis;
+
+    private String wrstandardcode;
 }

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/query/warehouse/WarehouseContractResult.java

@@ -103,4 +103,6 @@ public class WarehouseContractResult {
     private String tradedate;
 
     private Integer ishis;
+
+    private String wrstandardcode;
 }