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

winsea-haixin-plugin-base/src/main/java/com/yh/saas/plugin/base/entity/CommonBillOperateHis.java

@@ -78,6 +78,10 @@ public class CommonBillOperateHis extends BaseModel<CommonBillOperateHis> {
      * 签名路径
      */
     private String signPath;
+    /**
+     * 业务历史
+     */
+    private String businessHistory;
     /**
      * 审批结果
      */

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

@@ -53,7 +53,7 @@ public class GeneratorCodeByTables {
     }
 
     public static void main(String[] args) throws IOException {
-        generateByTables("Gdc", "com.yh.saas.plugin.yiliangyiyun","general_audit_info");
+        generateByTables("Gdc", "com.yh.saas.plugin.yiliangyiyun","dry_warehouse","dry_warehouse_car");
     }
 
     /**

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

@@ -175,6 +175,9 @@ public enum StatusEnum {
     //汽运报表状态
     PENDING_PAY("1", "待请款", "pending_pay"),
 
+    //烘干入库状态
+    WEIGHED_TARE("1", "待称皮重", "weighed_tare"),
+    ALREADY_IN_WAREHOUSE("3", "已入库", "already_in_warehouse"),
 
     ;
     @Getter

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

@@ -612,22 +612,23 @@ public class CommonUserController {
 
     @PostMapping("/test")
     public void test() throws Exception {
-        String userId = "2dbbee49f86f47c9b2ef6f7bba34b441";
-//        geTuiUtils.callPhone(userId);
-//        JSONObject jsonObject = new JSONObject();
-//        jsonObject.put("msg", "1234567");
-//        MessagePusherUtils.sendPrivateMessage(AuthSecurityUtils.getCurrentUserId(),JSONObject.toJSONString(jsonObject));
-        UnimallMessage messageDO = new UnimallMessage();
-        messageDO.setAdminId(AuthSecurityUtils.getCurrentUserId());
-        messageDO.setCustomer(AuthSecurityUtils.getCurrentUserInfo().getLoginName());
-        messageDO.setOperation("XX");
-        messageDO.setResult("XX");
-        messageDO.setGmtUpdate(new Date());
-        messageDO.setGmtCreate(new Date());
-        messageDO.setTaskId(IdGenerator.generateUUID());
-        messageDO.setCompanyId(AuthSecurityUtils.getCurrentUserInfo().getCompId());
-        messageDO.setPath("XXXXX");
-        webSocket.sendOneMessage(messageDO);
+//        String userId = "2dbbee49f86f47c9b2ef6f7bba34b441";
+////        geTuiUtils.callPhone(userId);
+////        JSONObject jsonObject = new JSONObject();
+////        jsonObject.put("msg", "1234567");
+////        MessagePusherUtils.sendPrivateMessage(AuthSecurityUtils.getCurrentUserId(),JSONObject.toJSONString(jsonObject));
+//        UnimallMessage messageDO = new UnimallMessage();
+//        messageDO.setAdminId(AuthSecurityUtils.getCurrentUserId());
+//        messageDO.setCustomer(AuthSecurityUtils.getCurrentUserInfo().getLoginName());
+//        messageDO.setOperation("XX");
+//        messageDO.setResult("XX");
+//        messageDO.setGmtUpdate(new Date());
+//        messageDO.setGmtCreate(new Date());
+//        messageDO.setTaskId(IdGenerator.generateUUID());
+//        messageDO.setCompanyId(AuthSecurityUtils.getCurrentUserInfo().getCompId());
+//        messageDO.setPath("XXXXX");
+//        webSocket.sendOneMessage(messageDO);
+        workflowService.stopInstance("_1040331392328097792","a0685e1c3b3746448954dc9103adf479","发起人撤回");
     }
 }
 

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

@@ -0,0 +1,53 @@
+package com.yh.saas.plugin.yiliangyiyun.controller;
+
+
+import com.yh.saas.plugin.yiliangyiyun.entity.DryWarehouseCar;
+import com.yh.saas.plugin.yiliangyiyun.service.IDryWarehouseCarService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 记录烘干入库常用车辆信息 前端控制器
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-11-17
+ */
+@RestController
+@RequestMapping("/dryWarehouseCar")
+public class DryWarehouseCarController {
+
+    @Autowired
+    private IDryWarehouseCarService dryWarehouseCarService;
+
+    /**
+     * 添加车辆信息
+     * @param dryWarehouseCar
+     */
+    @PostMapping("/api/addDryWarehouseCar")
+    public String addDryWarehouseCar(@RequestBody DryWarehouseCar dryWarehouseCar){
+        return dryWarehouseCarService.addDryWarehouseCar(dryWarehouseCar);
+    }
+
+    /**
+     * 删除车辆信息
+     * @param example
+     */
+    @PostMapping("/api/deleteDryWarehouseCar")
+    public void deleteDryWarehouseCar(@RequestBody DryWarehouseCar example){
+        dryWarehouseCarService.deleteDryWarehouseCar(example.getId());
+    }
+
+    /**
+     * 车牌号下拉列表
+     * @return
+     */
+    @GetMapping("/selectCarNumber")
+    public List<DryWarehouseCar> selectCarNumber(String baseId){
+        return dryWarehouseCarService.selectCarNumber(baseId);
+    }
+}
+

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

@@ -0,0 +1,61 @@
+package com.yh.saas.plugin.yiliangyiyun.controller;
+
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.yh.saas.plugin.yiliangyiyun.entity.DryWarehouse;
+import com.yh.saas.plugin.yiliangyiyun.service.IDryWarehouseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 记录烘干入库信息 前端控制器
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-11-17
+ */
+@RestController
+@RequestMapping("/dryWarehouse")
+public class DryWarehouseController {
+
+    @Autowired
+    private IDryWarehouseService dryWarehouseService;
+
+    /**
+     * 称毛重
+     * @param dryWarehouse
+     */
+    @PostMapping("/api/addDryWarehouse")
+    public String addDryWarehouse(@RequestBody DryWarehouse dryWarehouse){
+        return dryWarehouseService.addDryWarehouse(dryWarehouse);
+    }
+
+    /**
+     * 称皮重
+     * @param dryWarehouse
+     */
+    @PostMapping("/api/editDryWarehouse")
+    public String editDryWarehouse(@RequestBody DryWarehouse dryWarehouse){
+        return dryWarehouseService.editDryWarehouse(dryWarehouse);
+    }
+
+    /**
+     * 删除
+     * @param example
+     */
+    @PostMapping("/api/deleteDryWarehouse")
+    public void deleteDryWarehouse(@RequestBody DryWarehouse example){
+        dryWarehouseService.deleteDryWarehouse(example.getId());
+    }
+
+    /**
+     * 烘干入库记录
+     * @param dryWarehouse
+     */
+    @GetMapping("/selectDryWarehousePage")
+    public Page<DryWarehouse> selectDryWarehousePage(@RequestBody DryWarehouse dryWarehouse){
+        return dryWarehouseService.selectDryWarehousePage(dryWarehouse);
+    }
+}
+

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

@@ -271,4 +271,14 @@ public class NewWorkflowController {
     public void removeLatestWorkflow(@RequestBody Workflow workflow) {
         workflowService.removeLatestWorkflow(workflow.getId());
     }
+
+
+    /**
+     * 停止审核流
+     *
+     */
+    @PostMapping("/api/stopInstance")
+    public void stopInstance(@RequestParam String workflowId, @RequestParam String businessKey) {
+        workflowService.stopInstance(workflowId,businessKey,"发起人撤回");
+    }
 }

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

@@ -1,7 +1,6 @@
 package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
-
 import com.baomidou.mybatisplus.plugins.Page;
 import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseBaseInfo;
@@ -29,6 +28,7 @@ public class WarehouseBaseInfoController {
 
     @Autowired
     private IWarehouseBaseInfoService warehouseBaseInfoService;
+
     /**
      * 添加仓库
      */
@@ -39,13 +39,15 @@ public class WarehouseBaseInfoController {
 
     /**
      * 添加临时仓库
+     *
      * @param warehouseBaseInfo
      * @return
      */
     @PostMapping("/api/addTemporaryWarehouse")
-    public String addTemporaryWarehouse(@RequestBody WarehouseBaseInfo warehouseBaseInfo){
+    public String addTemporaryWarehouse(@RequestBody WarehouseBaseInfo warehouseBaseInfo) {
         return warehouseBaseInfoService.addTemporaryWarehouse(warehouseBaseInfo);
     }
+
     /**
      * 编辑仓库
      */
@@ -53,46 +55,49 @@ public class WarehouseBaseInfoController {
     public String editWarehouse(@RequestBody WarehouseBaseInfo warehouseBaseInfo) {
         return warehouseBaseInfoService.editWarehouse(warehouseBaseInfo);
     }
+
     /**
      * 查看库房下拉列表
      */
     @GetMapping("/selectWarehouse")
-    public List<WarehouseBaseInfo> selectWarehouse(@RequestParam String compId,String warehouseType){
-        return warehouseBaseInfoService.selectWarehouse(compId,warehouseType);
+    public List<WarehouseBaseInfo> selectWarehouse(@RequestParam String compId, String warehouseType) {
+        return warehouseBaseInfoService.selectWarehouse(compId, warehouseType);
     }
+
     /**
      * 查看自己负责的常用仓库
      * 公司ID,手机号
      */
     @GetMapping("/selectWarehouseSelf")
-    public List<WarehouseBaseInfo> selectWarehouseSelf(@RequestParam String compId,String personCharge){
-        return warehouseBaseInfoService.selectWarehouseSelf(compId,personCharge);
+    public List<WarehouseBaseInfo> selectWarehouseSelf(@RequestParam String compId, String personCharge) {
+        return warehouseBaseInfoService.selectWarehouseSelf(compId, personCharge);
     }
+
     /**
      * 查看自己负责的常用仓库
      * 公司ID,手机号
      */
     @GetMapping("/selectWarehouseSelfApp")
-    public List<WarehouseBaseInfo> selectWarehouseSelfApp(@RequestParam String compId,String personCharge){
-        return warehouseBaseInfoService.selectWarehouseSelfApp(compId,personCharge);
+    public List<WarehouseBaseInfo> selectWarehouseSelfApp(@RequestParam String compId, String personCharge) {
+        return warehouseBaseInfoService.selectWarehouseSelfApp(compId, personCharge);
     }
+
     /**
      * 查看库房
      */
     @GetMapping("/getWarehouse")
-    public WarehouseBaseInfo getWarehouse(String id){
+    public WarehouseBaseInfo getWarehouse(String id) {
         return warehouseBaseInfoService.getWarehouse(id);
     }
 
     /**
-     * @description 仓库管理页面列表
-     *
      * @param compId
      * @return
+     * @description 仓库管理页面列表
      */
     @GetMapping("/selectWarehouseViewinfo")
-    public WarehouseBaseInfo selectWarehouseViewinfo(String compId,String warehouseName,String warehouseType){
-        return warehouseBaseInfoService.selectWarehouseViewinfo(compId,warehouseName,warehouseType);
+    public WarehouseBaseInfo selectWarehouseViewinfo(String compId, String warehouseName, String warehouseType) {
+        return warehouseBaseInfoService.selectWarehouseViewinfo(compId, warehouseName, warehouseType);
     }
 
     /**
@@ -102,7 +107,7 @@ public class WarehouseBaseInfoController {
      * @return
      */
     @GetMapping("/reservesDetails")
-    public List<WarehouseNumView> reservesDetails(String compId){
+    public List<WarehouseNumView> reservesDetails(String compId) {
         return warehouseBaseInfoService.reservesDetails(compId);
     }
 
@@ -113,57 +118,64 @@ public class WarehouseBaseInfoController {
      * @return
      */
     @GetMapping("/allWarehouse")
-    public List<WarehouseView> allWarehouse(String compId,String warehouseName,String goodsName){
-        return warehouseBaseInfoService.allWarehouse(compId,warehouseName,goodsName);
+    public List<WarehouseView> allWarehouse(String compId, String warehouseName, String goodsName) {
+        return warehouseBaseInfoService.allWarehouse(compId, warehouseName, goodsName);
     }
 
     /**
      * 更改显示状态
      */
     @PostMapping("/api/editShow")
-    public String editShow(@RequestBody WarehouseBaseInfo warehouseBaseInfo){
+    public String editShow(@RequestBody WarehouseBaseInfo warehouseBaseInfo) {
         return warehouseBaseInfoService.editShow(warehouseBaseInfo.getId());
     }
 
     /**
      * 查询所有库房
+     *
      * @param compId,warehouseType
      * @return
      */
     @GetMapping("/selectAllWarehouse")
-    public List<WarehouseBaseInfo> selectAllWarehouse(String compId,String warehouseType,String warehouseName){
-        return warehouseBaseInfoService.selectAllWarehouse(compId,warehouseType,warehouseName);
+    public List<WarehouseBaseInfo> selectAllWarehouse(String compId, String warehouseType, String warehouseName) {
+        return warehouseBaseInfoService.selectAllWarehouse(compId, warehouseType, warehouseName);
     }
 
     /**
      * 删除库房
+     *
      * @param warehouseBaseInfo
      */
     @PostMapping("/api/deleteWarehouse")
-    public void deleteWarehouse(@RequestBody WarehouseBaseInfo warehouseBaseInfo){
+    public void deleteWarehouse(@RequestBody WarehouseBaseInfo warehouseBaseInfo) {
         warehouseBaseInfoService.deleteWarehouse(warehouseBaseInfo.getId());
     }
 
     /**
      * 清仓状态
+     *
      * @param warehouseBaseInfo
      * @return
      */
     @PostMapping("/api/editCleared")
-    public String editCleared(@RequestBody WarehouseBaseInfo warehouseBaseInfo){
+    public String editCleared(@RequestBody WarehouseBaseInfo warehouseBaseInfo) {
         return warehouseBaseInfoService.editCleared(warehouseBaseInfo.getId());
     }
+
     /**
      * 出入库合同编号下拉列表
+     *
      * @param compId
      * @return
      */
     @GetMapping("/selectContractNoList")
-    public List<ContractManagementInfo> selectContractNoList(String compId,Integer flag) {
-        return warehouseBaseInfoService.selectContractNoList(compId,flag);
+    public List<ContractManagementInfo> selectContractNoList(String compId, Integer flag) {
+        return warehouseBaseInfoService.selectContractNoList(compId, flag);
     }
+
     /**
      * 获取检斤打印接口
+     *
      * @param id
      * @return
      */
@@ -171,23 +183,27 @@ public class WarehouseBaseInfoController {
     public WarehouseInOutInfo getPrintInfo(String id) {
         return warehouseBaseInfoService.getPrintInfo(id);
     }
+
     /**
      * 查出库时的成本
+     *
      * @param contractNo,carNo
      * @return
      */
     @GetMapping("/selectCost")
-    public Float selectCost(String contractNo,String carNo) {
-        return warehouseBaseInfoService.selectCost(contractNo,carNo);
+    public Float selectCost(String contractNo, String carNo) {
+        return warehouseBaseInfoService.selectCost(contractNo, carNo);
     }
+
     /**
      * 查看自己负责的常用仓库
      * 公司ID,手机号
      */
     @GetMapping("/selectResponsible")
-    public List<WarehouseBaseInfo> selectResponsible(@RequestParam String compId,String personCharge){
-        return warehouseBaseInfoService.selectResponsible(compId,personCharge);
+    public List<WarehouseBaseInfo> selectResponsible(@RequestParam String compId, String personCharge) {
+        return warehouseBaseInfoService.selectResponsible(compId, personCharge);
     }
+
     /**
      * 导出入库
      *
@@ -196,8 +212,9 @@ public class WarehouseBaseInfoController {
      */
     @PostMapping("/export")
     public void export(@RequestBody WarehouseBaseInfo example, HttpServletResponse response) throws Exception {
-        warehouseBaseInfoService.export(example,response);
+        warehouseBaseInfoService.export(example, response);
     }
+
     /**
      * 导出出库
      *
@@ -206,7 +223,7 @@ public class WarehouseBaseInfoController {
      */
     @PostMapping("/exportOut")
     public void exportOut(@RequestBody WarehouseBaseInfo example, HttpServletResponse response) throws Exception {
-        warehouseBaseInfoService.exportOut(example,response);
+        warehouseBaseInfoService.exportOut(example, response);
     }
 
 
@@ -218,8 +235,9 @@ public class WarehouseBaseInfoController {
      */
     @PostMapping("/exportphone")
     public String exportphone(@RequestBody WarehouseBaseInfo example, HttpServletResponse response) throws Exception {
-        return warehouseBaseInfoService.exportphone(example,response);
+        return warehouseBaseInfoService.exportphone(example, response);
     }
+
     /**
      * 导出出库
      *
@@ -228,7 +246,7 @@ public class WarehouseBaseInfoController {
      */
     @PostMapping("/exportPhoneOut")
     public String exportPhoneOut(@RequestBody WarehouseBaseInfo example, HttpServletResponse response) throws Exception {
-        return warehouseBaseInfoService.exportPhoneOut(example,response);
+        return warehouseBaseInfoService.exportPhoneOut(example, response);
     }
 
     /**
@@ -241,6 +259,7 @@ public class WarehouseBaseInfoController {
     public Page<WarehouseBaseInfo> selectBaseInfo(WarehouseBaseInfo warehouseBaseInfo) {
         return warehouseBaseInfoService.selectBaseInfo(warehouseBaseInfo);
     }
+
     /**
      * 库点利润图表
      */

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

@@ -0,0 +1,129 @@
+package com.yh.saas.plugin.yiliangyiyun.entity;
+
+import java.util.Date;
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yh.saas.common.support.entity.BaseModel;
+import com.baomidou.mybatisplus.enums.IdType;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * <p>
+ * 记录烘干入库信息
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("dry_warehouse")
+public class DryWarehouse extends BaseModel<DryWarehouse> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.UUID)
+    private String id;
+    /**
+     * 公司id
+     */
+    private String compId;
+    /**
+     * 仓库id
+     */
+    private String baseId;
+    /**
+     * 仓库名称
+     */
+    private String warehouseName;
+    /**
+     * 业务编号
+     */
+    private String dryNumber;
+    /**
+     * 车牌号
+     */
+    private String carNo;
+    /**
+     * 货名key
+     */
+    private String goodsNameKey;
+    /**
+     * 货名
+     */
+    private String goodsName;
+    /**
+     * 检斤员
+     */
+    private String weigher;
+    /**
+     * 毛重（公斤）
+     */
+    private Float grossWeight;
+    /**
+     * 皮重（公斤）
+     */
+    private Float tare;
+    /**
+     * 净重（公斤）
+     */
+    private Float netWeight;
+    /**
+     * 状态标识（1待称皮重3已入库）
+     */
+    private String statusFlag;
+    /**
+     * 状态
+     */
+    private String status;
+    /**
+     * 入库时间
+     */
+    private Date inWarehouseDate;
+    /**
+     * 模糊查询
+     */
+    @TableField(exist = false)
+    private String searchKeyWord;
+    /**
+     * 开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @TableField(exist = false)
+    private Date startDate;
+    /**
+     * 结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @TableField(exist = false)
+    private Date endDate;
+    /**
+     * 查询类型(1待称皮重)
+     */
+    @TableField(exist = false)
+    private String searchType;
+    /**
+     * 仓库编号
+     */
+    @TableField(exist = false)
+    private String warehouseNo;
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+
+}

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

@@ -0,0 +1,62 @@
+package com.yh.saas.plugin.yiliangyiyun.entity;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.yh.saas.common.support.entity.BaseModel;
+import com.baomidou.mybatisplus.enums.IdType;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 记录烘干入库常用车辆信息
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-11-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("dry_warehouse_car")
+public class DryWarehouseCar extends BaseModel<DryWarehouseCar> {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.UUID)
+    private String id;
+    /**
+     * 仓库id
+     */
+    private String baseId;
+    /**
+     * 仓库名称
+     */
+    private String warehouseName;
+    /**
+     * 车牌号
+     */
+    private String carNo;
+    /**
+     * 皮重（公斤）
+     */
+    private Float tare;
+
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
+    }
+    public static class QueryFiles {
+
+        public static final String BASE_ID = "base_id";
+
+        public static final String DELETE_FLAG = "delete_flag";
+    }
+}

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

@@ -18,6 +18,7 @@ public enum YExceptionEnum {
 	POSITION_NO_ERROR("ERROR","库位不存在"),
 	POSITIONSTORAGE_NO_ERROR("ERROR","没有储存量"),
 	INVENTORY_NO_ERROR("ERROR","出库量大于库存量"),
+	CONVERSION_NO_ERROR("ERROR","所选仓位库存不足"),
 	INNETWEIGHT_NO_ERROR("ERROR","出库量大于入库量"),
 	TASK_NO_ERROR("ERROR","任务编号已存在，不可重复！"),
 	TRAN_PROCESS_SORT_ERROR("ERROR","多阶段任务，不可删除！"),

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/DryWarehouseCarMapper.java

@@ -0,0 +1,16 @@
+package com.yh.saas.plugin.yiliangyiyun.mapper;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.DryWarehouseCar;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 记录烘干入库常用车辆信息 Mapper 接口
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-11-17
+ */
+public interface DryWarehouseCarMapper extends BaseMapper<DryWarehouseCar> {
+
+}

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/DryWarehouseMapper.java

@@ -0,0 +1,44 @@
+package com.yh.saas.plugin.yiliangyiyun.mapper;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.DriverViewInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.DryWarehouse;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.yh.saas.plugin.yiliangyiyun.entity.QualityInspectionManagement;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 记录烘干入库信息 Mapper 接口
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-11-17
+ */
+public interface DryWarehouseMapper extends BaseMapper<DryWarehouse> {
+
+    /**
+     * 根据条件查询烘干记录总数
+     *
+     * @param pageView
+     * @return
+     */
+    Integer getCountByCondition(Map<String, Object> pageView);
+
+    /**
+     * 根据条件查询烘干记录列表
+     *
+     * @param pageView
+     * @return
+     */
+    List<DryWarehouse> getListByCondition(Map<String, Object> pageView);
+
+    /**
+     * 根据条件查询业务编号列表
+     *
+     * @param pageView
+     * @return
+     */
+    List<DryWarehouse> getListByConditions(Map<String, Object> pageView);
+}

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/GeneralAuditInfoMapper.java

@@ -30,6 +30,13 @@ public interface GeneralAuditInfoMapper extends BaseMapper<GeneralAuditInfo> {
      * @return
      */
     List<GeneralAuditInfo> getListByCondition(Map<String, Object> pageView);
+    /**
+     * 查询通用审核总数包括已删除
+     *
+     * @param pageView
+     * @return
+     */
+    Integer getNumByCondition(Map<String, Object> pageView);
 
 
 }

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

@@ -0,0 +1,38 @@
+package com.yh.saas.plugin.yiliangyiyun.service;
+
+import com.yh.saas.plugin.yiliangyiyun.entity.DryWarehouseCar;
+import com.baomidou.mybatisplus.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 记录烘干入库常用车辆信息 服务类
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-11-17
+ */
+public interface IDryWarehouseCarService extends IService<DryWarehouseCar> {
+
+    /**
+     * 添加车辆信息
+     *
+     * @param dryWarehouseCar
+     */
+    String addDryWarehouseCar(DryWarehouseCar dryWarehouseCar);
+
+    /**
+     * 删除车辆信息
+     * @param id
+     */
+    void deleteDryWarehouseCar(String id);
+
+    /**
+     * 查看车牌下拉列表
+     *
+     * @param baseId
+     * @return
+     */
+    List<DryWarehouseCar> selectCarNumber(String baseId);
+}

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

@@ -0,0 +1,52 @@
+package com.yh.saas.plugin.yiliangyiyun.service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.yh.saas.plugin.yiliangyiyun.entity.DryWarehouse;
+import com.baomidou.mybatisplus.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 记录烘干入库信息 服务类
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-11-17
+ */
+public interface IDryWarehouseService extends IService<DryWarehouse> {
+
+    /**
+     * 查询业务编号
+     * @param
+     * @return
+     */
+    List<DryWarehouse> selectDryWarehouseList(DryWarehouse dryWarehouse);
+
+    /**
+     * 称毛重
+     *
+     * @param dryWarehouse
+     */
+    String addDryWarehouse(DryWarehouse dryWarehouse);
+
+    /**
+     * 称皮重
+     *
+     * @param dryWarehouse
+     */
+    String editDryWarehouse(DryWarehouse dryWarehouse);
+
+    /**
+     * 删除
+     * @param id
+     */
+    void deleteDryWarehouse(String id);
+
+    /**
+     * 烘干入库记录
+     * @param dryWarehouse
+     * @return
+     */
+    Page<DryWarehouse> selectDryWarehousePage(DryWarehouse dryWarehouse);
+}

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

@@ -30,6 +30,7 @@ public interface IWarehouseBaseInfoService extends IService<WarehouseBaseInfo> {
 
     /**
      * 添加临时仓库
+     *
      * @param warehouseBaseInfo
      * @return
      */
@@ -42,10 +43,11 @@ public interface IWarehouseBaseInfoService extends IService<WarehouseBaseInfo> {
 
     /**
      * 查看库房下拉列表
+     *
      * @param compId
      * @return
      */
-    List<WarehouseBaseInfo> selectWarehouse(String compId,String warehouseType);
+    List<WarehouseBaseInfo> selectWarehouse(String compId, String warehouseType);
 
     /**
      * 查看库房
@@ -58,10 +60,11 @@ public interface IWarehouseBaseInfoService extends IService<WarehouseBaseInfo> {
      * @param compId
      * @return
      */
-    WarehouseBaseInfo selectWarehouseViewinfo(String compId,String warehouseName,String warehouseType);
+    WarehouseBaseInfo selectWarehouseViewinfo(String compId, String warehouseName, String warehouseType);
 
     /**
      * 今日储量明细
+     *
      * @param compId
      * @return
      */
@@ -69,10 +72,11 @@ public interface IWarehouseBaseInfoService extends IService<WarehouseBaseInfo> {
 
     /**
      * 全部仓库
+     *
      * @param compId
      * @return
      */
-    List<WarehouseView> allWarehouse(String compId,String warehouseName,String goodsName);
+    List<WarehouseView> allWarehouse(String compId, String warehouseName, String goodsName);
 
     /**
      * 更改显示状态
@@ -80,61 +84,73 @@ public interface IWarehouseBaseInfoService extends IService<WarehouseBaseInfo> {
     String editShow(String id);
 
     /**
-     *查询所有库房
+     * 查询所有库房
      */
-    List<WarehouseBaseInfo> selectAllWarehouse(String compId,String warehouseType,String warehouseName);
+    List<WarehouseBaseInfo> selectAllWarehouse(String compId, String warehouseType, String warehouseName);
 
     /**
      * 删除库房
      */
-     void deleteWarehouse(String id);
+    void deleteWarehouse(String id);
 
     /**
      * 清仓状态
+     *
      * @param id
      * @return
      */
-     String editCleared(String id);
+    String editCleared(String id);
+
     /**
      * 出入库合同编号下拉列表
      *
      * @param compId
-     * @param flag 0 采购合同编号 1销售合同编号 2 移库任务编号+采购、销售合同编号 null 采购、销售合同编号
+     * @param flag   0 采购合同编号 1销售合同编号 2 移库任务编号+采购、销售合同编号 null 采购、销售合同编号
      */
-    List<ContractManagementInfo> selectContractNoList(String compId,Integer flag);
+    List<ContractManagementInfo> selectContractNoList(String compId, Integer flag);
 
     /**
      * 查看自己负责的常用仓库
+     *
      * @param compId
      * @return
      */
-    List<WarehouseBaseInfo> selectWarehouseSelf(String compId,String personCharge);
+    List<WarehouseBaseInfo> selectWarehouseSelf(String compId, String personCharge);
+
     /**
      * 查看自己负责的常用仓库
+     *
      * @param compId
      * @return
      */
-    List<WarehouseBaseInfo> selectWarehouseSelfApp(String compId,String personCharge);
+    List<WarehouseBaseInfo> selectWarehouseSelfApp(String compId, String personCharge);
+
     /**
      * 获取打印数据
+     *
      * @param id
      * @return
      */
     WarehouseInOutInfo getPrintInfo(String id);
+
     /**
      * 查出库时的成本
      *
      * @param contractNo
      * @param carNo
      */
-    Float selectCost(String contractNo,String carNo);
+    Float selectCost(String contractNo, String carNo);
+
     /**
      * 查看自己负责的仓库
+     *
      * @param compId
      * @return
      */
-    List<WarehouseBaseInfo> selectResponsible(String compId,String personCharge);
+    List<WarehouseBaseInfo> selectResponsible(String compId, String personCharge);
+
     void export(WarehouseBaseInfo warehouseBaseInfo, HttpServletResponse response) throws Exception;
+
     void exportOut(WarehouseBaseInfo warehouseBaseInfo, HttpServletResponse response) throws Exception;
 
 
@@ -151,6 +167,7 @@ public interface IWarehouseBaseInfoService extends IService<WarehouseBaseInfo> {
      * @return
      */
     Page<WarehouseBaseInfo> selectBaseInfo(WarehouseBaseInfo warehouseBaseInfo);
+
     /**
      * 库点利润图表
      *

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

@@ -4,8 +4,11 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.google.common.collect.Lists;
+import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.winsea.svc.base.workflow.entity.Workflow;
 import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.base.entity.CommonBillOperateHis;
+import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.ClockInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.FuelFillingInfo;
@@ -38,6 +41,8 @@ public class ClockInfoServiceImpl extends ServiceImpl<ClockInfoMapper, ClockInfo
     private IClockInfoService clockInfoService;
     @Autowired
     private INewWorkflowService workflowService;
+    @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
 
     /**
      * 添加打卡信息
@@ -263,6 +268,18 @@ public class ClockInfoServiceImpl extends ServiceImpl<ClockInfoMapper, ClockInfo
                 clockInfoService.updateById(clockInfo);
                 workflowService.activateInstance(clockInfo.getWorkflowId(), clockInfo.getId());
             }
+
+            //  添加提交历史
+            CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+            commonBillOperateHis.setBillId(clockInfo.getId());
+            commonBillOperateHis.setId(IdGenerator.generateUUID());
+            commonBillOperateHis.setBillType("BUKA-APPROVE");
+            commonBillOperateHis.setOperateDate(new Date());
+            commonBillOperateHis.setOperateUser(clockInfo.getCreateUserId());
+            JSONObject jsonObject = (JSONObject) JSONObject.toJSON(clockInfo);
+            commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+            commonBillOperateHisService.create(commonBillOperateHis);
+
         }
         return "OK";
     }

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

@@ -13,6 +13,8 @@ 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.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.base.entity.CommonBillOperateHis;
+import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.*;
 import com.yh.saas.plugin.yiliangyiyun.exception.YException;
@@ -65,7 +67,8 @@ public class CollectionWarehousingRecordServiceImpl extends ServiceImpl<Collecti
     private IContractManagementInfoService contractManagementInfoService;
     @Autowired
     private IContractGoodsInfoService contractGoodsInfoService;
-
+    @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
     @Value("${file-root-path}")
     private String localPath;
 
@@ -215,6 +218,19 @@ public class CollectionWarehousingRecordServiceImpl extends ServiceImpl<Collecti
                     this.updateById(warehousingRecord);
                     workflowService.activateInstance(warehousingRecord.getWorkflowId(), warehousingRecord.getId());
                 }
+
+                //  添加提交历史
+                CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+                commonBillOperateHis.setBillId(warehousingRecord.getId());
+                commonBillOperateHis.setId(IdGenerator.generateUUID());
+                commonBillOperateHis.setBillType("COLLECTION-WAREHOUSING-RECORD");
+                commonBillOperateHis.setOperateDate(new Date());
+                commonBillOperateHis.setOperateUser(warehousingRecord.getCreateUserId());
+                JSONObject jsonObject = (JSONObject) JSONObject.toJSON(warehousingRecord);
+                commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+                commonBillOperateHisService.create(commonBillOperateHis);
+
+
             }
 
         }
@@ -279,6 +295,20 @@ public class CollectionWarehousingRecordServiceImpl extends ServiceImpl<Collecti
                 this.updateById(collectionWarehousingRecord);
                 workflowService.activateInstance(collectionWarehousingRecord.getWorkflowId(), collectionWarehousingRecord.getId());
             }
+
+
+            //  添加提交历史
+            CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+            commonBillOperateHis.setBillId(collectionWarehousingRecord.getId());
+            commonBillOperateHis.setId(IdGenerator.generateUUID());
+            commonBillOperateHis.setBillType("COLLECTION-WAREHOUSING-RECORD");
+            commonBillOperateHis.setOperateDate(new Date());
+            commonBillOperateHis.setOperateUser(collectionWarehousingRecord.getCreateUserId());
+            JSONObject jsonObject = (JSONObject) JSONObject.toJSON(collectionWarehousingRecord);
+            commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+            commonBillOperateHisService.create(commonBillOperateHis);
+
+
         }
         if (one) {
             return "OK";

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

@@ -864,8 +864,10 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
         Map<String, Object> pageView = new HashMap<>();
         pageView.put("startRecord", (noticeTask.getCurrentPage() - 1)
                 * noticeTask.getPageSize());
-        //  公司ID
-        pageView.put("userId", AuthSecurityUtils.getCurrentUserId());
+        if (noticeTask.getCreateUserId() == null || noticeTask.getCreateUserId().isEmpty()) {
+            noticeTask.setCreateUserId(AuthSecurityUtils.getCurrentUserId());
+        }
+        pageView.put("name", AuthSecurityUtils.getStaffById(noticeTask.getCreateUserId()).getStaffName()+"提交");
         pageView.put("roleId", AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getMajorRoleId());
         pageView.put("pageSize", noticeTask.getPageSize());
         pageView.put("currentPage", noticeTask.getCurrentPage());

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

@@ -7,6 +7,7 @@ import com.google.common.collect.Lists;
 import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.winsea.svc.base.workflow.entity.Workflow;
 import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.base.entity.CommonBillOperateHis;
 import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
@@ -21,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -44,7 +46,8 @@ public class ContractCostInfoServiceImpl extends ServiceImpl<ContractCostInfoMap
     private IReveExpeInfoService reveExpeInfoService;
     @Autowired
     private ICommonBillOperateHisService billOperateHisService;
-
+    @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
 
     /**
      * 添加
@@ -113,6 +116,20 @@ public class ContractCostInfoServiceImpl extends ServiceImpl<ContractCostInfoMap
                 this.updateById(contractCostInfo);
                 workflowService.activateInstance(contractCostInfo.getWorkflowId(), contractCostInfo.getId());
             }
+
+
+            //  添加提交历史
+            CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+            commonBillOperateHis.setBillId(contractCostInfo.getId());
+            commonBillOperateHis.setId(IdGenerator.generateUUID());
+            commonBillOperateHis.setBillType("NON-CONTRACT-APPROVE");
+            commonBillOperateHis.setOperateDate(new Date());
+            commonBillOperateHis.setOperateUser(contractCostInfo.getCreateUserId());
+            JSONObject jsonObject = (JSONObject) JSONObject.toJSON(contractCostInfo);
+            commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+            commonBillOperateHisService.create(commonBillOperateHis);
+
+
         }
         return "ok";
     }

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

@@ -11,6 +11,7 @@ import com.winsea.svc.base.workflow.entity.Workflow;
 import com.winsea.svc.notice.entity.base.BaseNotice;
 import com.winsea.svc.notice.service.INoticeService;
 import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.base.entity.CommonBillOperateHis;
 import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
@@ -86,6 +87,8 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
     @Autowired
     private INewWorkflowService workflowService;
     @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
+    @Autowired
     private INoticeService noticeService;
     @Autowired
     private IPriceConfirmationSheetService priceConfirmationSheetService;
@@ -279,6 +282,19 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                     this.updateById(contractManagementInfo);
                     workflowService.activateInstance(contractManagementInfo.getWorkflowId(), contractManagementInfo.getId());
                 }
+
+
+                //  添加提交历史
+                CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+                commonBillOperateHis.setBillId(contractManagementInfo.getId());
+                commonBillOperateHis.setId(IdGenerator.generateUUID());
+                commonBillOperateHis.setBillType("SALE-CONTRACT-APPROVE");
+                commonBillOperateHis.setOperateDate(new Date());
+                commonBillOperateHis.setOperateUser(contractManagementInfo.getCreateUserId());
+                JSONObject jsonObject = (JSONObject) JSONObject.toJSON(contractManagementInfo);
+                commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+                commonBillOperateHisService.create(commonBillOperateHis);
+
             }
             //代储合同
             else if ("1".equals(contractManagementInfo.getContractType())&&"代储合同".equals(contractManagementInfo.getAgreementType())) {
@@ -286,7 +302,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                 // 不是退回的单子
                 if (isStartWorkflow) {
                     Workflow workflow = workflowService
-                            .findLatestWorkflowByBusinessCodeByApp(contractManagementInfo.getCompId(), "DAICHU-CONTRACT-APPROVE ");
+                            .findLatestWorkflowByBusinessCodeByApp(contractManagementInfo.getCompId(), "DAICHU-CONTRACT-APPROVE");
                     // 没配置审核流程，直接结束并处理信息
                     if (workflow == null) {
                         throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
@@ -306,6 +322,17 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                     this.updateById(contractManagementInfo);
                     workflowService.activateInstance(contractManagementInfo.getWorkflowId(), contractManagementInfo.getId());
                 }
+                //  添加提交历史
+                CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+                commonBillOperateHis.setBillId(contractManagementInfo.getId());
+                commonBillOperateHis.setId(IdGenerator.generateUUID());
+                commonBillOperateHis.setBillType("DAICHU-CONTRACT-APPROVE");
+                commonBillOperateHis.setOperateDate(new Date());
+                commonBillOperateHis.setOperateUser(contractManagementInfo.getCreateUserId());
+                JSONObject jsonObject = (JSONObject) JSONObject.toJSON(contractManagementInfo);
+                commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+                commonBillOperateHisService.create(commonBillOperateHis);
+
             }
             //采购合同
             else if("2".equals(contractManagementInfo.getContractType())){
@@ -333,6 +360,17 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                     this.updateById(contractManagementInfo);
                     workflowService.activateInstance(contractManagementInfo.getWorkflowId(), contractManagementInfo.getId());
                 }
+                //  添加提交历史
+                CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+                commonBillOperateHis.setBillId(contractManagementInfo.getId());
+                commonBillOperateHis.setId(IdGenerator.generateUUID());
+                commonBillOperateHis.setBillType("BUY-CONTRACT-APPROVE");
+                commonBillOperateHis.setOperateDate(new Date());
+                commonBillOperateHis.setOperateUser(contractManagementInfo.getCreateUserId());
+                JSONObject jsonObject = (JSONObject) JSONObject.toJSON(contractManagementInfo);
+                commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+                commonBillOperateHisService.create(commonBillOperateHis);
+
 
             }
             //收购合同
@@ -362,6 +400,17 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                     workflowService.activateInstance(contractManagementInfo.getWorkflowId(), contractManagementInfo.getId());
                 }
 
+                //  添加提交历史
+                CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+                commonBillOperateHis.setBillId(contractManagementInfo.getId());
+                commonBillOperateHis.setId(IdGenerator.generateUUID());
+                commonBillOperateHis.setBillType("SHOU-CONTRACT-APPROVE");
+                commonBillOperateHis.setOperateDate(new Date());
+                commonBillOperateHis.setOperateUser(contractManagementInfo.getCreateUserId());
+                JSONObject jsonObject = (JSONObject) JSONObject.toJSON(contractManagementInfo);
+                commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+                commonBillOperateHisService.create(commonBillOperateHis);
+
             }
             //代收合同
             else {
@@ -390,6 +439,17 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                     workflowService.activateInstance(contractManagementInfo.getWorkflowId(), contractManagementInfo.getId());
                 }
 
+                //  添加提交历史
+                CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+                commonBillOperateHis.setBillId(contractManagementInfo.getId());
+                commonBillOperateHis.setId(IdGenerator.generateUUID());
+                commonBillOperateHis.setBillType("DAISHOU-CONTRACT-APPROVE");
+                commonBillOperateHis.setOperateDate(new Date());
+                commonBillOperateHis.setOperateUser(contractManagementInfo.getCreateUserId());
+                JSONObject jsonObject = (JSONObject) JSONObject.toJSON(contractManagementInfo);
+                commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+                commonBillOperateHisService.create(commonBillOperateHis);
+
             }
         }
 
@@ -474,6 +534,17 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                         this.updateById(contractManagementInfo1);
                         workflowService.activateInstance(contractManagementInfo1.getWorkflowId(), contractManagementInfo1.getId());
                     }
+
+                    //  添加提交历史
+                    CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+                    commonBillOperateHis.setBillId(contractManagementInfo1.getId());
+                    commonBillOperateHis.setId(IdGenerator.generateUUID());
+                    commonBillOperateHis.setBillType("SALE-CONTRACT-APPROVE");
+                    commonBillOperateHis.setOperateDate(new Date());
+                    commonBillOperateHis.setOperateUser(contractManagementInfo1.getCreateUserId());
+                    JSONObject jsonObject = (JSONObject) JSONObject.toJSON(contractManagementInfo1);
+                    commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+                    commonBillOperateHisService.create(commonBillOperateHis);
                 }
                 //代储合同
                 else if ("1".equals(contractManagementInfo1.getContractType())&&"代储合同".equals(contractManagementInfo1.getAgreementType())) {
@@ -481,7 +552,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                     // 不是退回的单子
                     if (isStartWorkflow) {
                         Workflow workflow = workflowService
-                                .findLatestWorkflowByBusinessCodeByApp(contractManagementInfo1.getCompId(), "DAICHU-CONTRACT-APPROVE ");
+                                .findLatestWorkflowByBusinessCodeByApp(contractManagementInfo1.getCompId(), "DAICHU-CONTRACT-APPROVE");
                         // 没配置审核流程，直接结束并处理信息
                         if (workflow == null) {
                             throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
@@ -501,6 +572,18 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                         this.updateById(contractManagementInfo1);
                         workflowService.activateInstance(contractManagementInfo1.getWorkflowId(), contractManagementInfo1.getId());
                     }
+
+
+                    //  添加提交历史
+                    CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+                    commonBillOperateHis.setBillId(contractManagementInfo1.getId());
+                    commonBillOperateHis.setId(IdGenerator.generateUUID());
+                    commonBillOperateHis.setBillType("DAICHU-CONTRACT-APPROVE");
+                    commonBillOperateHis.setOperateDate(new Date());
+                    commonBillOperateHis.setOperateUser(contractManagementInfo1.getCreateUserId());
+                    JSONObject jsonObject = (JSONObject) JSONObject.toJSON(contractManagementInfo1);
+                    commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+                    commonBillOperateHisService.create(commonBillOperateHis);
                 }
                 //采购合同
                 else if("2".equals(contractManagementInfo1.getContractType())){
@@ -529,6 +612,17 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                         workflowService.activateInstance(contractManagementInfo1.getWorkflowId(), contractManagementInfo1.getId());
                     }
 
+                    //  添加提交历史
+                    CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+                    commonBillOperateHis.setBillId(contractManagementInfo1.getId());
+                    commonBillOperateHis.setId(IdGenerator.generateUUID());
+                    commonBillOperateHis.setBillType("BUY-CONTRACT-APPROVE");
+                    commonBillOperateHis.setOperateDate(new Date());
+                    commonBillOperateHis.setOperateUser(contractManagementInfo1.getCreateUserId());
+                    JSONObject jsonObject = (JSONObject) JSONObject.toJSON(contractManagementInfo1);
+                    commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+                    commonBillOperateHisService.create(commonBillOperateHis);
+
                 }
                 //收购合同
                 else if("3".equals(contractManagementInfo1.getContractType())&&"收购合同".equals(contractManagementInfo1.getAgreementType())){
@@ -557,6 +651,17 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                         workflowService.activateInstance(contractManagementInfo1.getWorkflowId(), contractManagementInfo1.getId());
                     }
 
+                    //  添加提交历史
+                    CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+                    commonBillOperateHis.setBillId(contractManagementInfo1.getId());
+                    commonBillOperateHis.setId(IdGenerator.generateUUID());
+                    commonBillOperateHis.setBillType("SHOU-CONTRACT-APPROVE");
+                    commonBillOperateHis.setOperateDate(new Date());
+                    commonBillOperateHis.setOperateUser(contractManagementInfo1.getCreateUserId());
+                    JSONObject jsonObject = (JSONObject) JSONObject.toJSON(contractManagementInfo1);
+                    commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+                    commonBillOperateHisService.create(commonBillOperateHis);
+
                 }
                 //代收合同
                 else {
@@ -585,6 +690,17 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                         workflowService.activateInstance(contractManagementInfo1.getWorkflowId(), contractManagementInfo1.getId());
                     }
                     this.updateById(contractManagementInfo1);
+
+                    //  添加提交历史
+                    CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+                    commonBillOperateHis.setBillId(contractManagementInfo1.getId());
+                    commonBillOperateHis.setId(IdGenerator.generateUUID());
+                    commonBillOperateHis.setBillType("DAISHOU-CONTRACT-APPROVE");
+                    commonBillOperateHis.setOperateDate(new Date());
+                    commonBillOperateHis.setOperateUser(contractManagementInfo1.getCreateUserId());
+                    JSONObject jsonObject = (JSONObject) JSONObject.toJSON(contractManagementInfo1);
+                    commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+                    commonBillOperateHisService.create(commonBillOperateHis);
                 }
             }
             contractGoodsInfoService.updateById(contractManagementInfo.getContractGoodsInfo());

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

@@ -0,0 +1,67 @@
+package com.yh.saas.plugin.yiliangyiyun.service.impl;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
+import com.yh.saas.plugin.yiliangyiyun.entity.DriverCarInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.DryWarehouseCar;
+import com.yh.saas.plugin.yiliangyiyun.mapper.DryWarehouseCarMapper;
+import com.yh.saas.plugin.yiliangyiyun.service.IDryWarehouseCarService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 记录烘干入库常用车辆信息 服务实现类
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-11-17
+ */
+@Service
+public class DryWarehouseCarServiceImpl extends ServiceImpl<DryWarehouseCarMapper, DryWarehouseCar> implements IDryWarehouseCarService {
+
+    /**
+     * 添加车辆信息
+     *
+     * @param dryWarehouseCar
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String addDryWarehouseCar(DryWarehouseCar dryWarehouseCar) {
+        //新增主键id
+        dryWarehouseCar.setId(IdGenerator.generateUUID());
+        this.insert(dryWarehouseCar);
+        return "ok";
+    }
+
+    /**
+     * 删除车辆信息
+     *
+     * @param id
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteDryWarehouseCar(String id) {
+        DryWarehouseCar dryWarehouseCar = this.selectById(id);
+        if (dryWarehouseCar != null) {
+            this.deleteById(dryWarehouseCar.getId());
+        }
+    }
+
+    /**
+     * 车牌号下拉列表
+     *
+     * @param baseId
+     * @return
+     */
+    @Override
+    public List<DryWarehouseCar> selectCarNumber(String baseId) {
+        List<DryWarehouseCar> dryWarehouseCarList = this.selectList(new EntityWrapper<DryWarehouseCar>()
+                .eq(DryWarehouseCar.QueryFiles.BASE_ID, baseId).eq(DryWarehouseCar.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
+        return dryWarehouseCarList;
+    }
+}

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

@@ -0,0 +1,160 @@
+package com.yh.saas.plugin.yiliangyiyun.service.impl;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.google.common.collect.Lists;
+import com.winsea.svc.base.security.util.AuthSecurityUtils;
+import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
+import com.yh.saas.plugin.yiliangyiyun.entity.*;
+import com.yh.saas.plugin.yiliangyiyun.mapper.DryWarehouseMapper;
+import com.yh.saas.plugin.yiliangyiyun.service.IDryWarehouseService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 记录烘干入库信息 服务实现类
+ * </p>
+ *
+ * @author Gdc
+ * @since 2022-11-17
+ */
+@Service
+public class DryWarehouseServiceImpl extends ServiceImpl<DryWarehouseMapper, DryWarehouse> implements IDryWarehouseService {
+
+
+    /**
+     * 查询业务编号
+     * @param
+     * @return
+     */
+    @Override
+    public List<DryWarehouse> selectDryWarehouseList(DryWarehouse dryWarehouse) {
+        SimpleDateFormat f = new SimpleDateFormat("yyyyMMdd");//设置日期格式
+        String date = f.format(new Date(System.currentTimeMillis()));
+        Map<String, Object> pageView = new HashMap<>(7);
+        pageView.put("date", date);
+        pageView.put("warehouseNo", dryWarehouse.getWarehouseNo());
+        pageView.put("numberLetter", "HGRK");
+        pageView.put("compId", dryWarehouse.getCompId());
+        List<DryWarehouse> dataList = baseMapper.getListByConditions(pageView);
+        return dataList;
+    }
+
+    /**
+     * 称毛重
+     *
+     * @param dryWarehouse
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String addDryWarehouse(DryWarehouse dryWarehouse) {
+        //新增主键id
+        dryWarehouse.setId(IdGenerator.generateUUID());
+        if(dryWarehouse.getCompId() == null || dryWarehouse.getCompId().isEmpty()){
+            dryWarehouse.setCompId(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getCompId());
+        }
+        //获取当前年月日
+        SimpleDateFormat f = new SimpleDateFormat("yyyyMMdd");//设置日期格式
+        String date = f.format(new Date(System.currentTimeMillis()));
+        //查询烘干入库信息数量包括已删除的集合
+        List<DryWarehouse> dryWarehouseList = this.selectDryWarehouseList(dryWarehouse);//调用Service中的方法
+        //生成业务编号
+        if (dryWarehouseList.size() > 0) {
+            //取第一条数据的编号
+            String n = dryWarehouseList.get(0).getDryNumber();
+            int intNumber = 0;
+            //截取编号后3位
+            intNumber = Integer.parseInt(n.substring(15));
+            intNumber++;
+            String Number = String.valueOf(intNumber);
+            for (int i = 0; i < 3; i++) {
+                Number = Number.length() < 3 ? "0" + Number : Number;
+            }
+            //编号自增
+            Number = "HGRK" + date + dryWarehouse.getWarehouseNo() + Number;
+            dryWarehouse.setDryNumber(Number);
+        } else {
+            //如果当天数据为空，生成第一条数据
+            String Number = "HGRK" + date + dryWarehouse.getWarehouseNo() + "001";
+            dryWarehouse.setDryNumber(Number);
+        }
+        if(dryWarehouse.getTare()!= null){
+            //皮重不为空
+            dryWarehouse.setStatus(StatusEnum.ALREADY_IN_WAREHOUSE.getName());
+            dryWarehouse.setStatusFlag(StatusEnum.ALREADY_IN_WAREHOUSE.getFlag());
+        }else {
+            //皮重为空
+            dryWarehouse.setStatus(StatusEnum.WEIGHED_TARE.getName());
+            dryWarehouse.setStatusFlag(StatusEnum.WEIGHED_TARE.getFlag());
+        }
+        dryWarehouse.setInWarehouseDate(new Date());
+        this.insert(dryWarehouse);
+        return "ok";
+    }
+
+    /**
+     * 称皮重
+     *
+     * @param dryWarehouse
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String editDryWarehouse(DryWarehouse dryWarehouse) {
+        dryWarehouse.setStatus(StatusEnum.ALREADY_IN_WAREHOUSE.getName());
+        dryWarehouse.setStatusFlag(StatusEnum.ALREADY_IN_WAREHOUSE.getFlag());
+        this.updateById(dryWarehouse);
+        return "ok";
+    }
+
+    /**
+     * 删除
+     *
+     * @param id
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteDryWarehouse(String id) {
+        DryWarehouse dryWarehouse = this.selectById(id);
+        if (dryWarehouse != null) {
+            this.deleteById(dryWarehouse.getId());
+        }
+    }
+
+    /**
+     * 烘干入库记录列表
+     *
+     * @param dryWarehouse
+     * @return
+     */
+    @Override
+    public Page<DryWarehouse> selectDryWarehousePage(DryWarehouse dryWarehouse) {
+        Map<String, Object> pageView = new HashMap<>();
+        pageView.put("startRecord", (dryWarehouse.getCurrentPage() - 1)
+                * dryWarehouse.getPageSize());
+        //公司id
+        pageView.put("baseId", dryWarehouse.getBaseId());
+        pageView.put("startDate", dryWarehouse.getStartDate());
+        pageView.put("endDate", dryWarehouse.getEndDate());
+        pageView.put("searchType", dryWarehouse.getSearchType());
+        pageView.put("searchKeyWord", dryWarehouse.getSearchKeyWord());
+        pageView.put("pageSize", dryWarehouse.getPageSize());
+        pageView.put("currentPage", dryWarehouse.getCurrentPage());
+        // 查询记录总数
+        Integer dataCount = baseMapper.getCountByCondition(pageView);
+        List<DryWarehouse> dataList = baseMapper.getListByCondition(pageView);
+        Page<DryWarehouse> page = new Page<>();
+        page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
+        page.setTotal(dataCount == null ? 0 : dataCount);
+        page.setCurrent(dryWarehouse.getCurrentPage());
+        page.setSize(dryWarehouse.getPageSize());
+        return page;
+    }
+}

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

@@ -22,6 +22,7 @@ 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.entity.CommonBillOperateHis;
 import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
@@ -70,6 +71,8 @@ import java.util.stream.Collectors;
 public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, ExpenseInfo> implements IExpenseInfoService {
     @Autowired
     private INewWorkflowService workflowService;
+    @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
     @SofaReference
     private ICommonRoleResourceService roleResourceService;
     @Autowired
@@ -437,6 +440,18 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
                 this.updateById(expenseInfo);
                 workflowService.activateInstance(expenseInfo.getWorkflowId(), expenseInfo.getId());
             }
+
+            //  添加提交历史
+            CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+            commonBillOperateHis.setBillId(expenseInfo.getId());
+            commonBillOperateHis.setId(IdGenerator.generateUUID());
+            commonBillOperateHis.setBillType("FEIYONGGUANLI-APPROVE");
+            commonBillOperateHis.setOperateDate(new Date());
+            commonBillOperateHis.setOperateUser(expenseInfo.getCreateUserId());
+            JSONObject jsonObject = (JSONObject) JSONObject.toJSON(expenseInfo);
+            commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+            commonBillOperateHisService.create(commonBillOperateHis);
+
         }
         if (flag == 1) {
             return "合同请款金额超出总粮款！";
@@ -614,8 +629,16 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
         }
         //主表编辑 flag==4
         else if ("4".equals(expenseInfo.getFlag())) {
-            expenseInfo.setStatusFlag(StatusEnum.COST_RECEIVED.getFlag());
-            expenseInfo.setStatus(StatusEnum.COST_RECEIVED.getName());
+            //收入
+            if ("1".equals(expenseInfo1.getExpensesType())) {
+                expenseInfo.setStatusFlag(StatusEnum.TO_BE_CONFIRMED.getFlag());
+                expenseInfo.setStatus(StatusEnum.TO_BE_CONFIRMED.getName());
+            }
+            //支出
+            else {
+                expenseInfo.setStatusFlag(StatusEnum.COST_PAYMENT.getFlag());
+                expenseInfo.setStatus(StatusEnum.COST_PAYMENT.getName());
+            }
             //合同粮款校验
             if ("1".equals(expenseInfo1.getCostType()) && "1".equals(expenseInfo1.getExpensesPurpose())) {
                 ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
@@ -663,9 +686,39 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
             }
             // 退回的单子 再启用
             else {
-                this.updateById(expenseInfo);
-                workflowService.activateInstance(expenseInfo.getWorkflowId(), expenseInfo.getId());
+                if("发起人撤回".equals(expenseInfo.getApproveStatus())){
+                    Workflow workflow = workflowService
+                            .findLatestWorkflowByBusinessCodeByApp(expenseInfo.getCompId(), "FEIYONGGUANLI-APPROVE");
+                    // 没配置审核流程，直接结束并处理信息
+                    if (workflow == null) {
+                        throw new YException(YExceptionEnum.PURCHASE_ORDER_ERROR);
+                    }
+                    // 开启审核流
+                    else {
+                        // 设置状态 已提交审核
+                        expenseInfo.setWorkflowId(workflow.getId());
+                        this.updateById(expenseInfo);
+                        workflowService.startInstance(workflow.getId(), expenseInfo.getId());
+                    }
+                }
+                else{
+
+                    this.updateById(expenseInfo);
+                    workflowService.activateInstance(expenseInfo.getWorkflowId(), expenseInfo.getId());
+                }
             }
+
+            //  添加提交历史
+            CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+            commonBillOperateHis.setBillId(expenseInfo.getId());
+            commonBillOperateHis.setId(IdGenerator.generateUUID());
+            commonBillOperateHis.setBillType("FEIYONGGUANLI-APPROVE");
+            commonBillOperateHis.setOperateDate(new Date());
+            commonBillOperateHis.setOperateUser(expenseInfo.getCreateUserId());
+            JSONObject jsonObject = (JSONObject) JSONObject.toJSON(expenseInfo);
+            commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+            commonBillOperateHisService.create(commonBillOperateHis);
+
         }
         //驳回分配
         else if ("5".equals(expenseInfo.getFlag())) {
@@ -724,6 +777,17 @@ public class ExpenseInfoServiceImpl extends ServiceImpl<ExpenseInfoMapper, Expen
                 this.updateById(expenseInfo);
                 workflowService.activateInstance(expenseInfo.getWorkflowId(), expenseInfo.getId());
             }
+
+            //  添加提交历史
+            CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+            commonBillOperateHis.setBillId(expenseInfo.getId());
+            commonBillOperateHis.setId(IdGenerator.generateUUID());
+            commonBillOperateHis.setBillType("FEIYONGGUANLI-APPROVE");
+            commonBillOperateHis.setOperateDate(new Date());
+            commonBillOperateHis.setOperateUser(expenseInfo.getCreateUserId());
+            JSONObject jsonObject = (JSONObject) JSONObject.toJSON(expenseInfo);
+            commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+            commonBillOperateHisService.create(commonBillOperateHis);
         }
         // 主表信息编辑
         this.updateById(expenseInfo);

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

@@ -1,9 +1,12 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.alipay.sofa.rpc.common.utils.StringUtils;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.winsea.svc.base.workflow.entity.Workflow;
 import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.base.entity.CommonBillOperateHis;
+import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.FillingDetailInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.FuelFillingInfo;
@@ -20,6 +23,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -37,6 +41,8 @@ public class FillingDetailInfoServiceImpl extends ServiceImpl<FillingDetailInfoM
     private IFuelFillingInfoService fuelFillingInfoService;
     @Autowired
     private INewWorkflowService workflowService;
+    @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
     /**
      * 添加明细
      * @param fillingDetailInfo
@@ -89,6 +95,17 @@ public class FillingDetailInfoServiceImpl extends ServiceImpl<FillingDetailInfoM
                 fuelFillingInfoService.updateById(fuelFillingInfo);
                 workflowService.activateInstance(fuelFillingInfo.getWorkflowId(), fuelFillingInfo.getId());
             }
+
+            //  添加提交历史
+            CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+            commonBillOperateHis.setBillId(fuelFillingInfo.getId());
+            commonBillOperateHis.setId(IdGenerator.generateUUID());
+            commonBillOperateHis.setBillType("JIAYOU-SHENHE-APPROVE");
+            commonBillOperateHis.setOperateDate(new Date());
+            commonBillOperateHis.setOperateUser(fuelFillingInfo.getCreateUserId());
+            JSONObject jsonObject = (JSONObject) JSONObject.toJSON(fuelFillingInfo);
+            commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+            commonBillOperateHisService.create(commonBillOperateHis);
         }
         return "OK";
     }

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

@@ -2,6 +2,7 @@ package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
 import com.baomidou.mybatisplus.plugins.Page;
 import com.google.common.collect.Lists;
+import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.plugin.yiliangyiyun.entity.GeneralAuditInfo;
 import com.yh.saas.plugin.yiliangyiyun.mapper.GeneralAuditInfoMapper;
@@ -11,10 +12,8 @@ import com.yh.saas.plugin.yiliangyiyun.service.INewWorkflowService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.util.*;
 
 /**
  * <p>
@@ -87,6 +86,39 @@ public class GeneralAuditInfoServiceImpl extends ServiceImpl<GeneralAuditInfoMap
     public String insertGeneralAuditInfo(GeneralAuditInfo generalAuditInfo) {
         //新增主键id
         generalAuditInfo.setId(IdGenerator.generateUUID());
+        //当天零点
+        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);
+        Map<String, Object> pageView = new HashMap<>();
+        pageView.put("compId", AuthSecurityUtils.getCurrentUserInfo().getCompId());
+        pageView.put("year", year);
+        //查询当天提交的数据包括已删除的
+        Integer dataCount = baseMapper.getNumByCondition(pageView);
+        SimpleDateFormat df = new SimpleDateFormat("yyyyMMddHHmmss");
+        Integer num=dataCount+1;
+        String newNo="";
+        //一位数
+        if (num < 10) {
+            newNo="000" + num;
+        }
+        //两位数
+        else if (num < 100) {
+            newNo="00" + num;
+        }
+        //三位数
+        else if (num < 1000) {
+            newNo="0" + num;
+        }
+        //四位数
+        else if (num < 10000) {
+            newNo=String.valueOf(num);
+        }
+        String no = "TYSH"+df.format(new Date())+newNo;
+        generalAuditInfo.setAuditBusinessNo(no);
         // 操作主表数据
         this.insert(generalAuditInfo);
         return generalAuditInfo.getId();

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

@@ -19,6 +19,7 @@ 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.common.support.util.StringUtils;
+import com.yh.saas.plugin.base.entity.CommonBillOperateHis;
 import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
@@ -57,6 +58,8 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
     @Autowired
     private IInOutWarehouseTaskService inOutWarehouseTaskService;
     @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
+    @Autowired
     private ICommonBillOperateHisService billOperateHisService;
     @Autowired
     private INewWorkflowService workflowService;
@@ -193,6 +196,17 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
                 this.updateById(inOutWarehouseTask);
                 workflowService.activateInstance(inOutWarehouseTask.getWorkflowId(), inOutWarehouseTask.getId());
             }
+            //  添加提交历史
+            CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+            commonBillOperateHis.setBillId(inOutWarehouseTask.getId());
+            commonBillOperateHis.setId(IdGenerator.generateUUID());
+            commonBillOperateHis.setBillType("INOUTTASK-TASK-APPROVE");
+            commonBillOperateHis.setOperateDate(new Date());
+            commonBillOperateHis.setOperateUser(inOutWarehouseTask.getCreateUserId());
+            JSONObject jsonObject = (JSONObject) JSONObject.toJSON(inOutWarehouseTask);
+            commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+            commonBillOperateHisService.create(commonBillOperateHis);
+
         }
         //  有id是修改
         else {
@@ -254,6 +268,18 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
                 this.updateById(inOutWarehouseTask);
                 workflowService.activateInstance(inOutWarehouseTask.getWorkflowId(), inOutWarehouseTask.getId());
             }
+
+            //  添加提交历史
+            CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+            commonBillOperateHis.setBillId(inOutWarehouseTask.getId());
+            commonBillOperateHis.setId(IdGenerator.generateUUID());
+            commonBillOperateHis.setBillType("INOUTTASK-TASK-APPROVE");
+            commonBillOperateHis.setOperateDate(new Date());
+            commonBillOperateHis.setOperateUser(inOutWarehouseTask.getCreateUserId());
+            JSONObject jsonObject = (JSONObject) JSONObject.toJSON(inOutWarehouseTask);
+            commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+            commonBillOperateHisService.create(commonBillOperateHis);
+
             List<String> roleIdList = new ArrayList<>();
             roleIdList = roleResourceService.getBindRoleIdsByResourceIds(AuthSecurityUtils.getCurrentUserInfo().getCompId(),
                     Lists.newArrayList("warehouseInfoTask-Audit"));

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

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.plugins.Page;
 import com.google.common.collect.Lists;
 import com.winsea.svc.base.workflow.entity.Workflow;
 import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.base.entity.CommonBillOperateHis;
+import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.entity.ClockInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.LeaveInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.QualityInspectionManagement;
@@ -42,7 +44,8 @@ public class LeaveInfoServiceImpl extends ServiceImpl<LeaveInfoMapper, LeaveInfo
     private INewWorkflowService workflowService;
     @Autowired
     private ILeaveInfoService leaveInfoService;
-
+    @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
     /**
      * 添加请假信息
      *
@@ -115,6 +118,18 @@ public class LeaveInfoServiceImpl extends ServiceImpl<LeaveInfoMapper, LeaveInfo
             leaveInfoService.updateById(leaveInfo);
             workflowService.activateInstance(leaveInfo.getWorkflowId(), leaveInfo.getId());
         }
+        //  添加提交历史
+        CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+        commonBillOperateHis.setBillId(leaveInfo.getId());
+        commonBillOperateHis.setId(IdGenerator.generateUUID());
+        commonBillOperateHis.setBillType("QINGJIA-APPROVE");
+        commonBillOperateHis.setOperateDate(new Date());
+        commonBillOperateHis.setOperateUser(leaveInfo.getCreateUserId());
+        JSONObject jsonObject = (JSONObject) JSONObject.toJSON(leaveInfo);
+        commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+        commonBillOperateHisService.create(commonBillOperateHis);
+
+
         //设置日期格式
         SimpleDateFormat start = new SimpleDateFormat("yyyyMMdd");
         Calendar s = Calendar.getInstance();

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

@@ -6,6 +6,7 @@ import com.google.common.collect.Lists;
 import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.winsea.svc.base.workflow.entity.Workflow;
 import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.base.entity.CommonBillOperateHis;
 import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
@@ -23,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -43,7 +45,8 @@ public class NonContractExpensesServiceImpl extends ServiceImpl<NonContractExpen
     private IReveExpeInfoService reveExpeInfoService;
     @Autowired
     private ICommonBillOperateHisService billOperateHisService;
-
+    @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
 
     @Override
     public String addInfo(NonContractExpenses nonContractExpenses) {
@@ -113,6 +116,18 @@ public class NonContractExpensesServiceImpl extends ServiceImpl<NonContractExpen
                 this.updateById(nonContractExpenses);
                 workflowService.activateInstance(nonContractExpenses.getWorkflowId(), nonContractExpenses.getId());
             }
+
+            //  添加提交历史
+            CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+            commonBillOperateHis.setBillId(nonContractExpenses.getId());
+            commonBillOperateHis.setId(IdGenerator.generateUUID());
+            commonBillOperateHis.setBillType("EX-CONTRACT-APPROVE");
+            commonBillOperateHis.setOperateDate(new Date());
+            commonBillOperateHis.setOperateUser(nonContractExpenses.getCreateUserId());
+            JSONObject jsonObject = (JSONObject) JSONObject.toJSON(nonContractExpenses);
+            commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+            commonBillOperateHisService.create(commonBillOperateHis);
+
         }
         return "ok";
     }

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

@@ -21,6 +21,8 @@ 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.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.base.entity.CommonBillOperateHis;
+import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.*;
 import com.yh.saas.plugin.yiliangyiyun.entity.view.ExportVView;
@@ -73,7 +75,8 @@ import java.util.stream.Collectors;
 @SofaService
 @Slf4j
 public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementMapper, PaymentManagement> implements IPaymentManagementService {
-
+    @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
     @Autowired
     private INewWorkflowService workflowService;
     @SofaReference
@@ -906,6 +909,18 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
             this.updateById(paymentManagement);
             workflowService.activateInstance(paymentManagement.getWorkflowId(), paymentManagement.getId());
         }
+
+
+        //  添加提交历史
+        CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+        commonBillOperateHis.setBillId(paymentManagement.getId());
+        commonBillOperateHis.setId(IdGenerator.generateUUID());
+        commonBillOperateHis.setBillType("PAYMENT-MANAGEMENT-APPROVE");
+        commonBillOperateHis.setOperateDate(new Date());
+        commonBillOperateHis.setOperateUser(paymentManagement.getCreateUserId());
+        JSONObject jsonObject = (JSONObject) JSONObject.toJSON(paymentManagement);
+        commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+        commonBillOperateHisService.create(commonBillOperateHis);
         return "OK";
     }
 

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

@@ -10,6 +10,9 @@ import com.winsea.svc.base.base.service.ICommonRoleResourceService;
 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.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.base.entity.CommonBillOperateHis;
+import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.PurchaseClosingReport;
@@ -27,10 +30,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -46,7 +46,8 @@ public class PurchaseClosingReportServiceImpl extends ServiceImpl<PurchaseClosin
 
     @Autowired
     private INewWorkflowService workflowService;
-
+    @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
     @SofaReference
     private ICommonRoleResourceService roleResourceService;
     @Autowired
@@ -237,6 +238,16 @@ public class PurchaseClosingReportServiceImpl extends ServiceImpl<PurchaseClosin
                 this.updateById(purchaseClosingReport);
                 workflowService.activateInstance(purchaseClosingReport.getWorkflowId(), purchaseClosingReport.getId());
             }
+            //  添加提交历史
+            CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+            commonBillOperateHis.setBillId(purchaseClosingReport.getId());
+            commonBillOperateHis.setId(IdGenerator.generateUUID());
+            commonBillOperateHis.setBillType("PROCUREMENT-CLOSE-REPORT");
+            commonBillOperateHis.setOperateDate(new Date());
+            commonBillOperateHis.setOperateUser(purchaseClosingReport.getCreateUserId());
+            JSONObject jsonObject = (JSONObject) JSONObject.toJSON(purchaseClosingReport);
+            commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+            commonBillOperateHisService.create(commonBillOperateHis);
         }
         if (one) {
             return "OK";

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.winsea.svc.base.workflow.entity.Workflow;
 import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.base.entity.CommonBillOperateHis;
 import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
@@ -58,6 +59,8 @@ public class PurchaseOrderServiceImpl extends ServiceImpl<PurchaseOrderMapper, P
     @Autowired
     private INewWorkflowService workflowService;
     @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
+    @Autowired
     private GeTuiUtils geTuiUtils;
     @Autowired
     private IPurchaseReceiptReportService purchaseReceiptReportService;
@@ -220,6 +223,18 @@ public class PurchaseOrderServiceImpl extends ServiceImpl<PurchaseOrderMapper, P
             purchaseClosingReportService.updateById(purchaseClosingReport);
             workflowService.activateInstance(purchaseClosingReport.getWorkflowId(), purchaseClosingReport.getId());
         }
+        //  添加提交历史
+        CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+        commonBillOperateHis.setBillId(purchaseClosingReport.getId());
+        commonBillOperateHis.setId(IdGenerator.generateUUID());
+        commonBillOperateHis.setBillType("PROCUREMENT-CLOSE-REPORT");
+        commonBillOperateHis.setOperateDate(new Date());
+        commonBillOperateHis.setOperateUser(purchaseClosingReport.getCreateUserId());
+        JSONObject jsonObject = (JSONObject) JSONObject.toJSON(purchaseClosingReport);
+        commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+        commonBillOperateHisService.create(commonBillOperateHis);
+
+
         if (one && two) {
             return "OK";
         } else {
@@ -639,6 +654,18 @@ public class PurchaseOrderServiceImpl extends ServiceImpl<PurchaseOrderMapper, P
             this.updateById(purchaseOrder);
             workflowService.activateInstance(purchaseOrder.getWorkflowId(), purchaseOrder.getId());
         }
+
+        //  添加提交历史
+        CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+        commonBillOperateHis.setBillId(purchaseOrder.getId());
+        commonBillOperateHis.setId(IdGenerator.generateUUID());
+        commonBillOperateHis.setBillType("PROCUREMENT-ORDER-APPROVE");
+        commonBillOperateHis.setOperateDate(new Date());
+        commonBillOperateHis.setOperateUser(purchaseOrder.getCreateUserId());
+        JSONObject jsonObject = (JSONObject) JSONObject.toJSON(purchaseOrder);
+        commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+        commonBillOperateHisService.create(commonBillOperateHis);
+
         return "OK";
     }
 

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

@@ -15,6 +15,8 @@ import com.winsea.svc.base.workflow.entity.Workflow;
 import com.winsea.svc.notice.entity.base.BaseNotice;
 import com.winsea.svc.notice.service.INoticeService;
 import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.base.entity.CommonBillOperateHis;
+import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.*;
 import com.yh.saas.plugin.yiliangyiyun.entity.view.TmpModel;
@@ -31,10 +33,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -57,6 +56,8 @@ public class PurchasePriceServiceImpl extends ServiceImpl<PurchasePriceMapper, P
     @Autowired
     private INewWorkflowService workflowService;
     @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
+    @Autowired
     private ICommonStaffService staffService;
     @Autowired
     private CacheComponent cacheComponent;
@@ -160,6 +161,17 @@ public class PurchasePriceServiceImpl extends ServiceImpl<PurchasePriceMapper, P
             this.updateById(purchasePrice);
             workflowService.activateInstance(purchasePrice.getWorkflowId(), purchasePrice.getId());
         }
+        //  添加提交历史
+        CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+        commonBillOperateHis.setBillId(purchasePrice.getId());
+        commonBillOperateHis.setId(IdGenerator.generateUUID());
+        commonBillOperateHis.setBillType("PROCUREMENT-PRICE-APPROVE");
+        commonBillOperateHis.setOperateDate(new Date());
+        commonBillOperateHis.setOperateUser(purchasePrice.getCreateUserId());
+        JSONObject jsonObject = (JSONObject) JSONObject.toJSON(purchasePrice);
+        commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+        commonBillOperateHisService.create(commonBillOperateHis);
+
         return "ok";
     }
 
@@ -260,6 +272,17 @@ public class PurchasePriceServiceImpl extends ServiceImpl<PurchasePriceMapper, P
                 this.updateById(purchasePrice);
                 workflowService.activateInstance(purchasePrice.getWorkflowId(), purchasePrice.getId());
             }
+        //  添加提交历史
+        CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+        commonBillOperateHis.setBillId(purchasePrice.getId());
+        commonBillOperateHis.setId(IdGenerator.generateUUID());
+        commonBillOperateHis.setBillType("PROCUREMENT-PRICE-APPROVE");
+        commonBillOperateHis.setOperateDate(new Date());
+        commonBillOperateHis.setOperateUser(purchasePrice.getCreateUserId());
+        JSONObject jsonObject = (JSONObject) JSONObject.toJSON(purchasePrice);
+        commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+        commonBillOperateHisService.create(commonBillOperateHis);
+
         return "ok";
     }
 

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

@@ -11,6 +11,8 @@ 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.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.base.entity.CommonBillOperateHis;
+import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.*;
 import com.yh.saas.plugin.yiliangyiyun.exception.YException;
@@ -25,10 +27,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -44,7 +43,8 @@ public class PurchaseReceiptReportServiceImpl extends ServiceImpl<PurchaseReceip
 
     @Autowired
     private INewWorkflowService workflowService;
-
+    @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
     @SofaReference
     private ICommonRoleResourceService roleResourceService;
     @Autowired
@@ -146,6 +146,18 @@ public class PurchaseReceiptReportServiceImpl extends ServiceImpl<PurchaseReceip
                 this.updateById(purchaseReceiptReport1);
                 workflowService.activateInstance(purchaseReceiptReport1.getWorkflowId(), purchaseReceiptReport1.getId());
             }
+
+            //  添加提交历史
+            CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+            commonBillOperateHis.setBillId(purchaseReceiptReport1.getId());
+            commonBillOperateHis.setId(IdGenerator.generateUUID());
+            commonBillOperateHis.setBillType("PROCUREMENT-RECEIPT-REPORT");
+            commonBillOperateHis.setOperateDate(new Date());
+            commonBillOperateHis.setOperateUser(purchaseReceiptReport1.getCreateUserId());
+            JSONObject jsonObject = (JSONObject) JSONObject.toJSON(purchaseReceiptReport1);
+            commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+            commonBillOperateHisService.create(commonBillOperateHis);
+
         }
         if (one) {
             return "OK";

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

@@ -8,6 +8,7 @@ import com.google.common.collect.Lists;
 import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.winsea.svc.base.workflow.entity.Workflow;
 import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.base.entity.CommonBillOperateHis;
 import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
@@ -58,6 +59,8 @@ public class SaleOrderServiceImpl extends ServiceImpl<SaleOrderMapper, SaleOrder
     @Autowired
     private INewWorkflowService workflowService;
     @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
+    @Autowired
     private GeTuiUtils geTuiUtils;
     @Autowired
     private ICustomerInfoService customerInfoService;
@@ -275,6 +278,18 @@ public class SaleOrderServiceImpl extends ServiceImpl<SaleOrderMapper, SaleOrder
             salesClosingReportService.updateById(salesClosingReport);
             workflowService.activateInstance(salesClosingReport.getWorkflowId(), salesClosingReport.getId());
         }
+
+        //  添加提交历史
+        CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+        commonBillOperateHis.setBillId(salesClosingReport.getId());
+        commonBillOperateHis.setId(IdGenerator.generateUUID());
+        commonBillOperateHis.setBillType("SALE-CLOSE-REPORT");
+        commonBillOperateHis.setOperateDate(new Date());
+        commonBillOperateHis.setOperateUser(salesClosingReport.getCreateUserId());
+        JSONObject jsonObject = (JSONObject) JSONObject.toJSON(salesClosingReport);
+        commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+        commonBillOperateHisService.create(commonBillOperateHis);
+
         if (one && two) {
             return "OK";
         } else {
@@ -527,6 +542,18 @@ public class SaleOrderServiceImpl extends ServiceImpl<SaleOrderMapper, SaleOrder
             workflowService.activateInstance(saleOrder.getWorkflowId(), saleOrder.getId());
         }
 
+        //  添加提交历史
+        CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+        commonBillOperateHis.setBillId(saleOrder.getId());
+        commonBillOperateHis.setId(IdGenerator.generateUUID());
+        commonBillOperateHis.setBillType("SALE-ORDER-APPROVE");
+        commonBillOperateHis.setOperateDate(new Date());
+        commonBillOperateHis.setOperateUser(saleOrder.getCreateUserId());
+        JSONObject jsonObject = (JSONObject) JSONObject.toJSON(saleOrder);
+        commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+        commonBillOperateHisService.create(commonBillOperateHis);
+
+
         // 添加客户信息
         int count = customerInfoService.selectCount(new EntityWrapper<CustomerInfo>().eq("customer_phone", saleOrder.getBuyerPhone())
                 .eq("customer_name",saleOrder.getBuyer())

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

@@ -10,6 +10,9 @@ import com.winsea.svc.base.base.service.ICommonRoleResourceService;
 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.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.base.entity.CommonBillOperateHis;
+import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.SalesClosingReport;
@@ -28,10 +31,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -53,7 +53,8 @@ public class SalesClosingReportServiceImpl extends ServiceImpl<SalesClosingRepor
     @SofaReference
     private ICommonRoleResourceService roleResourceService;
 
-
+    @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
     /**
      * 销售平仓统计列表
      *
@@ -146,6 +147,17 @@ public class SalesClosingReportServiceImpl extends ServiceImpl<SalesClosingRepor
                 this.updateById(salesClosingReport);
                 workflowService.activateInstance(salesClosingReport.getWorkflowId(), salesClosingReport.getId());
             }
+
+            //  添加提交历史
+            CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+            commonBillOperateHis.setBillId(salesClosingReport.getId());
+            commonBillOperateHis.setId(IdGenerator.generateUUID());
+            commonBillOperateHis.setBillType("SALE-CLOSE-REPORT");
+            commonBillOperateHis.setOperateDate(new Date());
+            commonBillOperateHis.setOperateUser(salesClosingReport.getCreateUserId());
+            JSONObject jsonObject = (JSONObject) JSONObject.toJSON(salesClosingReport);
+            commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+            commonBillOperateHisService.create(commonBillOperateHis);
         }
         if (one) {
             return "OK";

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

@@ -10,6 +10,9 @@ import com.winsea.svc.base.base.service.ICommonRoleResourceService;
 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.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.base.entity.CommonBillOperateHis;
+import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.*;
 import com.yh.saas.plugin.yiliangyiyun.exception.YException;
@@ -24,10 +27,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -42,6 +42,8 @@ import java.util.stream.Collectors;
 public class SalesDeliveryReportServiceImpl extends ServiceImpl<SalesDeliveryReportMapper, SalesDeliveryReport> implements ISalesDeliveryReportService {
     @Autowired
     private INewWorkflowService workflowService;
+    @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
     @SofaReference
     private ICommonRoleResourceService roleResourceService;
     @Autowired
@@ -226,6 +228,18 @@ public class SalesDeliveryReportServiceImpl extends ServiceImpl<SalesDeliveryRep
                 this.updateById(salesDeliveryReport);
                 workflowService.activateInstance(salesDeliveryReport.getWorkflowId(), salesDeliveryReport.getId());
             }
+
+            //  添加提交历史
+            CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+            commonBillOperateHis.setBillId(salesDeliveryReport.getId());
+            commonBillOperateHis.setId(IdGenerator.generateUUID());
+            commonBillOperateHis.setBillType("SALE-RECEIPT-REPORT");
+            commonBillOperateHis.setOperateDate(new Date());
+            commonBillOperateHis.setOperateUser(salesDeliveryReport.getCreateUserId());
+            JSONObject jsonObject = (JSONObject) JSONObject.toJSON(salesDeliveryReport);
+            commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+            commonBillOperateHisService.create(commonBillOperateHis);
+
         }
         if (one) {
             return "OK";

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

@@ -2,11 +2,14 @@ package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
+import com.gexin.fastjson.JSONObject;
 import com.gexin.rp.sdk.base.uitls.StringUtils;
 import com.google.common.collect.Lists;
 import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.winsea.svc.base.workflow.entity.Workflow;
 import com.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.base.entity.CommonBillOperateHis;
+import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.FuelFillingInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.ShortFillingInfo;
@@ -45,7 +48,8 @@ public class ShortFillingInfoServiceImpl extends ServiceImpl<ShortFillingInfoMap
     private IFuelFillingInfoService fuelFillingInfoService;
     @Autowired
     private INewWorkflowService workflowService;
-
+    @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
     /**
      * 添加短途加油信息
      *
@@ -211,6 +215,18 @@ public class ShortFillingInfoServiceImpl extends ServiceImpl<ShortFillingInfoMap
             fuelFillingInfoService.updateById(fuelFillingInfo);
             workflowService.activateInstance(fuelFillingInfo.getWorkflowId(), fuelFillingInfo.getId());
         }
+
+        //  添加提交历史
+        CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+        commonBillOperateHis.setBillId(fuelFillingInfo.getId());
+        commonBillOperateHis.setId(IdGenerator.generateUUID());
+        commonBillOperateHis.setBillType("JIAYOU-SHENHE-APPROVE");
+        commonBillOperateHis.setOperateDate(new Date());
+        commonBillOperateHis.setOperateUser(fuelFillingInfo.getCreateUserId());
+        JSONObject jsonObject = (JSONObject) JSONObject.toJSON(fuelFillingInfo);
+        commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+        commonBillOperateHisService.create(commonBillOperateHis);
+
         return "OK";
     }
 }

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

@@ -18,6 +18,7 @@ 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.common.support.util.StringUtils;
+import com.yh.saas.plugin.base.entity.CommonBillOperateHis;
 import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
@@ -62,6 +63,8 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
     @Autowired
     private IDriverPayeeInfoService driverPayeeInfoService;
     @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
+    @Autowired
     private INewWorkflowService workflowService;
     @Autowired
     private INoticeService noticeService;
@@ -972,6 +975,18 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                     workflowService.startInstance(workflow.getId(), tranProcessInfo1.getId());
                 }
             }
+
+            //  添加提交历史
+            CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+            commonBillOperateHis.setBillId(tranProcessInfo1.getId());
+            commonBillOperateHis.setId(IdGenerator.generateUUID());
+            commonBillOperateHis.setBillType("YUNJIA-TRAN-APPROVE");
+            commonBillOperateHis.setOperateDate(new Date());
+            commonBillOperateHis.setOperateUser(tranProcessInfo1.getCreateUserId());
+            JSONObject jsonObject = (JSONObject) JSONObject.toJSON(tranProcessInfo1);
+            commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+            commonBillOperateHisService.create(commonBillOperateHis);
+
         }
         this.updateById(tranProcessInfo);
         return "ok";
@@ -1003,6 +1018,18 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                     this.updateById(tranProcessInfo1);
                     workflowService.startInstance(workflow.getId(), tranProcessInfo1.getId());
                 }
+
+                //  添加提交历史
+                CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+                commonBillOperateHis.setBillId(tranProcessInfo1.getId());
+                commonBillOperateHis.setId(IdGenerator.generateUUID());
+                commonBillOperateHis.setBillType("YUNJIA-TRAN-APPROVE");
+                commonBillOperateHis.setOperateDate(new Date());
+                commonBillOperateHis.setOperateUser(tranProcessInfo1.getCreateUserId());
+                JSONObject jsonObject = (JSONObject) JSONObject.toJSON(tranProcessInfo1);
+                commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+                commonBillOperateHisService.create(commonBillOperateHis);
+
             }
         }
         this.updateById(tranProcessInfo);

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

@@ -15,6 +15,8 @@ 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.yh.saas.common.support.util.IdGenerator;
+import com.yh.saas.plugin.base.entity.CommonBillOperateHis;
+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.*;
@@ -61,7 +63,8 @@ import java.util.stream.Collectors;
 @Service
 @Slf4j
 public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementReportMapper, TranSettlementReport> implements ITranSettlementReportService {
-
+    @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
     @Autowired
     private INewWorkflowService workflowService;
     @SofaReference
@@ -686,6 +689,18 @@ public class TranSettlementReportServiceImpl extends ServiceImpl<TranSettlementR
                 batchReviewInfoService.updateById(batchReviewInfo);
                 workflowService.startInstance(workflow.getId(), batchReviewInfo.getId());
             }
+
+            //  添加提交历史
+            CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+            commonBillOperateHis.setBillId(batchReviewInfo.getId());
+            commonBillOperateHis.setId(IdGenerator.generateUUID());
+            commonBillOperateHis.setBillType("TRANSPORTATION-SETTLEMENT-REPORT");
+            commonBillOperateHis.setOperateDate(new Date());
+            commonBillOperateHis.setOperateUser(batchReviewInfo.getCreateUserId());
+            JSONObject jsonObject = (JSONObject) JSONObject.toJSON(tranSettlementReportList);
+            commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+            commonBillOperateHisService.create(commonBillOperateHis);
+
         }
         //  更新详细状态
         batchReviewInfo = batchReviewInfoService.selectById(batchReviewInfo.getId());

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

@@ -557,26 +557,24 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String editWarehouse(WarehouseBaseInfo warehouseBaseInfo) {
-        WarehouseBaseInfo warehouseBaseInfo1=this.selectById(warehouseBaseInfo.getId());
+        WarehouseBaseInfo warehouseBaseInfo1 = this.selectById(warehouseBaseInfo.getId());
         String personPhone = warehouseBaseInfo.getPersonPhone();
         String otherPhone = warehouseBaseInfo.getOtherPersonPhone();
-        if(personPhone != null){
-            if(!personPhone.equals(warehouseBaseInfo1.getPersonPhone())){
+        if (personPhone != null) {
+            if (!personPhone.equals(warehouseBaseInfo1.getPersonPhone())) {
                 cacheComponent.delPrefixKey(Const.SELF_WAREHOUSE);
             }
-        }
-        else{
-            if(warehouseBaseInfo1.getPersonPhone()!=null){
+        } else {
+            if (warehouseBaseInfo1.getPersonPhone() != null) {
                 cacheComponent.delPrefixKey(Const.SELF_WAREHOUSE);
             }
         }
-        if(otherPhone != null){
-            if(!otherPhone.equals(warehouseBaseInfo1.getOtherPersonPhone())){
+        if (otherPhone != null) {
+            if (!otherPhone.equals(warehouseBaseInfo1.getOtherPersonPhone())) {
                 cacheComponent.delPrefixKey(Const.SELF_WAREHOUSE);
             }
-        }
-        else{
-            if(warehouseBaseInfo1.getOtherPersonPhone()!=null){
+        } else {
+            if (warehouseBaseInfo1.getOtherPersonPhone() != null) {
                 cacheComponent.delPrefixKey(Const.SELF_WAREHOUSE);
             }
         }
@@ -837,8 +835,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         Calendar calendar = Calendar.getInstance();
         calendar.add(Calendar.MONTH, -3);
         List<ContractManagementInfo> temp = new ArrayList();
-        List<ContractManagementInfo> listRedis = cacheComponent.getObjList(Const.ADMIN_CONTRACTINFO+compId+flag,ContractManagementInfo.class);
-        if(listRedis != null && listRedis.size() > 0 ){
+        List<ContractManagementInfo> listRedis = cacheComponent.getObjList(Const.ADMIN_CONTRACTINFO + compId + flag, ContractManagementInfo.class);
+        if (listRedis != null && listRedis.size() > 0) {
             return listRedis;
         }
         //查所有合同编号
@@ -857,7 +855,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 temp.add(contractManagementInfo);
             }
 
-            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO+compId+flag,JSONObject.toJSONString(temp),60*60*24);
+            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO + compId + flag, JSONObject.toJSONString(temp), 60 * 60 * 24);
             return temp;
         }
         //查采购合同编号
@@ -876,7 +874,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 contractManagementInfo.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
                 temp.add(contractManagementInfo);
             }
-            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO+compId+flag,JSONObject.toJSONString(temp),60*60*24);
+            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO + compId + flag, JSONObject.toJSONString(temp), 60 * 60 * 24);
             return temp;
         }
         //查销售合同编号
@@ -896,7 +894,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 contractManagementInfo.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
                 temp.add(contractManagementInfo);
             }
-            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO+compId+flag,JSONObject.toJSONString(temp),60*60*24);
+            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO + compId + flag, JSONObject.toJSONString(temp), 60 * 60 * 24);
             return temp;
         }
         //查采购订单审核合同编号
@@ -925,7 +923,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 temp.addAll(contractManagementInfoList);
             }
 
-            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO+compId+flag,JSONObject.toJSONString(temp),60*60*24);
+            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO + compId + flag, JSONObject.toJSONString(temp), 60 * 60 * 24);
             return temp;
         }
         //查销售订单审核合同编号
@@ -953,7 +951,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 temp.addAll(contractManagementInfoList);
             }
 
-            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO+compId+flag,JSONObject.toJSONString(temp),60*60*24);
+            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO + compId + flag, JSONObject.toJSONString(temp), 60 * 60 * 24);
             return temp;
         }
         //查销售合同编号,以及移库任务编号
@@ -963,7 +961,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                     .eq("delete_flag", "0")
                     .eq("status_flag", "1")
                     .eq("contract_type", "1")
-                    .ge("update_date",DateUtil.formatDate(calendar.getTime(), DateUtils.DATE_FMT_YYYY_MM_DD))
+                    .ge("update_date", DateUtil.formatDate(calendar.getTime(), DateUtils.DATE_FMT_YYYY_MM_DD))
                     .orderBy("update_date", false));
             for (ContractManagementInfo contractManagementInfo : contractManagementInfoList) {
                 ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
@@ -1015,7 +1013,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                     .eq("delete_flag", "0")
                     .eq("task_type_key", "3")
                     .eq("in_out_flag", "1")
-                    .ge("update_date",DateUtil.formatDate(calendar.getTime(), DateUtils.DATE_FMT_YYYY_MM_DD))
+                    .ge("update_date", DateUtil.formatDate(calendar.getTime(), DateUtils.DATE_FMT_YYYY_MM_DD))
                     .orderBy("update_date", false));
             for (InOutWarehouseTask inOutWarehouseTask : inOutWarehouseTaskList) {
                 ContractManagementInfo contractManagementInfo = new ContractManagementInfo();
@@ -1055,14 +1053,13 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 //移库看成自运
                 contractManagementInfo.setDeliverType("1");
                 contractManagementInfo.setContractNo(inOutWarehouseTask.getMoveTaskNo());
-                ContractManagementInfo contractManagementInfo1=contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
-                        .eq("contract_no",inOutWarehouseTask.getWarehouseName())
-                        .eq("comp_id",inOutWarehouseTask.getCompId()));
-                if (contractManagementInfo1!=null&&"定价采购".equals(contractManagementInfo1.getPriceType())) {
+                ContractManagementInfo contractManagementInfo1 = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+                        .eq("contract_no", inOutWarehouseTask.getWarehouseName())
+                        .eq("comp_id", inOutWarehouseTask.getCompId()));
+                if (contractManagementInfo1 != null && "定价采购".equals(contractManagementInfo1.getPriceType())) {
                     contractManagementInfo.setContractPrice(Float.valueOf(String.valueOf(contractManagementInfo1.getUnitContractPrice())));
                     contractManagementInfo.setPriceType(contractManagementInfo1.getPriceType());
-                }
-                else if(contractManagementInfo1!=null&&"随行就市".equals(contractManagementInfo1.getPriceType())){
+                } else if (contractManagementInfo1 != null && "随行就市".equals(contractManagementInfo1.getPriceType())) {
                     contractManagementInfo.setPriceType(contractManagementInfo1.getPriceType());
                 }
                 contractManagementInfo.setGrade(inOutWarehouseTask.getGrade());
@@ -1072,7 +1069,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 temp.add(contractManagementInfo);
             }
 
-            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO+compId+flag,JSONObject.toJSONString(temp),60*60*24);
+            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO + compId + flag, JSONObject.toJSONString(temp), 60 * 60 * 24);
             return temp;
         }
         //查采购合同编号(不包含自运）,以及移库任务编号
@@ -1172,7 +1169,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 temp.add(contractManagementInfo);
             }
 
-            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO+compId+flag,JSONObject.toJSONString(temp),60*60*24);
+            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO + compId + flag, JSONObject.toJSONString(temp), 60 * 60 * 24);
             return temp;
         }
         //查采购合同编号(不包含自运）,以及移库任务编号,销售合同
@@ -1186,7 +1183,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                     .eq("contract_type", "2")
                     .eq("status_flag", "1")
                     .eq("deliver_type", "2")
-                    .ge("update_date",DateUtil.formatDate(calendar.getTime(), DateUtils.DATE_FMT_YYYY_MM_DD))
+                    .ge("update_date", DateUtil.formatDate(calendar.getTime(), DateUtils.DATE_FMT_YYYY_MM_DD))
                     .orderBy("update_date", false));
             for (ContractManagementInfo contractManagementInfo : contractManagementInfoList) {
                 ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
@@ -1240,7 +1237,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                     .eq("status_flag", "1")
                     .eq("contract_type", "1")
                     .eq("delete_flag", "0")
-                    .ge("update_date",DateUtil.formatDate(calendar.getTime(), DateUtils.DATE_FMT_YYYY_MM_DD))
+                    .ge("update_date", DateUtil.formatDate(calendar.getTime(), DateUtils.DATE_FMT_YYYY_MM_DD))
                     .orderBy("update_date", false));
             for (ContractManagementInfo contractManagementInfo1 : contractManagementInfoList1) {
                 ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
@@ -1287,7 +1284,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                     .eq("delete_flag", "0")
                     .eq("task_type_key", "3")
                     .eq("in_out_flag", "1")
-                    .ge("update_date",DateUtil.formatDate(calendar.getTime(), DateUtils.DATE_FMT_YYYY_MM_DD))
+                    .ge("update_date", DateUtil.formatDate(calendar.getTime(), DateUtils.DATE_FMT_YYYY_MM_DD))
                     .orderBy("update_date", false));
             for (InOutWarehouseTask inOutWarehouseTask : inOutWarehouseTaskList) {
                 ContractManagementInfo contractManagementInfo1 = new ContractManagementInfo();
@@ -1324,17 +1321,17 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                     contractManagementInfo1.setFireDirectionList(fireList);
                 }
                 contractManagementInfo1.setContractNo(inOutWarehouseTask.getMoveTaskNo());
-                ContractManagementInfo contractManagementInfo=contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
-                .eq("contract_no",inOutWarehouseTask.getWarehouseName())
-                .eq("comp_id",inOutWarehouseTask.getCompId()));
-                if (contractManagementInfo!=null&&contractManagementInfo.getUnitContractPrice() != null) {
+                ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
+                        .eq("contract_no", inOutWarehouseTask.getWarehouseName())
+                        .eq("comp_id", inOutWarehouseTask.getCompId()));
+                if (contractManagementInfo != null && contractManagementInfo.getUnitContractPrice() != null) {
                     contractManagementInfo1.setContractPrice(Float.valueOf(String.valueOf(contractManagementInfo.getUnitContractPrice())));
                 }
                 //自运采购的移库
                 ContractManagementInfo contractManagementInfo2 = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
                         .eq("comp_id", inOutWarehouseTask.getCompId())
                         .eq("contract_no", inOutWarehouseTask.getSendWarehouse()));
-                if (contractManagementInfo2 != null&&contractManagementInfo2.getUnitContractPrice()!=null) {
+                if (contractManagementInfo2 != null && contractManagementInfo2.getUnitContractPrice() != null) {
                     contractManagementInfo1.setContractPrice(Float.valueOf(String.valueOf(contractManagementInfo2.getUnitContractPrice())));
                 }
                 //移库看成自运
@@ -1346,7 +1343,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             }
 //            temp = temp.stream().sorted(Comparator.comparing(ContractManagementInfo::getCreateDate)).collect(Collectors.toList());
 //            temp = temp.subList(temp.size()-100,temp.size());
-            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO+compId+flag,JSONObject.toJSONString(temp),60*60*24);
+            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO + compId + flag, JSONObject.toJSONString(temp), 60 * 60 * 24);
             return temp;
         }
         //采购合同不包含自运
@@ -1366,7 +1363,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 temp.add(contractManagementInfo);
             }
 
-            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO+compId+flag,JSONObject.toJSONString(temp),60*60*24);
+            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO + compId + flag, JSONObject.toJSONString(temp), 60 * 60 * 24);
             return temp;
         }
         //查可派任务的收购合同
@@ -1379,12 +1376,12 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                     .orderBy("update_date", false));
             for (ContractManagementInfo contractManagementInfo : contractManagementInfoList) {
                 //一个收购合同只能选一次
-                InOutWarehouseTask inOutWarehouseTask=iInOutWarehouseTaskService.selectOne(new EntityWrapper<InOutWarehouseTask>()
+                InOutWarehouseTask inOutWarehouseTask = iInOutWarehouseTaskService.selectOne(new EntityWrapper<InOutWarehouseTask>()
                         .eq("comp_id", contractManagementInfo.getCompId())
                         .eq("contract_no", contractManagementInfo.getContractNo())
                         .eq("delete_flag", "0")
                         .orderBy("update_date", false));
-                if (inOutWarehouseTask==null){
+                if (inOutWarehouseTask == null) {
                     ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
                             .eq("contract_id", contractManagementInfo.getId()));
                     contractManagementInfo.setGoodsName(contractGoodsInfo.getGoodsName());
@@ -1392,7 +1389,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                     temp.add(contractManagementInfo);
                 }
             }
-            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO+compId+flag,JSONObject.toJSONString(temp),60*60*24);
+            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO + compId + flag, JSONObject.toJSONString(temp), 60 * 60 * 24);
             return temp;
         }
         //查收购合同
@@ -1404,13 +1401,13 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                     .eq("delete_flag", "0")
                     .orderBy("update_date", false));
             for (ContractManagementInfo contractManagementInfo : contractManagementInfoList) {
-                    ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
-                            .eq("contract_id", contractManagementInfo.getId()));
-                    contractManagementInfo.setGoodsName(contractGoodsInfo.getGoodsName());
-                    contractManagementInfo.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
-                    temp.add(contractManagementInfo);
+                ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>()
+                        .eq("contract_id", contractManagementInfo.getId()));
+                contractManagementInfo.setGoodsName(contractGoodsInfo.getGoodsName());
+                contractManagementInfo.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
+                temp.add(contractManagementInfo);
             }
-            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO+compId+flag,JSONObject.toJSONString(temp),60*60*24);
+            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO + compId + flag, JSONObject.toJSONString(temp), 60 * 60 * 24);
             return temp;
         }
         //未结算的合同编号，用于请款收款下拉
@@ -1429,7 +1426,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 contractManagementInfo.setGoodsNameKey(contractGoodsInfo.getGoodsNameKey());
                 temp.add(contractManagementInfo);
             }
-            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO+compId+flag,JSONObject.toJSONString(temp),60*60*24);
+            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO + compId + flag, JSONObject.toJSONString(temp), 60 * 60 * 24);
             return temp;
         }
         //flag==2 查所有执行中的合同编号,以及移库任务编号
@@ -1459,7 +1456,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 contractManagementInfo.setInOutType("移库入库");
                 temp.add(contractManagementInfo);
             }
-            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO+compId+flag,JSONObject.toJSONString(temp),60*60*24);
+            cacheComponent.putRaw(Const.ADMIN_CONTRACTINFO + compId + flag, JSONObject.toJSONString(temp), 60 * 60 * 24);
             return temp;
         }
     }
@@ -1479,8 +1476,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         if (personCharge == null || personCharge.isEmpty()) {
             personCharge = AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getStaffMobilePhone();
         }
-        List<WarehouseBaseInfo> listRedis = cacheComponent.getObjList(Const.SELF_WAREHOUSE+personCharge,WarehouseBaseInfo.class);
-        if(listRedis != null && listRedis.size() > 0 ){
+        List<WarehouseBaseInfo> listRedis = cacheComponent.getObjList(Const.SELF_WAREHOUSE + personCharge, WarehouseBaseInfo.class);
+        if (listRedis != null && listRedis.size() > 0) {
             return listRedis;
         }
         Wrapper<WarehouseBaseInfo> warehouseBaseInfoWrapper = new EntityWrapper<>();
@@ -1592,7 +1589,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             }
 
         }
-        cacheComponent.putRaw(Const.SELF_WAREHOUSE+personCharge,JSONObject.toJSONString(warehouseBaseInfoList),60*60*24);
+        cacheComponent.putRaw(Const.SELF_WAREHOUSE + personCharge, JSONObject.toJSONString(warehouseBaseInfoList), 60 * 60 * 24);
         return warehouseBaseInfoList;
     }
 
@@ -1611,8 +1608,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         if (personCharge == null || personCharge.isEmpty()) {
             personCharge = AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getStaffMobilePhone();
         }
-        List<WarehouseBaseInfo> listRedis = cacheComponent.getObjList(Const.SELF_WAREHOUSE+personCharge+compId,WarehouseBaseInfo.class);
-        if(listRedis != null && listRedis.size() > 0 ){
+        List<WarehouseBaseInfo> listRedis = cacheComponent.getObjList(Const.SELF_WAREHOUSE + personCharge + compId, WarehouseBaseInfo.class);
+        if (listRedis != null && listRedis.size() > 0) {
             return listRedis;
         }
         Wrapper<WarehouseBaseInfo> warehouseBaseInfoWrapper = new EntityWrapper<>();
@@ -1739,7 +1736,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             }
 
         }
-        cacheComponent.putRaw(Const.SELF_WAREHOUSE+personCharge+compId,JSONObject.toJSONString(warehouseBaseInfoList),60*60*24);
+        cacheComponent.putRaw(Const.SELF_WAREHOUSE + personCharge + compId, JSONObject.toJSONString(warehouseBaseInfoList), 60 * 60 * 24);
         return warehouseBaseInfoList;
     }
 
@@ -2295,12 +2292,12 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 ExportVView exportVView = dataList.get(i);
                 HSSFRow rowx = sheet.createRow((int) rownum);
                 rowx.setHeightInPoints(20);
-                if(!StringUtils.isEmpty(exportVView.getWaterContent())
-                        &&!StringUtils.isEmpty(exportVView.getImpurity())
-                        &&!StringUtils.isEmpty(exportVView.getMildewGrain())
-                        &&!StringUtils.isEmpty(exportVView.getImperfectGrain())
-                        &&!StringUtils.isEmpty(exportVView.getBulkDensity())
-                        &&!StringUtils.isEmpty(exportVView.getJiaorenli())){
+                if (!StringUtils.isEmpty(exportVView.getWaterContent())
+                        && !StringUtils.isEmpty(exportVView.getImpurity())
+                        && !StringUtils.isEmpty(exportVView.getMildewGrain())
+                        && !StringUtils.isEmpty(exportVView.getImperfectGrain())
+                        && !StringUtils.isEmpty(exportVView.getBulkDensity())
+                        && !StringUtils.isEmpty(exportVView.getJiaorenli())) {
                     //水分累计和
                     netWeightTmp = netWeightTmp + (Double.valueOf(String.valueOf(exportVView.getNetWeight() != null ? exportVView.getNetWeight() : "0")));
                 }
@@ -2313,7 +2310,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 jiaorenliTotal = jiaorenliTotal + ((Double.parseDouble(!StringUtils.isEmpty(exportVView.getJiaorenli()) ? exportVView.getJiaorenli() : "0")) * ((Double.parseDouble(!StringUtils.isEmpty(exportVView.getNetWeight()) ? exportVView.getNetWeight() : "0"))));
 //                netWeightPriceTotal = netWeightPriceTotal + (Double.valueOf(String.valueOf(exportVView.getNetWeightPrice()!=null?exportVView.getNetWeightPrice():"0")));
                 netWeightTotal = netWeightTotal + (Double.valueOf(String.valueOf(exportVView.getNetWeight() != null ? exportVView.getNetWeight() : "0")));
-                amountIngPayableTotal = amountIngPayableTotal + (exportVView.getAmountIngPayable()!=null ? exportVView.getAmountIngPayable() : 0);
+                amountIngPayableTotal = amountIngPayableTotal + (exportVView.getAmountIngPayable() != null ? exportVView.getAmountIngPayable() : 0);
             }
         }
 
@@ -2701,21 +2698,21 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 cell.setCellValue(editDouble(exportVView.getUnitDeduction()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(35);
-                if(exportVView.getPureWeightPrice() == null){
+                if (exportVView.getPureWeightPrice() == null) {
                     cell.setCellValue(new Formatter().format("%.3f", editDouble(exportVView.getPureWeightPrice())).toString());
-                }else {
+                } else {
                     cell.setCellValue(new Formatter().format("%.3f", editDouble(exportVView.getPureWeightPrice() * 1000)).toString());
                 }
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(36);
-                if(exportVView.getPureWeight() == null){
+                if (exportVView.getPureWeight() == null) {
                     cell.setCellValue(editFloat(exportVView.getPureWeight()));
-                }else {
+                } else {
                     cell.setCellValue(editDouble(Double.valueOf(exportVView.getPureWeight()) / 1000));
                 }
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(37);
-                cell.setCellValue(editDouble(exportVView.getAmountIngPayable()!=null ? exportVView.getAmountIngPayable() : 0));
+                cell.setCellValue(editDouble(exportVView.getAmountIngPayable() != null ? exportVView.getAmountIngPayable() : 0));
                 cell.setCellStyle(contextstyle);
                 cell = rowx.createCell(38);
                 cell.setCellValue(new Formatter().format("%.2f", editDouble(exportVView.getAmountEdPayable())).toString());
@@ -3171,12 +3168,12 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 ExportVView exportVView = dataList.get(i);
                 HSSFRow rowx = sheet.createRow((int) rownum);
                 rowx.setHeightInPoints(20);
-                if(!StringUtils.isEmpty(exportVView.getWaterContent())
-                        &&!StringUtils.isEmpty(exportVView.getImpurity())
-                        &&!StringUtils.isEmpty(exportVView.getMildewGrain())
-                        &&!StringUtils.isEmpty(exportVView.getImperfectGrain())
-                        &&!StringUtils.isEmpty(exportVView.getBulkDensity())
-                        &&!StringUtils.isEmpty(exportVView.getJiaorenli())){
+                if (!StringUtils.isEmpty(exportVView.getWaterContent())
+                        && !StringUtils.isEmpty(exportVView.getImpurity())
+                        && !StringUtils.isEmpty(exportVView.getMildewGrain())
+                        && !StringUtils.isEmpty(exportVView.getImperfectGrain())
+                        && !StringUtils.isEmpty(exportVView.getBulkDensity())
+                        && !StringUtils.isEmpty(exportVView.getJiaorenli())) {
                     //水分累计和
                     netWeightTmp = netWeightTmp + (Double.valueOf(String.valueOf(exportVView.getNetWeight() != null ? exportVView.getNetWeight() : "0")));
                 }
@@ -3189,7 +3186,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 jiaorenliTotal = jiaorenliTotal + ((Double.parseDouble(!StringUtils.isEmpty(exportVView.getJiaorenli()) ? exportVView.getJiaorenli() : "0")) * ((Double.parseDouble(!StringUtils.isEmpty(exportVView.getNetWeight()) ? exportVView.getNetWeight() : "0"))));
 //                netWeightPriceTotal = netWeightPriceTotal + (Double.valueOf(String.valueOf(exportVView.getNetWeightPrice()!=null?exportVView.getNetWeightPrice():"0")));
                 netWeightTotal = netWeightTotal + (Double.valueOf(String.valueOf(exportVView.getNetWeight() != null ? exportVView.getNetWeight() : "0")));
-                amountIngPayableTotal = amountIngPayableTotal + (exportVView.getAmountIngPayable()!=null ? exportVView.getAmountIngPayable() : 0);
+                amountIngPayableTotal = amountIngPayableTotal + (exportVView.getAmountIngPayable() != null ? exportVView.getAmountIngPayable() : 0);
             }
             HSSFRow rowp = sheet.createRow((int) (rownum));
             rowp.setHeightInPoints(20);
@@ -3562,21 +3559,21 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 cell.setCellValue(editDouble(exportVView.getUnitDeduction()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(35);
-                if(exportVView.getPureWeightPrice() == null){
+                if (exportVView.getPureWeightPrice() == null) {
                     cell.setCellValue(new Formatter().format("%.3f", editDouble(exportVView.getPureWeightPrice())).toString());
-                }else {
+                } else {
                     cell.setCellValue(new Formatter().format("%.3f", editDouble(exportVView.getPureWeightPrice() * 1000)).toString());
                 }
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(36);
-                if(exportVView.getPureWeight() == null){
+                if (exportVView.getPureWeight() == null) {
                     cell.setCellValue(editFloat(exportVView.getPureWeight()));
-                }else {
+                } else {
                     cell.setCellValue(editDouble(Double.valueOf(exportVView.getPureWeight()) / 1000));
                 }
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(37);
-                cell.setCellValue(editDouble(exportVView.getAmountIngPayable()!=null ? exportVView.getAmountIngPayable() : 0));
+                cell.setCellValue(editDouble(exportVView.getAmountIngPayable() != null ? exportVView.getAmountIngPayable() : 0));
                 cell.setCellStyle(contextstyle);
                 cell = rowx.createCell(38);
                 cell.setCellValue(new Formatter().format("%.2f", editDouble(exportVView.getAmountEdPayable())).toString());
@@ -4043,12 +4040,12 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
             Double netWeightTmp = 0d;//应收合计
             for (int i = 0; i < dataList.size(); i++) {
                 ExportVView exportVView = dataList.get(i);
-                if(!StringUtils.isEmpty(exportVView.getWaterContent())
-                        &&!StringUtils.isEmpty(exportVView.getImpurity())
-                        &&!StringUtils.isEmpty(exportVView.getMildewGrain())
-                        &&!StringUtils.isEmpty(exportVView.getImperfectGrain())
-                        &&!StringUtils.isEmpty(exportVView.getBulkDensity())
-                        &&!StringUtils.isEmpty(exportVView.getJiaorenli())){
+                if (!StringUtils.isEmpty(exportVView.getWaterContent())
+                        && !StringUtils.isEmpty(exportVView.getImpurity())
+                        && !StringUtils.isEmpty(exportVView.getMildewGrain())
+                        && !StringUtils.isEmpty(exportVView.getImperfectGrain())
+                        && !StringUtils.isEmpty(exportVView.getBulkDensity())
+                        && !StringUtils.isEmpty(exportVView.getJiaorenli())) {
                     //水分累计和
                     netWeightTmp = netWeightTmp + (Double.valueOf(String.valueOf(exportVView.getNetWeight() != null ? exportVView.getNetWeight() : "0")));
                 }
@@ -4357,7 +4354,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 cell.setCellValue(date);
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(7);
-                if(!StringUtils.isEmpty(exportVView.getContractNo())){
+                if (!StringUtils.isEmpty(exportVView.getContractNo())) {
                     cell.setCellValue(editString(exportVView.getContractNo()));
                 }
                 cell.setCellStyle(styleDetail);
@@ -4942,12 +4939,12 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 ExportVView exportVView = dataList.get(i);
                 HSSFRow rowx = sheet.createRow((int) rownum);
                 rowx.setHeightInPoints(20);
-                if(!StringUtils.isEmpty(exportVView.getWaterContent())
-                        &&!StringUtils.isEmpty(exportVView.getImpurity())
-                        &&!StringUtils.isEmpty(exportVView.getMildewGrain())
-                        &&!StringUtils.isEmpty(exportVView.getImperfectGrain())
-                        &&!StringUtils.isEmpty(exportVView.getBulkDensity())
-                        &&!StringUtils.isEmpty(exportVView.getJiaorenli())){
+                if (!StringUtils.isEmpty(exportVView.getWaterContent())
+                        && !StringUtils.isEmpty(exportVView.getImpurity())
+                        && !StringUtils.isEmpty(exportVView.getMildewGrain())
+                        && !StringUtils.isEmpty(exportVView.getImperfectGrain())
+                        && !StringUtils.isEmpty(exportVView.getBulkDensity())
+                        && !StringUtils.isEmpty(exportVView.getJiaorenli())) {
                     //水分累计和
                     netWeightTmp = netWeightTmp + (Double.valueOf(String.valueOf(exportVView.getNetWeight() != null ? exportVView.getNetWeight() : "0")));
                 }
@@ -5415,6 +5412,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
     public Integer getTemWareHouseCountByCondition(Map<String, Object> pageView) {
         return baseMapper.getTemWareHouseCountByCondition(pageView);
     }
+
     private String addDateOneDay(Date date) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         sdf.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
@@ -5581,8 +5579,8 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
     }
 
     /**
-     *
      * 库点利润详情列表
+     *
      * @param warehouseBaseInfo
      * @return
      */
@@ -5612,9 +5610,15 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
         return page;
     }
 
+    /**
+     * 库点利润列表
+     *
+     * @param warehouseBaseInfo
+     * @return
+     */
     @Override
     public WarehouseBaseInfo selectWarehouseChart(WarehouseBaseInfo warehouseBaseInfo) {
-        WarehouseBaseInfo warehouseBaseInfo1=new WarehouseBaseInfo();
+        WarehouseBaseInfo warehouseBaseInfo1 = new WarehouseBaseInfo();
         Map<String, Object> pageView = new HashMap<>();
         //  公司ID
         pageView.put("compId", AuthSecurityUtils.getCurrentUserInfo().getCompId());

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

@@ -15,6 +15,7 @@ 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.plugin.base.entity.CommonBillOperateHis;
 import com.yh.saas.plugin.yiliangyiyun.entity.InOutWarehouseTask;
 import com.yh.saas.plugin.yiliangyiyun.entity.PaymentManagement;
 import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInOutInfo;
@@ -62,6 +63,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
+import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
@@ -93,6 +95,8 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
     private ICommonSysParameterService commonSysParameterService;
     @Autowired
     private INewWorkflowService workflowService;
+    @Autowired
+    private ICommonBillOperateHisService commonBillOperateHisService;
     @SofaReference
     private ICommonRoleResourceService roleResourceService;
     @Autowired
@@ -1096,6 +1100,18 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                         }
                         workflowService.activateInstance(warehousingOrder1.getWorkflowId(), warehousingOrder1.getBatchId());
                     }
+
+                    //  添加提交历史
+                    CommonBillOperateHis commonBillOperateHis = new CommonBillOperateHis();
+                    commonBillOperateHis.setBillId(warehousingOrder1.getBatchId());
+                    commonBillOperateHis.setId(IdGenerator.generateUUID());
+                    commonBillOperateHis.setBillType("WAREHOUSING-ORDER-APPROVE");
+                    commonBillOperateHis.setOperateDate(new Date());
+                    commonBillOperateHis.setOperateUser(warehousingOrder1.getCreateUserId());
+                    JSONObject jsonObject = (JSONObject) JSONObject.toJSON(warehousingOrderList);
+                    commonBillOperateHis.setBusinessHistory(jsonObject.toJSONString());
+                    commonBillOperateHisService.create(commonBillOperateHis);
+
                 }
             }
         }
@@ -1786,6 +1802,9 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
                     } else {
                         warehousingOrder1.setPrice((dataList1.get(j).getTidalGrainPrice() - dataList1.get(j).getUnitDeduction()) * 1000);
                     }
+                    BigDecimal bd=new BigDecimal(warehousingOrder1.getPrice());
+                    Double priceNew=bd.setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue();
+                    warehousingOrder1.setPrice(priceNew);
                 }
             }
         }
@@ -1805,6 +1824,7 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
             WarehouseBaseInfo warehouseBaseInfo = warehouseBaseInfoService.selectById(dataList.get(0).getBaseId());
             warehousingOrder1.setWarehouseName(dataList.get(0).getWarehouseName());
             warehousingOrder1.setIssuingTime(dataList.get(0).getIssuingTime());
+            warehousingOrder1.setUpdateDate(dataList.get(0).getUpdateDate());
             warehousingOrder1.setApproveStatus(dataList.get(0).getApproveStatus());
             warehousingOrder1.setRequestPerson(dataList.get(0).getRequestPerson());
             warehousingOrder1.setRequestDate(dataList.get(0).getRequestDate());
@@ -1851,99 +1871,115 @@ public class WarehousingOrderServiceImpl extends ServiceImpl<WarehousingOrderMap
      * @return
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public String dryOut(WarehousingOrder warehousingOrder) {
-        List<WarehousingOrder> warehousingOrderList=warehousingOrder.getWarehousingOrderList();
-        Double afterCost=0d;
-        String goodsName=warehousingOrderList.get(0).getGoodsName().replace("（潮粮）", "");
-        for (WarehousingOrder warehousingOrder1:warehousingOrderList){
-            afterCost=warehousingOrder1.getSurplusWeight()*warehousingOrder1.getAvgCost()/warehousingOrder1.getAfterWeight();
-            warehousingOrder1.setSurplusWeight(0d);
-            warehousingOrder1.setOutWarehouseWeight(warehousingOrder1.getInWarehouseWeight());
-            this.updateById(warehousingOrder1);
-            WarehousingOrder warehousingOrder2 = new WarehousingOrder();
-            warehousingOrder2.setId(IdGenerator.generateUUID());
-            warehousingOrder2.setCompId(warehousingOrder1.getCompId());
-            warehousingOrder2.setBaseId(warehousingOrder1.getBaseId());
-            warehousingOrder2.setIdentifyId(warehousingOrder1.getIdentifyId());
-            warehousingOrder2.setContractNo(warehousingOrder1.getContractNo());
-            warehousingOrder2.setMoveTaskNo(warehousingOrder1.getMoveTaskNo());
-            warehousingOrder2.setWarehouseName(warehousingOrder1.getWarehouseName());
-            warehousingOrder2.setInType("折干");
-            warehousingOrder2.setGoodsName(goodsName);
-            warehousingOrder2.setGoodsSource(warehousingOrder1.getGoodsSource());
-            warehousingOrder2.setInWarehouseWeight(warehousingOrder1.getAfterWeight());
-            warehousingOrder2.setSurplusWeight(warehousingOrder1.getAfterWeight());
-            warehousingOrder2.setIssuingTime(new Date());
-            warehousingOrder2.setAvgCost(afterCost);
-            this.insert(warehousingOrder2);
-        }
+        List<WarehousingOrder> warehousingOrderList = warehousingOrder.getWarehousingOrderList();
         CommonSysParameter commonSysParameter = commonSysParameterService.selectOne(new EntityWrapper<CommonSysParameter>().eq("const_id", "CON2").eq("const_value", warehousingOrderList.get(0).getGoodsName()));
         //减去被折转的潮粮库存
         WarehousePositionStorageInfo warehousePositionStorageInfo = warehousePositionStorageInfoService.selectOne(new EntityWrapper<WarehousePositionStorageInfo>()
                 .eq("position_id", warehousingOrder.getBeforePositionId())
                 .eq("goods_name_key", commonSysParameter.getConstKey()));
         if (warehousePositionStorageInfo != null) {
-            warehousePositionStorageInfo.setStorage(warehousePositionStorageInfo.getStorage() - warehousingOrder.getBeforeWeight());
-            warehousePositionStorageInfoService.updateById(warehousePositionStorageInfo);
+            if (warehousingOrder.getBeforeWeight() <= warehousePositionStorageInfo.getStorage()) {
+                // 更新库存量
+                warehousePositionStorageInfo.setStorage(warehousePositionStorageInfo.getStorage() - warehousingOrder.getBeforeWeight());
+                warehousePositionStorageInfoService.updateById(warehousePositionStorageInfo);
+
+                Double afterCost = 0d;
+                String goodsName = warehousingOrderList.get(0).getGoodsName().replace("（潮粮）", "");
+                for (WarehousingOrder warehousingOrder1 : warehousingOrderList) {
+                    afterCost = warehousingOrder1.getSurplusWeight() * warehousingOrder1.getAvgCost() / warehousingOrder1.getAfterWeight();
+                    warehousingOrder1.setSurplusWeight(0d);
+                    warehousingOrder1.setOutWarehouseWeight(warehousingOrder1.getInWarehouseWeight());
+                    this.updateById(warehousingOrder1);
+                    WarehousingOrder warehousingOrder2 = new WarehousingOrder();
+                    warehousingOrder2.setId(IdGenerator.generateUUID());
+                    warehousingOrder2.setCompId(warehousingOrder1.getCompId());
+                    warehousingOrder2.setBaseId(warehousingOrder1.getBaseId());
+                    warehousingOrder2.setIdentifyId(warehousingOrder1.getIdentifyId());
+                    warehousingOrder2.setContractNo(warehousingOrder1.getContractNo());
+                    warehousingOrder2.setMoveTaskNo(warehousingOrder1.getMoveTaskNo());
+                    warehousingOrder2.setWarehouseName(warehousingOrder1.getWarehouseName());
+                    warehousingOrder2.setInType("折干");
+                    warehousingOrder2.setGoodsName(goodsName);
+                    warehousingOrder2.setGoodsSource(warehousingOrder1.getGoodsSource());
+                    warehousingOrder2.setInWarehouseWeight(warehousingOrder1.getAfterWeight());
+                    warehousingOrder2.setSurplusWeight(warehousingOrder1.getAfterWeight());
+                    warehousingOrder2.setIssuingTime(new Date());
+                    warehousingOrder2.setAvgCost(afterCost);
+                    this.insert(warehousingOrder2);
+                }
+
+                WarehouseInOutInfo warehouseInOutInfo = new WarehouseInOutInfo();
+                warehouseInOutInfo.setId(IdGenerator.generateUUID());
+                warehouseInOutInfo.setBaseId(warehousingOrderList.get(0).getBaseId());
+                warehouseInOutInfo.setWarehouseName(warehousingOrderList.get(0).getWarehouseName());
+                warehouseInOutInfo.setPositionId(warehousingOrder.getBeforePositionId());
+                warehouseInOutInfo.setBinNumber(warehousingOrder.getBeforeBinNo());
+                warehouseInOutInfo.setInOutFlag("1");
+                warehouseInOutInfo.setGoodsName(warehousingOrderList.get(0).getGoodsName());
+                warehouseInOutInfo.setGoodsNameKey(commonSysParameter.getConstKey());
+                warehouseInOutInfo.setNetWeight(warehousingOrder.getBeforeWeight());
+                warehouseInOutInfo.setAgent(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getStaffName());
+                warehouseInOutInfo.setStatusFlag(StatusEnum.SUBMITTED.getFlag());
+                warehouseInOutInfo.setStatus(StatusEnum.SUBMITTED.getName());
+                warehouseInOutInfo.setInOutDate(new Date());
+                warehouseInOutInfo.setInOutType("折干出库");
+                warehouseInOutInfoService.insert(warehouseInOutInfo);
+                WarehouseInOutDetail warehouseInOutDetail = new WarehouseInOutDetail();
+                warehouseInOutDetail.setInfoId(warehouseInOutInfo.getId());
+                warehouseInOutDetail.setId(IdGenerator.generateUUID());
+                warehouseInOutDetailService.insert(warehouseInOutDetail);
+                CommonSysParameter commonSysParameter2 = commonSysParameterService.selectOne(new EntityWrapper<CommonSysParameter>().eq("const_id", "CON2").eq("const_value", goodsName));
+                WarehousePositionStorageInfo warehousePositionStorageInfo1 = warehousePositionStorageInfoService.selectOne(new EntityWrapper<WarehousePositionStorageInfo>()
+                        .eq("position_id", warehousingOrder.getAfterPositionId())
+                        .eq("goods_name_key", commonSysParameter2.getConstKey()));
+                if (warehousePositionStorageInfo1 != null) {
+                    warehousePositionStorageInfo1.setStorage(warehousePositionStorageInfo1.getStorage() + warehousingOrder.getAfterWeight());
+                    warehousePositionStorageInfoService.updateById(warehousePositionStorageInfo1);
+                } else {
+                    WarehousePositionStorageInfo warehousePositionStorageInfo2 = new WarehousePositionStorageInfo();
+                    warehousePositionStorageInfo2.setId(IdGenerator.generateUUID());
+                    warehousePositionStorageInfo2.setPositionId(warehousingOrder.getAfterPositionId());
+                    warehousePositionStorageInfo2.setBinNumber(warehousingOrder.getAfterBinNo());
+                    warehousePositionStorageInfo2.setGoodsNameKey(commonSysParameter2.getConstKey());
+                    warehousePositionStorageInfo2.setGoodsName(goodsName);
+                    warehousePositionStorageInfo2.setStorage(warehousingOrder.getAfterWeight());
+                    warehousePositionStorageInfoService.insert(warehousePositionStorageInfo2);
+                }
+                WarehouseInOutInfo warehouseInOutInfo1 = new WarehouseInOutInfo();
+                warehouseInOutInfo1.setId(IdGenerator.generateUUID());
+                warehouseInOutInfo1.setBaseId(warehouseInOutInfo.getBaseId());
+                warehouseInOutInfo1.setWarehouseName(warehouseInOutInfo.getWarehouseName());
+                warehouseInOutInfo1.setPositionId(warehousingOrder.getAfterPositionId());
+                warehouseInOutInfo1.setBinNumber(warehousingOrder.getAfterBinNo());
+                warehouseInOutInfo1.setInOutFlag("2");
+                warehouseInOutInfo1.setGoodsName(goodsName);
+                warehouseInOutInfo1.setGoodsNameKey(commonSysParameter2.getConstKey());
+                warehouseInOutInfo1.setNetWeight(warehousingOrder.getAfterWeight());
+                warehouseInOutInfo1.setAgent(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getStaffName());
+                warehouseInOutInfo1.setStatusFlag(StatusEnum.SUBMITTED.getFlag());
+                warehouseInOutInfo1.setStatus(StatusEnum.SUBMITTED.getName());
+                warehouseInOutInfo1.setInOutDate(new Date());
+                warehouseInOutInfo1.setInOutType("折转入库");
+                warehouseInOutInfoService.insert(warehouseInOutInfo1);
+                WarehouseInOutDetail warehouseInOutDetail1 = new WarehouseInOutDetail();
+                warehouseInOutDetail1.setInfoId(warehouseInOutInfo1.getId());
+                warehouseInOutDetail1.setId(IdGenerator.generateUUID());
+                warehouseInOutDetailService.insert(warehouseInOutDetail1);
+                return "ok";
+            }
+            //所选仓位库存不足
+            else {
+                throw new YException(YExceptionEnum.CONVERSION_NO_ERROR);
+            }
         }
-        WarehouseInOutInfo warehouseInOutInfo = new WarehouseInOutInfo();
-        warehouseInOutInfo.setId(IdGenerator.generateUUID());
-        warehouseInOutInfo.setBaseId(warehousingOrderList.get(0).getBaseId());
-        warehouseInOutInfo.setWarehouseName(warehousingOrderList.get(0).getWarehouseName());
-        warehouseInOutInfo.setPositionId(warehousingOrder.getBeforePositionId());
-        warehouseInOutInfo.setBinNumber(warehousingOrder.getBeforeBinNo());
-        warehouseInOutInfo.setInOutFlag("1");
-        warehouseInOutInfo.setGoodsName(warehousingOrderList.get(0).getGoodsName());
-        warehouseInOutInfo.setGoodsNameKey(commonSysParameter.getConstKey());
-        warehouseInOutInfo.setNetWeight(warehousingOrder.getBeforeWeight());
-        warehouseInOutInfo.setAgent(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getStaffName());
-        warehouseInOutInfo.setStatusFlag(StatusEnum.SUBMITTED.getFlag());
-        warehouseInOutInfo.setStatus(StatusEnum.SUBMITTED.getName());
-        warehouseInOutInfo.setInOutDate(new Date());
-        warehouseInOutInfo.setInOutType("折干出库");
-        warehouseInOutInfoService.insert(warehouseInOutInfo);
-        WarehouseInOutDetail warehouseInOutDetail = new WarehouseInOutDetail();
-        warehouseInOutDetail.setInfoId(warehouseInOutInfo.getId());
-        warehouseInOutDetail.setId(IdGenerator.generateUUID());
-        warehouseInOutDetailService.insert(warehouseInOutDetail);
-        CommonSysParameter commonSysParameter2 = commonSysParameterService.selectOne(new EntityWrapper<CommonSysParameter>().eq("const_id", "CON2").eq("const_value", goodsName));
-        WarehousePositionStorageInfo warehousePositionStorageInfo1 = warehousePositionStorageInfoService.selectOne(new EntityWrapper<WarehousePositionStorageInfo>()
-                .eq("position_id", warehousingOrder.getAfterPositionId())
-                .eq("goods_name_key", commonSysParameter2.getConstKey()));
-        if (warehousePositionStorageInfo1 != null) {
-            warehousePositionStorageInfo1.setStorage(warehousePositionStorageInfo1.getStorage() + warehousingOrder.getAfterWeight());
-            warehousePositionStorageInfoService.updateById(warehousePositionStorageInfo1);
-        } else {
-            WarehousePositionStorageInfo warehousePositionStorageInfo2 = new WarehousePositionStorageInfo();
-            warehousePositionStorageInfo2.setId(IdGenerator.generateUUID());
-            warehousePositionStorageInfo2.setPositionId(warehousingOrder.getAfterPositionId());
-            warehousePositionStorageInfo2.setBinNumber(warehousingOrder.getAfterBinNo());
-            warehousePositionStorageInfo2.setGoodsNameKey(commonSysParameter2.getConstKey());
-            warehousePositionStorageInfo2.setGoodsName(goodsName);
-            warehousePositionStorageInfo2.setStorage(warehousingOrder.getAfterWeight());
-            warehousePositionStorageInfoService.insert(warehousePositionStorageInfo2);
+        //所选仓位暂无储存量
+        else {
+            throw new YException(YExceptionEnum.POSITIONSTORAGE_NO_ERROR);
         }
-        WarehouseInOutInfo warehouseInOutInfo1 = new WarehouseInOutInfo();
-        warehouseInOutInfo1.setId(IdGenerator.generateUUID());
-        warehouseInOutInfo1.setBaseId(warehouseInOutInfo.getBaseId());
-        warehouseInOutInfo1.setWarehouseName(warehouseInOutInfo.getWarehouseName());
-        warehouseInOutInfo1.setPositionId(warehousingOrder.getAfterPositionId());
-        warehouseInOutInfo1.setBinNumber(warehousingOrder.getAfterBinNo());
-        warehouseInOutInfo1.setInOutFlag("2");
-        warehouseInOutInfo1.setGoodsName(goodsName);
-        warehouseInOutInfo1.setGoodsNameKey(commonSysParameter2.getConstKey());
-        warehouseInOutInfo1.setNetWeight(warehousingOrder.getAfterWeight());
-        warehouseInOutInfo1.setAgent(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getStaffName());
-        warehouseInOutInfo1.setStatusFlag(StatusEnum.SUBMITTED.getFlag());
-        warehouseInOutInfo1.setStatus(StatusEnum.SUBMITTED.getName());
-        warehouseInOutInfo1.setInOutDate(new Date());
-        warehouseInOutInfo1.setInOutType("折转入库");
-        warehouseInOutInfoService.insert(warehouseInOutInfo1);
-        WarehouseInOutDetail warehouseInOutDetail1 = new WarehouseInOutDetail();
-        warehouseInOutDetail1.setInfoId(warehouseInOutInfo1.getId());
-        warehouseInOutDetail1.setId(IdGenerator.generateUUID());
-        warehouseInOutDetailService.insert(warehouseInOutDetail1);
-        return "ok";
+//            warehousePositionStorageInfo.setStorage(warehousePositionStorageInfo.getStorage() - warehousingOrder.getBeforeWeight());
+//            warehousePositionStorageInfoService.updateById(warehousePositionStorageInfo);
     }
 
     private List<String> getResourceIdList() {

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/workflow/ExepenseListener.java

@@ -29,7 +29,7 @@ public class ExepenseListener extends AbstractWorkflowTaskListener {
         } else {
             expenseInfo.setApproveStatus(status);
         }
-        expenseInfoService.updateAllColumnById(expenseInfo);
+        expenseInfoService.updateById(expenseInfo);
     }
 
     @Override
@@ -41,7 +41,7 @@ public class ExepenseListener extends AbstractWorkflowTaskListener {
         expenseInfo.setStatusFlag(StatusEnum.PURCHASE_FAILED.getFlag());
         expenseInfo.setStatus(StatusEnum.PURCHASE_FAILED.getName());
         expenseInfo.setApproveStatus(null);
-        expenseInfoService.updateAllColumnById(expenseInfo);
+        expenseInfoService.updateById(expenseInfo);
 
     }
 

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

@@ -156,7 +156,7 @@
 		on b.business_code = a.business_code
 		WHERE
 		1=1
-		AND a.create_user_id = #{userId}
+		AND (lower(a.message_content) like lower(CONCAT('%',#{name},'%')))
 		<if test="searchKeyWord != null and searchKeyWord != ''">
 			AND (lower(a.message_content) like lower(CONCAT('%',#{searchKeyWord},'%'))
 			OR lower(a.create_date) like lower(CONCAT('%',#{searchKeyWord},'%')))

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yh.saas.plugin.yiliangyiyun.mapper.DryWarehouseCarMapper">
+
+</mapper>

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

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yh.saas.plugin.yiliangyiyun.mapper.DryWarehouseMapper">
+
+    <!-- 获得业务编号列表 -->
+    <select id="getListByConditions" parameterType="Map"
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.DryWarehouse">
+        SELECT dry_number from dry_warehouse
+        WHERE comp_id = #{compId}
+        <if test="numberLetter != null and numberLetter != ''">
+            <if test="date != null and date != ''">
+                <if test="warehouseNo != null and warehouseNo != ''">
+                    AND (lower(dry_number) like lower(CONCAT('%',#{numberLetter}, + #{date}, + #{warehouseNo},'%')))
+                </if>
+            </if>
+        </if>
+        ORDER BY dry_number DESC
+    </select>
+
+
+</mapper>

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

@@ -95,4 +95,12 @@
             LIMIT ${startRecord}, ${pageSize}
         </if>
     </select>
+    <select id="getNumByCondition" parameterType="Map" resultType="java.lang.Integer">
+        SELECT
+            COUNT(id)
+        FROM general_audit_info
+        WHERE
+            comp_id = #{compId}
+          and create_date > #{year}
+    </select>
 </mapper>

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

@@ -180,6 +180,7 @@
         w.create_user_id as createUserId,
         w.approve_status as approveStatus,
         wor.batch_id as batchId,
+        w.update_date as updateDate,
         w.issuing_time as issuingTime
         FROM warehousing_order_record wor
         left join warehousing_order w on wor.order_id = w.id and w.delete_flag = '0'