1

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

@@ -4,7 +4,6 @@ package com.yh.saas.plugin.yiliangyiyun.controller;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.plugin.yiliangyiyun.entity.ExpenseInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.WarehousingOrder;
-import com.yh.saas.plugin.yiliangyiyun.entity.view.WarehouseNumView;
 import com.yh.saas.plugin.yiliangyiyun.service.IExpenseInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -126,6 +125,13 @@ public class ExpenseInfoController {
     public String exportPhone(@RequestBody ExpenseInfo example, HttpServletResponse response) throws Exception {
         return expenseInfoService.exportPhone(example,response);
     }
+    /**
+     * 查当天提交的费用条数
+     */
+    @GetMapping("/api/expenseCount")
+    public Integer expenseCount(ExpenseInfo expenseInfo){
+        return expenseInfoService.expenseCount(expenseInfo);
+    }
 
 }
 

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

@@ -110,6 +110,13 @@ public class SourceRelationInfo extends BaseModel<SourceRelationInfo> {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @TableField(exist = false)
     private Date issuingTimeElse;
+    /**
+     * 出单时间年月日时分秒
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(exist = false)
+    private Date issuingTimeOther;
     @Override
     protected Serializable pkVal() {
         return this.id;

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

@@ -145,8 +145,8 @@ public class WarehousingOrder extends BaseModel<WarehousingOrder> {
     /**
      * 出单时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date issuingTime;
     /**
      * 出库时间

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

@@ -83,4 +83,9 @@ public interface IExpenseInfoService extends IService<ExpenseInfo> {
      * @throws Exception
      */
     String exportPhone(ExpenseInfo expenseInfo, HttpServletResponse response) throws Exception;
+    /**
+     * 查当天提交的费用条数
+     * @param expenseInfo
+     */
+    Integer expenseCount(ExpenseInfo expenseInfo);
 }

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

@@ -10,23 +10,16 @@ import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.google.common.collect.Lists;
 import com.winsea.svc.base.base.entity.CommonRoleResource;
-import com.winsea.svc.base.base.entity.CommonStaff;
 import com.winsea.svc.base.base.service.ICommonRoleResourceService;
-import com.winsea.svc.base.base.service.ICommonStaffService;
 import com.winsea.svc.base.base.util.DateUtils;
 import com.winsea.svc.base.security.entity.User;
 import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.winsea.svc.base.workflow.entity.Workflow;
-import com.winsea.svc.notice.entity.NoticeTaskInfo;
-import com.winsea.svc.notice.entity.base.BaseNotice;
-import com.winsea.svc.notice.service.INoticeService;
-import com.winsea.svc.notice.service.INoticeTaskService;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.*;
-import com.yh.saas.plugin.yiliangyiyun.entity.view.WarehouseNumView;
 import com.yh.saas.plugin.yiliangyiyun.exception.YException;
 import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
 import com.yh.saas.plugin.yiliangyiyun.mapper.ExpenseInfoMapper;
@@ -927,6 +920,22 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
 
         return downloadPhone(path, response, wb);
     }
+
+    @Override
+    public Integer expenseCount(ExpenseInfo expenseInfo) {
+        //当天零点
+        SimpleDateFormat now = new SimpleDateFormat("yyyy-MM-dd 00:00:00");
+        Calendar c = Calendar.getInstance();
+        c.setTime(new Date());
+        c.add(Calendar.YEAR, 0);
+        Date y = c.getTime();
+        String year = now.format(y);
+        Integer count = this.selectCount(new EntityWrapper<ExpenseInfo>()
+                .eq("comp_id", expenseInfo.getCompId())
+                .ge("create_date", year));
+        return count;
+    }
+
     private String addDateOneDay(Date date) {
         SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         sdf.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));

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

@@ -99,6 +99,7 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
                 for (SourceRelationInfo sourceRelationInfo: sourceRelationInfoList) {
                     sourceRelationInfo.setId(IdGenerator.generateUUID());
                     sourceRelationInfo.setTaskId(inOutWarehouseTask.getId());
+                    sourceRelationInfo.setIssuingTime(sourceRelationInfo.getIssuingTimeOther());
                     //计算比例
                     sourceRelationInfo.setProportion(sourceRelationInfo.getEstimateOutWarehouseWeight()/Double.valueOf(String.valueOf(inOutWarehouseTask.getWeight())));
                     sourceRelationInfoService.insert(sourceRelationInfo);

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

@@ -314,6 +314,8 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         for (SourceRelationInfo sourceRelationInfo:sourceRelationInfoList){
                             //实际重量
                             sourceRelationInfo.setActualOutWarehouseWeight(sourceRelationInfo.getActualOutWarehouseWeight()+Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()*sourceRelationInfo.getProportion())));
+                            //剩余重量
+                            sourceRelationInfo.setSurplusWeight(sourceRelationInfo.getSurplusWeight()-Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()*sourceRelationInfo.getProportion())));
                             sourceRelationInfoService.updateById(sourceRelationInfo);
                         }
                     }
@@ -2534,6 +2536,8 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         for (SourceRelationInfo sourceRelationInfo:sourceRelationInfoList){
                             //实际重量
                             sourceRelationInfo.setActualOutWarehouseWeight(sourceRelationInfo.getActualOutWarehouseWeight()+Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()*sourceRelationInfo.getProportion())));
+                            //剩余重量
+                            sourceRelationInfo.setSurplusWeight(sourceRelationInfo.getSurplusWeight()-Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()*sourceRelationInfo.getProportion())));
                             sourceRelationInfoService.updateById(sourceRelationInfo);
                         }
                     }
@@ -2587,6 +2591,8 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                         for (SourceRelationInfo sourceRelationInfo:sourceRelationInfoList){
                             //实际重量
                             sourceRelationInfo.setActualOutWarehouseWeight(sourceRelationInfo.getActualOutWarehouseWeight()+Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()*sourceRelationInfo.getProportion())));
+                            //剩余重量
+                            sourceRelationInfo.setSurplusWeight(sourceRelationInfo.getSurplusWeight()-Float.valueOf(String.valueOf(warehouseInOutInfo.getNetWeight()*sourceRelationInfo.getProportion())));
                             sourceRelationInfoService.updateById(sourceRelationInfo);
                         }
                     }