1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseInOutInfoServiceImpl.java

@@ -1151,6 +1151,8 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                         tranCarInfo.setTitleNo(warehouseInOutInfo.getTitleNo());
                                         tranCarInfo.setThreeTranType("集装箱船");
                                         stockSaleReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
+                                        stockSaleReceiptReport.setCaseNoOther(warehouseInOutInfo.getBoxNoOther());
+                                        stockSaleReceiptReport.setTitleNoOther(warehouseInOutInfo.getTitleNoOther());
                                         stockSaleReceiptReport.setCaseNo(warehouseInOutInfo.getBoxNo());
                                         stockSaleReceiptReport.setTitleNo(warehouseInOutInfo.getTitleNo());
                                     }
@@ -1211,7 +1213,9 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                         stockSaleReceiptReport.setShipNo(warehouseInOutInfo.getShipNumber());
                                     }else if("集装箱船".equals(warehouseInOutInfo.getOutType())){
                                         stockSaleReceiptReport.setCaseNo(warehouseInOutInfo.getBoxNo());
+                                        stockSaleReceiptReport.setCaseNoOther(warehouseInOutInfo.getBoxNoOther());
                                         stockSaleReceiptReport.setCarNo(warehouseInOutInfo.getCarNo());
+                                        stockSaleReceiptReport.setTitleNoOther(warehouseInOutInfo.getTitleNoOther());
                                         stockSaleReceiptReport.setTitleNo(warehouseInOutInfo.getTitleNo());
                                     }
                                     //自运出库时手动加的车

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/ContractManagementInfoMapper.xml

@@ -56,6 +56,7 @@
         m.unit_contract_price as unitContractPrice,
         m.total_contract_price as totalContractPrice,
         m.packing_method as packingMethod,
+        m.grain_delivery as grainDelivery,
         m.buyer,
         m.deposit,
         m.remarks,

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehouseBaseInfoMapper.xml

@@ -330,11 +330,11 @@
             AND s.warehouse_name= #{warehouseName}
         </if>
         <if test="startDate != null">
-            AND (DATE_FORMAT(s.create_date,"%Y%m%d") &gt;=
+            AND (DATE_FORMAT(s.delivery_date,"%Y%m%d") &gt;=
             DATE_FORMAT(#{startDate},"%Y%m%d"))
         </if>
         <if test="endDate != null">
-            AND (DATE_FORMAT(s.create_date,"%Y%m%d") &lt;=
+            AND (DATE_FORMAT(s.delivery_date,"%Y%m%d") &lt;=
             DATE_FORMAT(#{endDate},"%Y%m%d"))
         </if>
     </select>