Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/DriverCarInfoController.java

@@ -40,5 +40,14 @@ public class DriverCarInfoController {
     public List<DriverCarInfo> selectCarNumber(@RequestBody String driverId){
         return driverCarInfoService.selectCarNumber(driverId);
     }
+
+    /**
+     * 查询所有车牌号下拉列表
+     * @return
+     */
+    @GetMapping("/selectAllCarNumber")
+    public List<DriverCarInfo> selectAllCarNumber(){
+        return driverCarInfoService.selectAllCarNumber();
+    }
 }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/DriverViewInfoController.java

@@ -113,12 +113,21 @@ public class DriverViewInfoController {
     }
 
     /**
-     * 根据姓名查电话、根据电话查姓名
+     * 根据姓名电话查车辆信息
      */
     @GetMapping("/selectDriverDetail")
     public DriverCarInfo selectDriverPhoneByName(String id){
         return driverViewInfoService.selectDriverDetail(id);
     }
+
+    /**
+     * 根据车辆信息查姓名电话
+     */
+    @GetMapping("/selectDriverViewList")
+    public List<DriverViewInfo> selectDriverViewList (String carNumber){
+        return driverViewInfoService.selectDriverViewList(carNumber);
+    }
+
     /**
      * 审核
      * @param driverViewInfo

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/WeighingManagement.java

@@ -491,6 +491,11 @@ public class WeighingManagement extends BaseModel<WeighingManagement> {
      */
     @TableField(exist = false)
     private String carId;
