1

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/constant/StatusEnum.java

@@ -158,6 +158,7 @@ public enum StatusEnum {
     COST_RECEIVED("5", "已收款", "cost_received"),
     COST_ADOPTED("6", "已通过", "cost_adopted"),
     COMPLETED("7", "已完成", "completed"),
+    NO_PAYMENT("9", "无需付款", "no_payment"),
 
     //补卡状态
     SUPP_REVIEWED("1", "审核中", "supp_reviewed"),
@@ -181,6 +182,11 @@ public enum StatusEnum {
     //烘干入库状态
     WEIGHED_TARE("1", "待称皮重", "weighed_tare"),
     ALREADY_IN_WAREHOUSE("3", "已入库", "already_in_warehouse"),
+    //物料出入库状态
+    MATERIAL_TARE("1", "待称皮重", "weighed_tare"),
+    MATERIAL_GROSS("3", "待称毛重", "material_gross"),
+    ALREADY_IN_MATERIAL("5", "已入库", "already_in_material"),
+    ALREADY_OUT_MATERIAL("7", "已出库", "already_out_material"),
 
     //货权明细状态
     TO_BE_RECEIVE("1", "待接收", "to_be_receive"),

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

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.enums.IdType;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.winsea.svc.notice.entity.NoticeTaskInfo;
 import com.yh.saas.common.support.entity.BaseModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -53,6 +54,18 @@ public class ExpenseInfo extends BaseModel<ExpenseInfo> {
      * 关联id
      */
     private String relationId;
+    /**
+     * 备用金关联id
+     */
+    private String pettyRelationId;
+    /**
+     * 备用金支付账户
+     */
+    private String pettyName;
+    /**
+     * 是否显示
+     */
+    private String pettyShowFlag;
     /**
      * 加油id
      */
@@ -101,6 +114,10 @@ public class ExpenseInfo extends BaseModel<ExpenseInfo> {
      * 备用金支付标识(1是)
      */
     private String paymentIdentifi;
+    /**
+     * 无需付款标识(1是)
+     */
+    private String noPaymentFlag;
 
     /**
      * 费用分配方式(1按重量自动分配3指定金额分配)
@@ -372,6 +389,11 @@ public class ExpenseInfo extends BaseModel<ExpenseInfo> {
      */
     @TableField(exist = false)
     private List<ExpenseAllocationInfo> expenseAllocationInfoListBH;
+    /**
+     * 确认收款任务
+     */
+    @TableField(exist = false)
+    private List<NoticeTaskInfo> noticeTaskInfoList;
     /**
      * 发起人
      */
@@ -425,6 +447,11 @@ public class ExpenseInfo extends BaseModel<ExpenseInfo> {
      */
     @TableField(exist = false)
     private String operatorId;
+    /**
+     *标识
+     */
+    @TableField(exist = false)
+    private String vesselId;
 
     @Override
     protected Serializable pkVal() {

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

@@ -1,8 +1,10 @@
 package com.yh.saas.plugin.yiliangyiyun.entity;
 
 import java.io.Serializable;
+import java.util.List;
 
 
+import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.enums.IdType;
@@ -10,6 +12,7 @@ import com.yh.saas.common.support.entity.BaseModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.apache.catalina.LifecycleState;
 
 /**
  * <p>
@@ -48,6 +51,10 @@ public class PettyCashInfo extends BaseModel<PettyCashInfo> {
      * 部门
      */
     private String deptName;
+    /**
+     * 备用金关联id
+     */
+    private String pettyRelationId;
     /**
      * 姓名
      */
@@ -80,7 +87,21 @@ public class PettyCashInfo extends BaseModel<PettyCashInfo> {
      * 工作流ID
      */
     private String workflowId;
-
+    /**
+     * 查询类型
+     */
+    @TableField(exist = false)
+    private String searchType;
+    /**
+     * 模糊查询
+     */
+    @TableField(exist = false)
+    private String searchKeyWord;
+    /**
+     * 备用金关联费用列表
+     */
+    @TableField(exist = false)
+    private List<ExpenseInfo> expenseInfoList;
 
     @Override
     protected Serializable pkVal() {

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/exception/YExceptionEnum.java

@@ -53,6 +53,9 @@ public enum YExceptionEnum {
 	CONTRACT_HAS_SURPLUS_ERROR("ERROR", "该合同仍有剩余储量，无法进行完成操作！"),
 	NICKNAME_NO_ERROR("ERROR", "昵称已存在，不可重复！"),
 	COMP_NAME_ERROR("ERROR", "货权接收公司不存在！"),
+	PETTY_ACCOUNT_ERROR("ERROR", "当前账户备用金余额不足！"),
+	PETTY_ERROR("ERROR", "所有备用金账户余额剩余小于0！"),
+	CLOCK_ERROR("ERROR", "上班时间未打卡"),
 	;
 	@Getter
 	private String value;

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

@@ -110,11 +110,15 @@ public class ClockInfoServiceImpl extends ServiceImpl<ClockInfoMapper, ClockInfo
             clockInfo.setId(IdGenerator.generateUUID());
             //下班打卡
             if ("3".equals(clockInfo.getClockType())) {
-                if (timeOfFive.compareTo(currentTime) > 0) {
-                    //早退
-                    clockInfo.setLeaveEarlyFlag("1");
+                if(clockInfo.getToClockDate() != null){
+                    if (timeOfFive.compareTo(currentTime) > 0) {
+                        //早退
+                        clockInfo.setLeaveEarlyFlag("1");
+                    }
+                    clockInfo.setOffClockDate(date);
+                }else{
+                    throw new YException(YExceptionEnum.CLOCK_ERROR);
                 }
-                clockInfo.setOffClockDate(date);
             }
             //上班打卡
             else {