1

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

@@ -119,6 +119,7 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
         pageView.put("searchType", expenseInfo.getSearchType());
         pageView.put("searchTypeFee", expenseInfo.getSearchTypeFee());
         pageView.put("warehouseName", expenseInfo.getWarehouseName());
+        pageView.put("expensesPurpose", expenseInfo.getExpensesPurpose());
         pageView.put("pageSize", expenseInfo.getPageSize());
         pageView.put("currentPage", expenseInfo.getCurrentPage());
         pageView.put("contractNo", expenseInfo.getContractNo());

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

@@ -4133,6 +4133,20 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                         tranCarInfo.setStatusFlag(StatusEnum.LOADED.getFlag());
                                         tranCarInfo.setStatus(StatusEnum.LOADED.getName());
                                         tranCarInfo.setFleetName(warehouseInOutInfo.getFleet());
+                                        if ("汽运".equals(warehouseInOutInfo.getOutType())) {
+                                            tranCarInfo.setCaseNo(warehouseInOutInfo.getBoxNo());
+                                            tranCarInfo.setTitleNo(warehouseInOutInfo.getTitleNo());
+                                            tranCarInfo.setCaseNoOther(warehouseInOutInfo.getBoxNoOther());
+                                            tranCarInfo.setTitleNoOther(warehouseInOutInfo.getTitleNoOther());
+                                        } else if ("火运".equals(warehouseInOutInfo.getOutType())) {
+                                            tranCarInfo.setBoxNo(warehouseInOutInfo.getWingNumber());
+                                        } else if ("散船".equals(warehouseInOutInfo.getOutType())) {
+                                            tranCarInfo.setShipName(warehouseInOutInfo.getShipName());
+                                            tranCarInfo.setShipNo(warehouseInOutInfo.getShipNumber());
+                                        } else if ("集装箱船".equals(warehouseInOutInfo.getOutType())) {
+                                            tranCarInfo.setCaseNo(warehouseInOutInfo.getBoxNo());
+                                            tranCarInfo.setTitleNo(warehouseInOutInfo.getTitleNo());
+                                        }
                                         warehouseInOutInfo.setCarId(tranCarInfo.getId());
                                         warehouseInOutInfo.setTranCarNo(tranCarNo);
                                         stockSaleReceiptReport.setTranCarNo(tranCarNo);
@@ -4296,6 +4310,20 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                 tranCarInfo.setStatusFlag(StatusEnum.LOADED.getFlag());
                                 tranCarInfo.setStatus(StatusEnum.LOADED.getName());
                                 tranCarInfo.setFleetName(warehouseInOutInfo.getFleet());
+                                if ("汽运".equals(warehouseInOutInfo.getOutType())) {
+                                    tranCarInfo.setCaseNo(warehouseInOutInfo.getBoxNo());
+                                    tranCarInfo.setTitleNo(warehouseInOutInfo.getTitleNo());
+                                    tranCarInfo.setCaseNoOther(warehouseInOutInfo.getBoxNoOther());
+                                    tranCarInfo.setTitleNoOther(warehouseInOutInfo.getTitleNoOther());
+                                } else if ("火运".equals(warehouseInOutInfo.getOutType())) {
+                                    tranCarInfo.setBoxNo(warehouseInOutInfo.getWingNumber());
+                                } else if ("散船".equals(warehouseInOutInfo.getOutType())) {
+                                    tranCarInfo.setShipName(warehouseInOutInfo.getShipName());
+                                    tranCarInfo.setShipNo(warehouseInOutInfo.getShipNumber());
+                                } else if ("集装箱船".equals(warehouseInOutInfo.getOutType())) {
+                                    tranCarInfo.setCaseNo(warehouseInOutInfo.getBoxNo());
+                                    tranCarInfo.setTitleNo(warehouseInOutInfo.getTitleNo());
+                                }
                                 warehouseInOutInfo.setCarId(tranCarInfo.getId());
                                 warehouseInOutInfo.setTranCarNo(tranCarNo);
                                 warehouseInOutInfoService.updateById(warehouseInOutInfo);
@@ -4854,6 +4882,20 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                             tranCarInfo.setStatusFlag(StatusEnum.LOADED.getFlag());
                             tranCarInfo.setStatus(StatusEnum.LOADED.getName());
                             tranCarInfo.setFleetName(warehouseInOutInfo.getFleet());
+                            if ("汽运".equals(warehouseInOutInfo.getOutType())) {
+                                tranCarInfo.setCaseNo(warehouseInOutInfo.getBoxNo());
+                                tranCarInfo.setTitleNo(warehouseInOutInfo.getTitleNo());
+                                tranCarInfo.setCaseNoOther(warehouseInOutInfo.getBoxNoOther());
+                                tranCarInfo.setTitleNoOther(warehouseInOutInfo.getTitleNoOther());
+                            } else if ("火运".equals(warehouseInOutInfo.getOutType())) {
+                                tranCarInfo.setBoxNo(warehouseInOutInfo.getWingNumber());
+                            } else if ("散船".equals(warehouseInOutInfo.getOutType())) {
+                                tranCarInfo.setShipName(warehouseInOutInfo.getShipName());
+                                tranCarInfo.setShipNo(warehouseInOutInfo.getShipNumber());
+                            } else if ("集装箱船".equals(warehouseInOutInfo.getOutType())) {
+                                tranCarInfo.setCaseNo(warehouseInOutInfo.getBoxNo());
+                                tranCarInfo.setTitleNo(warehouseInOutInfo.getTitleNo());
+                            }
                             warehouseInOutInfo.setSelfLoading("1");
                             warehouseInOutInfo.setCarId(tranCarInfo.getId());
                             warehouseInOutInfo.setTranCarNo(tranCarNo);

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

@@ -19,6 +19,9 @@
         <if test="createUserId != null and createUserId != ''">
             AND create_user_id= #{createUserId}
         </if>
+        <if test="expensesPurpose != null and expensesPurpose != ''">
+            AND expenses_purpose= #{expensesPurpose}
+        </if>
         <if test="searchTypeFee != null and searchTypeFee != ''">
             <if test="searchTypeFee == 1">
                 AND storage_fee_flag = '1'
@@ -90,6 +93,9 @@
         <if test="createUserId != null and createUserId != ''">
             AND create_user_id= #{createUserId}
         </if>
+        <if test="expensesPurpose != null and expensesPurpose != ''">
+            AND expenses_purpose= #{expensesPurpose}
+        </if>
         <if test="searchTypeFee != null and searchTypeFee != ''">
             <if test="searchTypeFee == 1">
                 AND storage_fee_flag = '1'