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

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

@@ -128,11 +128,9 @@ public enum StatusEnum {
     //付款管理状态
     TO_BE_SETTLED("1", "待结算", "to_be_settled"),
 
-
-    TO_BE_TRADERETURN("1", "待还款", "to_be_tradereturn"),
-
     //贸易仓单状态
-    RETURN_TRADE_WAREHOUSE_RECEIPT("0", "已退回", "return_trade_warehouse_receipt"),
+    TO_BE_TRADERETURN("3", "待还款", "to_be_tradereturn"),
+    RETURN_TRADE_WAREHOUSE_RECEIPT("0", "已驳回", "return_trade_warehouse_receipt"),
 
     ;
     @Getter

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

@@ -300,6 +300,21 @@ public class WarehouseInOutInfo extends BaseModel<WarehouseInOutInfo> {
     @TableField(exist = false)
     private String searchType;
 
+    /**
+     * 开始时间
+     */
+    @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;
+
     /**
      * 质检员
      */

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

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.winsea.svc.base.base.entity.CommonDepartment;
 import com.winsea.svc.base.base.util.DateUtils;
 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.service.ICommonBillOperateHisService;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
@@ -72,6 +74,8 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
     @Autowired
     private INewWorkflowService workflowService;
     @Autowired
+    private INoticeService noticeService;
+    @Autowired
     private IPriceConfirmationSheetService priceConfirmationSheetService;
     @Value("${file-root-path}")
     private String localPath;
@@ -691,6 +695,9 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
         if (contractManagementInfo != null) {
             //合同信息
             this.deleteById(contractManagementInfo.getId());
+            // 先删除任务
+            noticeService.removeNotice(BaseNotice.NoticeStatus.TASK, "BUY-CONTRACT-APPROVE",
+                    contractManagementInfo.getId(), null);
             //货物信息
             ContractGoodsInfo contractGoodsInfo = contractGoodsInfoService.selectOne(new EntityWrapper<ContractGoodsInfo>().eq(ContractGoodsInfo.QueryFiles.CONTRACT_ID, id));
             //流程信息

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

@@ -53,6 +53,7 @@ public class RepaymentManagementServiceImpl extends ServiceImpl<RepaymentManagem
         //公司id
         pageView.put("compId", repaymentManagement.getCompId());
         pageView.put("tradeWarehouseReceiptId", repaymentManagement.getTradeWarehouseReceiptId());
+        pageView.put("contractNo", repaymentManagement.getContractNo());
         pageView.put("pageSize", repaymentManagement.getPageSize());
         pageView.put("currentPage", repaymentManagement.getCurrentPage());
         // 查询还款总数

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

@@ -1262,6 +1262,8 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
         pageView.put("baseId", warehouseInOutInfo.getBaseId());
         //  仓位ID
         pageView.put("positionId", warehouseInOutInfo.getPositionId());
+        pageView.put("startDate", warehouseInOutInfo.getStartDate());
+        pageView.put("endDate", warehouseInOutInfo.getEndDate());
         pageView.put("pcFlag", warehouseInOutInfo.getPcFlag());
         pageView.put("statusFlag", warehouseInOutInfo.getStatusFlag());
         pageView.put("searchType", warehouseInOutInfo.getSearchType());

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

@@ -3,9 +3,7 @@ package com.yh.saas.plugin.yiliangyiyun.workflow;
 import com.yh.saas.common.support.workflow.AbstractWorkflowTaskListener;
 import com.yh.saas.common.support.workflow.annotation.WorkflowTaskListener;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
-import com.yh.saas.plugin.yiliangyiyun.entity.SaleOrder;
 import com.yh.saas.plugin.yiliangyiyun.entity.TradeWarehouseReceiptAppl;
-import com.yh.saas.plugin.yiliangyiyun.service.ISaleOrderService;
 import com.yh.saas.plugin.yiliangyiyun.service.ITradeWarehouseReceiptApplService;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -40,8 +38,8 @@ public class TradeServicesListener extends AbstractWorkflowTaskListener {
         if (tradeWarehouseReceiptAppl == null) {
             return;
         }
-        tradeWarehouseReceiptAppl.setStatusFlag(StatusEnum.TASK_RETURN.getFlag());
-        tradeWarehouseReceiptAppl.setStatus(StatusEnum.TASK_RETURN.getName());
+        tradeWarehouseReceiptAppl.setStatusFlag(StatusEnum.RETURN_TRADE_WAREHOUSE_RECEIPT.getFlag());
+        tradeWarehouseReceiptAppl.setStatus(StatusEnum.RETURN_TRADE_WAREHOUSE_RECEIPT.getName());
         tradeWarehouseReceiptAppl.setApproveStatus(null);
         tradeWarehouseReceiptApplService.updateAllColumnById(tradeWarehouseReceiptAppl);
 

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

@@ -9,6 +9,9 @@
         WHERE
         comp_id = #{compId}
         and delete_flag = '0'
+        <if test="contractNo != null and contractNo != ''">
+            AND contract_no = #{contractNo}
+        </if>
     </select>
     <!-- 获得还款管理列表 -->
     <select id="getListByCondition" parameterType="Map"
@@ -27,6 +30,9 @@
         WHERE
         comp_id = #{compId}
         and delete_flag = '0'
+        <if test="contractNo != null and contractNo != ''">
+            AND contract_no = #{contractNo}
+        </if>
         ORDER BY create_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}

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

@@ -30,6 +30,20 @@
                 and wbi.person_phone = ${phone}
             </if>
         </if>
+        <if test="startDate != null">
+            AND (DATE_FORMAT(in_out_date,"%Y%m%d") &gt;=
+            DATE_FORMAT(#{startDate},"%Y%m%d"))
+        </if>
+        <if test="endDate != null">
+            AND (DATE_FORMAT(in_out_date,"%Y%m%d") &lt;=
+            DATE_FORMAT(#{endDate},"%Y%m%d"))
+        </if>
+        <if test="baseId != null and baseId != ''">
+            AND base_id = #{baseId}
+        </if>
+        <if test="positionId != null and positionId != ''">
+            AND position_id = #{positionId}
+        </if>
         <if test="statusFlag != null and statusFlag != ''">
             AND w.status_flag = #{statusFlag}
         </if>
@@ -108,6 +122,20 @@
              and wbi.person_phone = ${phone}
          </if>
         </if>
+        <if test="startDate != null">
+            AND (DATE_FORMAT(in_out_date,"%Y%m%d") &gt;=
+            DATE_FORMAT(#{startDate},"%Y%m%d"))
+        </if>
+        <if test="endDate != null">
+            AND (DATE_FORMAT(in_out_date,"%Y%m%d") &lt;=
+            DATE_FORMAT(#{endDate},"%Y%m%d"))
+        </if>
+        <if test="baseId != null and baseId != ''">
+            AND base_id = #{baseId}
+        </if>
+        <if test="positionId != null and positionId != ''">
+            AND position_id = #{positionId}
+        </if>
         <if test="statusFlag != null and statusFlag != ''">
             AND w.status_flag = #{statusFlag}
         </if>