+    /**
+     * 运费
+     */
+    @TableField(exist = false)
+    private Float freight;
 
     @Override
     protected Serializable pkVal() {

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

@@ -28,4 +28,12 @@ public interface IDriverCarInfoService extends IService<DriverCarInfo> {
      * @return
      */
     List<DriverCarInfo> selectCarNumber(String driverId);
+
+    /**
+     * 查询所有车牌号下拉列表
+     *
+     * @param
+     * @return
+     */
+    List<DriverCarInfo> selectAllCarNumber();
 }

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

@@ -63,12 +63,21 @@ public interface IDriverViewInfoService extends IService<DriverViewInfo> {
     List<DriverViewInfo> selectDriverName(String compId);
 
     /**
-     * 根据姓名查电话、根据电话查姓名
+     * 根据姓名电话查车辆信息
      *
      * @param id
      * @return
      */
     DriverCarInfo selectDriverDetail(String id);
+
+    /**
+     * 根据车辆信息查姓名电话
+     *
+     * @param carNumber
+     * @return
+     */
+    List<DriverViewInfo> selectDriverViewList (String carNumber);
+
     /**
      * 审核
      * @param driverViewInfo

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

@@ -50,4 +50,17 @@ public class DriverCarInfoServiceImpl extends ServiceImpl<DriverCarInfoMapper, D
                 .eq(DriverCarInfo.QueryFiles.DRIVER_ID, driverId).eq(DriverCarInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
         return driverCarInfoLists;
     }
+
+    /**
+     * 查询所有车牌号下拉列表
+     *
+     * @param
+     * @return
+     */
+    @Override
+    public List<DriverCarInfo> selectAllCarNumber() {
+        List<DriverCarInfo> driverCarInfoLists = this.selectList(new EntityWrapper<DriverCarInfo>()
+                .eq(DriverCarInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
+        return driverCarInfoLists;
+    }
 }

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

@@ -26,10 +26,8 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.sql.*;
+import java.util.*;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 
 /**
@@ -364,7 +362,7 @@ public class DriverViewInfoServiceImpl extends ServiceImpl<DriverViewInfoMapper,
     }
 
     /**
-     * 根据姓名查电话、根据电话查姓名
+     * 根据姓名电话查车辆信息
      *
      * @param id
      * @return
@@ -376,6 +374,28 @@ public class DriverViewInfoServiceImpl extends ServiceImpl<DriverViewInfoMapper,
         return driverCarInfo;
     }
 
+    /**
+     * 根据车辆信息查姓名电话
+     *
+     * @param carNumber
+     * @return
+     */
+    @Override
+    public List<DriverViewInfo> selectDriverViewList (String carNumber) {
+        //司机集合
+        List<DriverViewInfo> driverViewInfoList = new ArrayList<>();
+        //根据车牌号查询车辆集合
+        List<DriverCarInfo> driverCarInfos = driverCarInfoService.selectList(new EntityWrapper<DriverCarInfo>()
+                .eq("car_number", carNumber).eq(DriverViewInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
+        if (!CollectionUtils.isEmpty(driverCarInfos)) {
+            for (int i = 0; i < driverCarInfos.size(); i++){
+                DriverViewInfo driverViewInfo = this.selectById(driverCarInfos.get(i).getDriverId());
+                driverViewInfoList.add(driverViewInfo);
+            }
+        }
+        return driverViewInfoList;
+    }
+
     /**
      * 审核
      *

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

@@ -122,6 +122,7 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
         pageView.put("pageSize", expenseInfo.getPageSize());
         pageView.put("currentPage", expenseInfo.getCurrentPage());
         pageView.put("contractNo", expenseInfo.getContractNo());
+        pageView.put("createUserId", expenseInfo.getCreateUserId());
         pageView.put("startDate", expenseInfo.getStartDate());
         pageView.put("endDate", expenseInfo.getEndDate());
         pageView.put("businessKeys", businessKeys);

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

@@ -367,6 +367,20 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
             // 先删除任务
             noticeService.removeNotice(BaseNotice.NoticeStatus.TASK, "INOUTTASK-TASK-APPROVE",
                     inOutWarehouseTask.getId(), null);
+            List<SourceRelationInfo> sourceRelationInfoList =sourceRelationInfoService.selectList(new EntityWrapper<SourceRelationInfo>()
+                    .eq("task_id", inOutWarehouseTask.getId())
+                    .eq("delete_flag", "0"));
+            if(CollectionUtils.isNotEmpty(sourceRelationInfoList)){
+                //货源的预计出库重量赋值为实际出库重量
+                for (SourceRelationInfo sourceRelationInfo:sourceRelationInfoList){
+                    WarehousingOrder warehousingOrder=warehousingOrderService.selectById(sourceRelationInfo.getSourceId());
+                    warehousingOrder.setOutWarehouseWeight(warehousingOrder.getOutWarehouseWeight()-sourceRelationInfo.getEstimateOutWarehouseWeight()+sourceRelationInfo.getActualOutWarehouseWeight());
+                    warehousingOrder.setSurplusWeight(warehousingOrder.getInWarehouseWeight()-warehousingOrder.getOutWarehouseWeight());
+                    warehousingOrderService.updateById(warehousingOrder);
+                    sourceRelationInfo.setEstimateOutWarehouseWeight(sourceRelationInfo.getActualOutWarehouseWeight());
+                    sourceRelationInfoService.updateById(sourceRelationInfo);
+                }
+            }
             //出库任务，入库任务,移库先删入库
             if ("1".equals(inOutWarehouseTask.getTaskTypeKey()) || "2".equals(inOutWarehouseTask.getTaskTypeKey()) ||
                     ("3".equals(inOutWarehouseTask.getTaskTypeKey()) && "2".equals(inOutWarehouseTask.getInOutFlag()))) {
@@ -716,7 +730,7 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
     @Override
     public Integer tranTaskCount(InOutWarehouseTask inOutWarehouseTask) {
         Integer count=tranTaskInfoService.selectCount(new EntityWrapper<TranTaskInfo>()
-        .eq("contract_no",inOutWarehouseTask.getMoveTaskNo())
+        .eq("contract_no",inOutWarehouseTask.getContractNo())
         .eq("comp_id",inOutWarehouseTask.getCompId()));
         return count;
     }

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

@@ -971,11 +971,18 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                         .eq("contract_id", contractManagementInfo.getId()));
                 //查合同下的车牌号,出库只能查到未出库的
                 List<TranCarInfo> tranCarInfoList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
-                        .eq("contract_no", contractManagementInfo.getContractNo()).eq("tran_type", "1").eq("submit", "0")
+                        .eq("contract_no", contractManagementInfo.getContractNo()).eq("fleet_flag", "0").eq("tran_type", "1").eq("submit", "0")
                         .last("ORDER BY CONVERT ( car_no USING gbk ) ASC"));
                 if (!CollectionUtils.isEmpty(tranCarInfoList)) {
                     contractManagementInfo.setTranCarInfoList(tranCarInfoList);
                 }
+                List<TranCarInfo> tranCarInfoList1 = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
+                        .eq("contract_no", contractManagementInfo.getContractNo())
+                        .eq("fleet_flag", "1")
+                        .last("ORDER BY CONVERT ( fleet_name USING gbk ) ASC"));
+                if (!CollectionUtils.isEmpty(tranCarInfoList1)) {
+                    contractManagementInfo.setTranCarInfoList1(tranCarInfoList1);
+                }
                 //查船名
                 Wrapper<TranCarInfo> shipListWrapper = new EntityWrapper<>();
                 shipListWrapper.eq("contract_no", contractManagementInfo.getContractNo())
@@ -1008,11 +1015,18 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 BeanUtils.copyProperties(inOutWarehouseTask, contractManagementInfo);
                 //查移库任务编号下的车牌号，移库出库只能查到未出库的
                 List<TranCarInfo> tranCarInfoList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
-                        .eq("contract_no", inOutWarehouseTask.getMoveTaskNo()).eq("tran_type", "1").eq("submit", "0")
+                        .eq("contract_no", inOutWarehouseTask.getMoveTaskNo()).eq("fleet_flag", "0").eq("tran_type", "1").eq("submit", "0")
                         .last("ORDER BY CONVERT ( car_no USING gbk ) ASC"));
                 if (!CollectionUtils.isEmpty(tranCarInfoList)) {
                     contractManagementInfo.setTranCarInfoList(tranCarInfoList);
                 }
+                List<TranCarInfo> tranCarInfoList1 = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
+                        .eq("contract_no", inOutWarehouseTask.getMoveTaskNo())
+                        .eq("fleet_flag", "1")
+                        .last("ORDER BY CONVERT ( fleet_name USING gbk ) ASC"));
+                if (!CollectionUtils.isEmpty(tranCarInfoList1)) {
+                    contractManagementInfo.setTranCarInfoList1(tranCarInfoList1);
+                }
                 //查船名
                 Wrapper<TranCarInfo> shipListWrapper = new EntityWrapper<>();
                 shipListWrapper.eq("contract_no", inOutWarehouseTask.getMoveTaskNo())
@@ -2652,10 +2666,18 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 cell.setCellValue(editDouble(exportVView.getUnitDeduction()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(37);
-                cell.setCellValue(new Formatter().format("%.3f", editDouble(exportVView.getPureWeightPrice())).toString());
+                if(exportVView.getPureWeightPrice() == null){
+                    cell.setCellValue(new Formatter().format("%.3f", editDouble(exportVView.getPureWeightPrice())).toString());
+                }else {
+                    cell.setCellValue(new Formatter().format("%.3f", editDouble(exportVView.getPureWeightPrice() * 1000)).toString());
+                }
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(38);
-                cell.setCellValue(editFloat(exportVView.getPureWeight()));
+                if(exportVView.getPureWeight() == null){
+                    cell.setCellValue(editFloat(exportVView.getPureWeight()));
+                }else {
+                    cell.setCellValue(editDouble(Double.valueOf(exportVView.getPureWeight()) / 1000));
+                }
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(39);
                 cell.setCellValue(editDouble(exportVView.getAmountIngPayable()!=null ? exportVView.getAmountIngPayable() : 0));
@@ -3505,10 +3527,18 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 cell.setCellValue(editDouble(exportVView.getUnitDeduction()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(37);
-                cell.setCellValue(new Formatter().format("%.3f", editDouble(exportVView.getPureWeightPrice())).toString());
+                if(exportVView.getPureWeightPrice() == null){
+                    cell.setCellValue(new Formatter().format("%.3f", editDouble(exportVView.getPureWeightPrice())).toString());
+                }else {
+                    cell.setCellValue(new Formatter().format("%.3f", editDouble(exportVView.getPureWeightPrice() * 1000)).toString());
+                }
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(38);
-                cell.setCellValue(editFloat(exportVView.getPureWeight()));
+                if(exportVView.getPureWeight() == null){
+                    cell.setCellValue(editFloat(exportVView.getPureWeight()));
+                }else {
+                    cell.setCellValue(editDouble(Double.valueOf(exportVView.getPureWeight()) / 1000));
+                }
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(39);
                 cell.setCellValue(editDouble(exportVView.getAmountIngPayable()!=null ? exportVView.getAmountIngPayable() : 0));

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

@@ -1439,7 +1439,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                         stockSaleReceiptReport.setTitleNo(warehouseInOutInfo.getTitleNo());
                                     }
                                     //自运出库时手动加的车
-                                    if ("1".equals(warehouseInOutInfo.getSelfLoading())) {
+                                    if ("1".equals(warehouseInOutInfo.getSelfLoading())|| warehouseInOutInfo.getCarId() == null) {
                                         List<TranCarInfo> tranCarInfoList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
                                                 .eq("contract_no", contractManagementInfo1.getContractNo()).eq("tran_type", "1"));
                                         TranCarInfo tranCarInfo = new TranCarInfo();
@@ -1580,7 +1580,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
 //                                contractInventoryDistributionService.updateById(contractInventoryDistribution);
 //                            }
                             //自运出库时手动加的车
-                            if ("1".equals(warehouseInOutInfo.getSelfLoading())) {
+                            if ("1".equals(warehouseInOutInfo.getSelfLoading())|| warehouseInOutInfo.getCarId() == null) {
                                 List<TranCarInfo> tranCarInfoList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
                                         .eq("contract_no", warehouseInOutInfo.getContractNo()).eq("tran_type", "1")
                                         .orderBy("create_date", false));
@@ -4099,7 +4099,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                         stockSaleReceiptReport.setTitleNo(warehouseInOutInfo.getTitleNo());
                                     }
                                     //自运出库时手动加的车
-                                    if ("1".equals(warehouseInOutInfo.getSelfLoading())) {
+                                    if ("1".equals(warehouseInOutInfo.getSelfLoading())|| warehouseInOutInfo.getCarId() == null) {
                                         List<TranCarInfo> tranCarInfoList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
                                                 .eq("contract_no", contractManagementInfo1.getContractNo()).eq("tran_type", "1"));
                                         TranCarInfo tranCarInfo = new TranCarInfo();
@@ -4242,7 +4242,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
 //                                contractInventoryDistributionService.updateById(contractInventoryDistribution);
 //                            }
                             //自运出库时手动加的车
-                            if ("1".equals(warehouseInOutInfo.getSelfLoading())) {
+                            if ("1".equals(warehouseInOutInfo.getSelfLoading())|| warehouseInOutInfo.getCarId() == null) {
                                 List<TranCarInfo> tranCarInfoList = tranCarInfoService.selectList(new EntityWrapper<TranCarInfo>()
                                         .eq("contract_no", warehouseInOutInfo.getContractNo()).eq("tran_type", "1")
                                         .orderBy("create_date", false));

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

@@ -472,6 +472,9 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
                         warehouseInOutInfoService.selectById(weighingManagement.getWarehouseInOutId());
                 if(warehouseInOutInfo!= null){
                     weighingManagement.setPositionId(warehouseInOutInfo.getPositionId());
+                    weighingManagement.setFreight(warehouseInOutInfo.getFreight());
+                    weighingManagement.setCarId(warehouseInOutInfo.getCarId());
+                    weighingManagement.setTranCarNo(warehouseInOutInfo.getTranCarNo());
                     weighingManagement.setSelfLoading(warehouseInOutInfo.getSelfLoading());
                 }
             }
@@ -507,14 +510,6 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
             if (warehouseInOutDetail!=null){
                 weighingManagement.setInOutDetailId(warehouseInOutDetail.getId());
             }
-            //查询车辆信息
-            TranCarInfo tranCarInfo = tranCarInfoService.selectOne(new EntityWrapper<TranCarInfo>()
-                    .eq("contract_no", weighingManagement.getContractNo())
-                    .eq("car_no",weighingManagement.getCarNumber()));
-            if (tranCarInfo != null){
-                weighingManagement.setCarId(tranCarInfo.getId());
-                weighingManagement.setTranCarNo(tranCarInfo.getTranCarNo());
-            }
             weighingManagement.setCodeUrl(qrCodeUtil.generateQRCodeImage(qualityInspectionManagement.getCompId()+"&"+qualityInspectionManagement.getQualityNo()+"&"+warehouseBaseInfo.getId(),800,800,"",qualityInspectionManagement.getId()));
 
         }

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

@@ -16,6 +16,9 @@
                 AND expenses_type = '2'
             </if>
         </if>
+        <if test="createUserId != null and createUserId != ''">
+            AND create_user_id= #{createUserId}
+        </if>
         <if test="searchTypeFee != null and searchTypeFee != ''">
             <if test="searchTypeFee == 1">
                 AND storage_fee_flag = '1'
@@ -84,6 +87,9 @@
                 AND expenses_type = '2'
             </if>
         </if>
+        <if test="createUserId != null and createUserId != ''">
+            AND create_user_id= #{createUserId}
+        </if>
         <if test="searchTypeFee != null and searchTypeFee != ''">
             <if test="searchTypeFee == 1">
                 AND storage_fee_flag = '1'

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

@@ -91,6 +91,7 @@
         p.tran_type_key AS tranTypeKey,
         p.create_date as createDate,
         c.load_pound_img as loadPoundImg,
+        t.task_type as taskType,
         c.unload_pound_img as unloadPoundImg,
         p.feedback_status AS feedbackStatus,
         p.feedback_status_flag AS feedbackStatusFlag,