推书推送增加报关品名和报关单位

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/entity/VO/ReqShippingOrderItemVO.java

@@ -5,6 +5,7 @@ import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.documents.letterDeposit.entity.SyLetterDeposit;
 import org.jeecg.modules.documents.letterDeposit.entity.SyLetterDepositItem;
+import org.jeecg.modules.documents.seclarationElements.entity.SyDeclarationElements;
 import org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrder;
 import org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrderItem;
 
@@ -38,10 +39,15 @@ public class ReqShippingOrderItemVO {
     private String isTc;
     // 经营单位
     private String company;
+    // 报关品名
+    private String declarationName;
+    // 报关单位
+    private String declarationUnit;
 
 
     public void fromShippingOrder(SyShippingOrderItem shippingOrderItem,
-                                  SyShippingOrder shippingOrder){
+                                  SyShippingOrder shippingOrder,
+                                  SyDeclarationElements syDeclarationElements){
         vbillcode = shippingOrder.getShippingOrderNumber();
         shippingOrderItemId = shippingOrderItem.getId();
         tailoringFabricItemId = shippingOrderItem.getTailoringFabricItemId();
@@ -50,6 +56,10 @@ public class ReqShippingOrderItemVO {
         exportInvoiceNo = shippingOrder.getExportInvoiceNo();
         isTc = shippingOrderItem.getIsTc();
         company = shippingOrder.getUnitInOperation();
+        if (syDeclarationElements != null) {
+            declarationUnit = syDeclarationElements.getDeclarationUnit();
+            declarationName = syDeclarationElements.getDeclarationName();
+        }
         if("成衣".equals(shippingOrder.getReadyFabric())){
             exportInvoiceNo = vbillcode;
             loadingDate = shippingOrder.getLatestDateOfShipment();

jeecg-boot-module-system/src/main/java/org/jeecg/modules/quartz/job/PushShippingDetailsJob.java

@@ -196,6 +196,8 @@ public class PushShippingDetailsJob implements Job {
                 queryWrapper.eq(SyShippingOrderItem::getPushSrmState, "0");
                 List<SyShippingOrderItem> itemList = syShippingOrderItemService.list(queryWrapper);
                 if (itemList.size()>0){
+                    List<SyDeclarationElements> elementsList1 = syDeclarationElementsService.listByIds(itemList.stream().map(SyShippingOrderItem::getElementsId).distinct().collect(Collectors.toList()));
+
                     LambdaQueryWrapper<SyShippingOrder> mQueryWrapper = new LambdaQueryWrapper<>();
                     mQueryWrapper.in(SyShippingOrder::getId, itemList.stream().map(SyShippingOrderItem::getSyShippingOrderItemId).distinct().collect(Collectors.toList()));
                     List<SyShippingOrder> orderList = syShippingOrderService.list(mQueryWrapper);
@@ -232,7 +234,8 @@ public class PushShippingDetailsJob implements Job {
                             }
                             // 成衣取预装箱单子表id
                             ReqShippingOrderItemVO reqVo = new ReqShippingOrderItemVO();
-                            reqVo.fromShippingOrder(item, findOrder);
+                            SyDeclarationElements findElement = elementsList1.stream().filter(e->e.getId().equals(item.getElementsId())).findFirst().orElse(null);
+                            reqVo.fromShippingOrder(item, findOrder, findElement);
                             if (!isClothes){
 //                                boolean isReqQuantity = "采购".equals(getOrderType(item));
 //                                if (isReqQuantity){