出入库逻辑修改

src/main/java/com/zg/project/wisdom/controller/RkInfoController.java

@@ -38,8 +38,8 @@ public class RkInfoController extends BaseController
      * 查询库存单据主列表
      */
     @PreAuthorize("@ss.hasPermi('wisdom:stock:list')")
-    @GetMapping("/list")
+    @PostMapping("/list")
-    public TableDataInfo list(RkInfo rkInfo)
+    public TableDataInfo list(@RequestBody RkInfo rkInfo)
     {
         startPage();
         List<RkInfo> list = rkInfoService.selectRkInfoList(rkInfo);

src/main/java/com/zg/project/wisdom/domain/GysJh.java

@@ -83,6 +83,14 @@ public class GysJh extends BaseEntity
     @Excel(name = "0：未到货，1：已入库")
     private String status;
 
+    /** 身份码 */
+    @Excel(name = "身份码")
+    private String entityId;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remark;
+
     /** 是否删除（0正常 1删除） */
     @Excel(name = "是否删除", readConverterExp = "0=正常,1=删除")
     private String isDelete;
@@ -257,6 +265,26 @@ public class GysJh extends BaseEntity
         return status;
     }
 
+    public void setEntityId(String entityId)
+    {
+        this.entityId = entityId;
+    }
+
+    public String getEntityId()
+    {
+        return entityId;
+    }
+
+    public void setRemark(String remark)
+    {
+        this.remark = remark;
+    }
+
+    public String getRemark()
+    {
+        return remark;
+    }
+
     public void setIsDelete(String isDelete) 
     {
         this.isDelete = isDelete;
@@ -287,6 +315,7 @@ public class GysJh extends BaseEntity
             .append("htQty", getHtQty())
             .append("dw", getDw())
             .append("status", getStatus())
+            .append("entityId", getEntityId())
             .append("remark", getRemark())
             .append("createBy", getCreateBy())
             .append("createTime", getCreateTime())

src/main/java/com/zg/project/wisdom/domain/RkInfo.java

@@ -34,6 +34,10 @@ public class RkInfo extends BaseEntity
     @Excel(name = "供应计划ID")
     private Long gysJhId;
 
+    /** 审批人ID（非数据库字段） */
+    @TableField(exist = false)
+    private String approverId;
+
     /** 库龄 */
     private Long stockAge;
 
@@ -249,6 +253,14 @@ public class RkInfo extends BaseEntity
     public void setGysJhId(Long gysJhId) {
         this.gysJhId = gysJhId;
     }
+
+    public String getApproverId() {
+        return approverId;
+    }
+
+    public void setApproverId(String approverId) {
+        this.approverId = approverId;
+    }
     public Long getStockAge() { return stockAge; }
     public void setStockAge(Long stockAge) { this.stockAge = stockAge; }
     public String getRkType() { return rkType; }
@@ -424,6 +436,7 @@ public class RkInfo extends BaseEntity
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
                 .append("id", getId())
                 .append("gysJhId", getGysJhId())
+                .append("approverId", getApproverId())
                 .append("rkType", getRkType())
                 .append("wlType", getWlType())
                 .append("cangku", getCangku())

src/main/java/com/zg/project/wisdom/domain/dto/RkInfoBatchDTO.java

@@ -6,9 +6,6 @@ import java.util.List;
 @Data
 public class RkInfoBatchDTO {
 
-    /** 供应商计划ID */
-    private Long gysJhId;
-
     /** 审核人用户ID */
     private String approverId;
 

src/main/java/com/zg/project/wisdom/domain/dto/RkInfoItemDTO.java

@@ -11,9 +11,6 @@ import java.util.List;
 @Data
 public class RkInfoItemDTO {
 
-    /** 供应计划主键ID */
-    private Long gysJhId;
-
     /** SAP物料号（数据库字段 wl_no） */
     private String wlNo;
 

src/main/java/com/zg/project/wisdom/mapper/GysJhMapper.java

@@ -1,5 +1,7 @@
 package com.zg.project.wisdom.mapper;
 
+import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
@@ -96,6 +98,19 @@ public interface GysJhMapper
      * 批量修改状态
      * @param
      */
-    void batchUpdateStatusByIds(@Param("idSet") Set<Long> idSet);
+    void batchUpdateStatusByIds(@Param("ids") Set<Long> ids);
 
+    /**
+     * 根据id批量查询
+     * @param
+     * @return
+     */
+    List<GysJh> selectByIds(@Param("ids") List<Long> ids);
+
+    /**
+     * 根据id修改
+     * @param
+     * @param realQty
+     */
+    void decreaseJhQtyById(@Param("id") Long id, @Param("realQty") BigDecimal realQty);
 }

src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java

@@ -1,5 +1,6 @@
 package com.zg.project.wisdom.service.impl;
 
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.ZoneId;
@@ -19,6 +20,7 @@ import com.zg.project.Inventory.domain.vo.ChartDataVO;
 import com.zg.project.Inventory.domain.vo.PcdeCntVO;
 import com.zg.project.system.service.ISysConfigService;
 import com.zg.project.wisdom.domain.AuditSignature;
+import com.zg.project.wisdom.domain.GysJh;
 import com.zg.project.wisdom.domain.dto.*;
 import com.zg.project.wisdom.mapper.AuditSignatureMapper;
 import com.zg.project.wisdom.mapper.GysJhMapper;
@@ -95,27 +97,33 @@ public class RkInfoServiceImpl implements IRkInfoService
                 info.setStockAge(days);
             }
 
-            // 查询现场图片 + 审核结果（image_type = '1'）
+            // 查询现场图片 + 审核结果
             AuditSignature signature = auditSignatureMapper.selectPhotoUrlByRkId(info.getId());
             if (signature != null) {
                 info.setScenePhotoUrl(signature.getSignUrl());
                 info.setAuditResult(signature.getAuditResult());
+                info.setApproverId(signature.getApproverId());
             } else {
                 info.setScenePhotoUrl(null);
                 info.setAuditResult(null);
+                info.setApproverId(null);
             }
         }
 
-        // 审核开启，过滤掉未通过的（只有 auditResult = '1' 保留）
+        // 审核开启，过滤掉审核结果不是“通过” 且 审核人不为空（说明是审核失败）
         if (needAudit) {
             list = list.stream()
-                    .filter(info -> "1".equals(info.getAuditResult()))
+                    .filter(info ->
+                            // ① 未审核过（approverId 为空）或
+                            info.getApproverId() == null ||
+                                    // ② 审核通过
+                                    "1".equals(info.getAuditResult())
+                    )
                     .collect(Collectors.toList());
         }
 
         return list;
     }
-
     /**
      * 修改库存单据主
      *
@@ -126,6 +134,7 @@ public class RkInfoServiceImpl implements IRkInfoService
     public int updateRkInfo(RkInfo rkInfo)
     {
         rkInfo.setUpdateTime(DateUtils.getNowDate());
+        rkInfo.setUpdateBy(SecurityUtils.getUserId().toString());
         return rkInfoMapper.updateRkInfo(rkInfo);
     }
 
@@ -164,14 +173,50 @@ public class RkInfoServiceImpl implements IRkInfoService
         String billNo = BillNoUtil.generateTodayBillNo("RK");
         List<PcRkInfoItemDTO> list = dto.getRkList();
         List<RkInfo> rkInfos = new ArrayList<>();
+        List<AuditSignature> records = new ArrayList<>();
 
         boolean needAudit = "1".equals(configService.selectConfigByKey("rk.audit.enabled"));
         String userId = SecurityUtils.getUserId().toString();
         Date now = DateUtils.getNowDate();
 
-        List<AuditSignature> records = new ArrayList<>();
+        // ✅ 第1步：构建 gysJhId -> realQty 映射
+        Map<Long, BigDecimal> realQtyMap = list.stream()
+                .filter(item -> item.getGysJhId() != null && item.getRealQty() != null)
+                .collect(Collectors.toMap(
+                        PcRkInfoItemDTO::getGysJhId,
+                        PcRkInfoItemDTO::getRealQty,
+                        (a, b) -> b
+                ));
 
-        // ✅ 第一步：构造 RkInfo 列表（包含 gysJhId）
+        // ✅ 第2步：查询对应供应计划
+        List<GysJh> jhList = gysJhMapper.selectByIds(new ArrayList<>(realQtyMap.keySet()));
+        Set<Long> idsToUpdateStatus = new HashSet<>();
+
+        // ✅ 第3步：更新 jh_qty 和 status（根据是否开启审核判断逻辑）
+        for (GysJh jh : jhList) {
+            Long jhId = jh.getId();
+            BigDecimal planQty = BigDecimal.valueOf(jh.getJhQty());
+            BigDecimal realQty = realQtyMap.get(jhId);
+            if (realQty == null) continue;
+
+            boolean isEqual = realQty.compareTo(planQty) == 0;
+
+            if (!isEqual) {
+                gysJhMapper.decreaseJhQtyById(jhId, realQty);
+                idsToUpdateStatus.add(jhId);
+            } else {
+                if (!needAudit) {
+                    idsToUpdateStatus.add(jhId);
+                }
+            }
+        }
+
+        // ✅ 第4步：批量更新 status = 2
+        if (!idsToUpdateStatus.isEmpty()) {
+            gysJhMapper.batchUpdateStatusByIds(idsToUpdateStatus);
+        }
+
+        // ✅ 第5步：构建 RkInfo 入库记录
         for (PcRkInfoItemDTO item : list) {
             RkInfo rk = new RkInfo();
             BeanUtils.copyProperties(item, rk);
@@ -184,12 +229,11 @@ public class RkInfoServiceImpl implements IRkInfoService
             rk.setCreateBy(userId);
             rk.setCreateTime(now);
             rk.setIsDelete("0");
-
+            rk.setGysJhId(item.getGysJhId());
-            rk.setGysJhId(item.getGysJhId()); // ✅ 正确设置 gysJhId
 
             if (needAudit) {
                 rk.setStatus("0");     // 待审核
-                rk.setIsChuku("2");    // 待入库（审核中）
+                rk.setIsChuku("2");    // 待入库
             } else {
                 rk.setStatus("1");     // 审核通过
                 rk.setIsChuku("0");    // 已入库
@@ -198,10 +242,10 @@ public class RkInfoServiceImpl implements IRkInfoService
             rkInfos.add(rk);
         }
 
-        // ✅ 第二步：批量保存入库记录
+        // ✅ 第6步：保存入库记录
         rkInfoMapper.batchInsertRkInfo(rkInfos);
 
-        // ✅ 第三步：构造照片记录（审核开启时）
+        // ✅ 第7步：照片记录（审核开启时）
         for (int i = 0; i < rkInfos.size(); i++) {
             RkInfo rk = rkInfos.get(i);
             PcRkInfoItemDTO item = list.get(i);
@@ -214,7 +258,7 @@ public class RkInfoServiceImpl implements IRkInfoService
                 photo.setAuditResult("2");
                 photo.setSignerId(userId);
                 photo.setSignerRole("2");
-                photo.setImageType("1"); // 现场图
+                photo.setImageType("1");
                 photo.setSignUrl(item.getPhotoUrl());
                 photo.setSignTime(now);
                 photo.setPcode(item.getPcode());
@@ -228,7 +272,7 @@ public class RkInfoServiceImpl implements IRkInfoService
             }
         }
 
-        // ✅ 第四步：审核开启时添加发起人签字记录
+        // ✅ 第8步：发起人签字记录（审核开启时）
         if (needAudit) {
             boolean hasOldSign = auditSignatureMapper.existsCurrentSigner(billNo, "0");
             if (hasOldSign) {
@@ -239,10 +283,10 @@ public class RkInfoServiceImpl implements IRkInfoService
             mainSign.setBillNo(billNo);
             mainSign.setBillType("0");
             mainSign.setSignerId(userId);
-            mainSign.setSignerRole("0"); // 发起人
+            mainSign.setSignerRole("0");
             mainSign.setApproverId(dto.getApproverId());
             mainSign.setSignUrl(dto.getSignatureUrl());
-            mainSign.setImageType("0"); // 签字图
+            mainSign.setImageType("0");
             mainSign.setSignTime(now);
             mainSign.setIsCurrent("1");
             mainSign.setAuditResult("2");
@@ -251,24 +295,10 @@ public class RkInfoServiceImpl implements IRkInfoService
             mainSign.setCreateTime(now);
             records.add(mainSign);
 
-            if (!records.isEmpty()) {
             auditSignatureMapper.batchInsert(records);
         }
     }
 
-        // ✅ 第五步：如果审核关闭，立即批量更新供应计划状态
-        if (!needAudit) {
-            Set<Long> jhIdSet = list.stream()
-                    .map(PcRkInfoItemDTO::getGysJhId)
-                    .filter(Objects::nonNull)
-                    .collect(Collectors.toSet());
-
-            if (!jhIdSet.isEmpty()) {
-                gysJhMapper.batchUpdateStatusByIds(jhIdSet);
-            }
-        }
-    }
-
     /**
      * 新增入库单据（APP）
      * @param dto
@@ -288,12 +318,55 @@ public class RkInfoServiceImpl implements IRkInfoService
         boolean needAudit = "1".equals(configService.selectConfigByKey("rk.audit.enabled"));
         String billNo = BillNoUtil.generateTodayBillNo("RK");
 
-        // ✅ 第一步：构造入库数据列表
+        // ✅ 第1步：构造 gysJhId → realQty 的映射（从 scanList 中提取）
+        Map<Long, BigDecimal> realQtyMap = new HashMap<>();
         for (RkInfoItemDTO item : dto.getRkList()) {
-            List<RkInfoScanDTO> scanList = item.getScanList();
+            if (item.getScanList() == null) continue;
-            if (scanList == null || scanList.isEmpty()) continue;
+            for (RkInfoScanDTO scan : item.getScanList()) {
+                Long jhId = scan.getGysJhId();
+                BigDecimal realQty = scan.getRealQty();
+                if (jhId != null && realQty != null) {
+                    realQtyMap.put(jhId, realQty); // ✅ 一物一图场景，每个 jhId 只有一条 scan 数据
+                }
+            }
+        }
 
-            for (RkInfoScanDTO scan : scanList) {
+        // ✅ 第2步：更新 gys_jh 的 jh_qty 与 status
+        Set<Long> idsToUpdateStatus = new HashSet<>();
+        List<Long> allJhIds = new ArrayList<>(realQtyMap.keySet());
+
+        if (!allJhIds.isEmpty()) {
+            List<GysJh> jhList = gysJhMapper.selectByIds(allJhIds);
+            for (GysJh jh : jhList) {
+                Long jhId = jh.getId();
+                BigDecimal planQty = BigDecimal.valueOf(jh.getJhQty());
+                BigDecimal realQty = realQtyMap.get(jhId);
+                if (realQty == null) continue;
+
+                boolean isEqual = realQty.compareTo(planQty) == 0;
+
+                if (!isEqual) {
+                    // 数量不相等，减数量 + 状态设为 2
+                    gysJhMapper.decreaseJhQtyById(jhId, realQty);
+                    idsToUpdateStatus.add(jhId);
+                } else {
+                    if (!needAudit) {
+                        // 审核关闭且数量相等，仅更新状态
+                        idsToUpdateStatus.add(jhId);
+                    }
+                }
+            }
+        }
+
+        if (!idsToUpdateStatus.isEmpty()) {
+            gysJhMapper.batchUpdateStatusByIds(idsToUpdateStatus);
+        }
+
+        // ✅ 第3步：构建 RkInfo 入库实体
+        for (RkInfoItemDTO item : dto.getRkList()) {
+            if (item.getScanList() == null) continue;
+
+            for (RkInfoScanDTO scan : item.getScanList()) {
                 RkInfo entity = new RkInfo();
                 entity.setRkType(dto.getRkType());
                 entity.setWlType(dto.getWlType());
@@ -307,7 +380,6 @@ public class RkInfoServiceImpl implements IRkInfoService
                 entity.setJhQty(item.getJhQty());
                 entity.setHtQty(item.getHtQty());
                 entity.setJhAmt(item.getJhAmt());
-                entity.setGysJhId(item.getGysJhId());
                 entity.setHtDj(item.getHtDj());
                 entity.setDw(item.getDw());
                 entity.setWlNo(item.getWlNo());
@@ -320,6 +392,7 @@ public class RkInfoServiceImpl implements IRkInfoService
                 entity.setRealQty(scan.getRealQty());
                 entity.setEntityId(scan.getEntityId());
                 entity.setRemark(scan.getRemark());
+                entity.setGysJhId(scan.getGysJhId());
                 entity.setIsDelete("0");
                 entity.setRkTime(now);
                 entity.setCreateBy(userId);
@@ -327,7 +400,7 @@ public class RkInfoServiceImpl implements IRkInfoService
 
                 if (needAudit) {
                     entity.setStatus("0");   // 待审核
-                    entity.setIsChuku("2"); // 待入库（审核中）
+                    entity.setIsChuku("2"); // 待入库
                 } else {
                     entity.setStatus("1");   // 审核通过
                     entity.setIsChuku("0"); // 已入库
@@ -335,37 +408,31 @@ public class RkInfoServiceImpl implements IRkInfoService
 
                 saveList.add(entity);
             }
-
-            if (!needAudit && item.getGysJhId() != null) {
-                gysJhMapper.updateStatusById(item.getGysJhId());
-            }
         }
 
         if (saveList.isEmpty()) {
             throw new ServiceException("未提取到任何可保存的数据");
         }
 
-        // ✅ 第二步：批量插入入库数据，回填主键ID
+        // ✅ 第4步：批量插入入库记录
         rkInfoMapper.batchInsertRkInfo(saveList);
 
-        // ✅ 第三步：处理签字与照片记录（仅启用审核时）
+        // ✅ 第5步：若开启审核，写入签字与照片信息
         if (needAudit) {
             List<AuditSignature> recordList = new ArrayList<>();
-
-            // 检查是否重新提交，旧记录置为非当前
             boolean isResubmit = auditSignatureMapper.existsCurrentSigner(billNo, "0");
             if (isResubmit) {
                 auditSignatureMapper.updateIsCurrentToZero(billNo, "0");
             }
 
-            // ✅ 1. 添加发起人签字图记录
+            // 发起人签字记录
             AuditSignature mainSign = new AuditSignature();
             mainSign.setBillNo(billNo);
             mainSign.setBillType("0");
             mainSign.setSignerId(userId);
-            mainSign.setSignerRole("0"); // 发起人
+            mainSign.setSignerRole("0");
             mainSign.setSignUrl(dto.getSignatureUrl());
-            mainSign.setImageType("0");  // 签字图
+            mainSign.setImageType("0");
             mainSign.setSignTime(now);
             mainSign.setApproverId(dto.getApproverId());
             mainSign.setAuditResult("2");
@@ -375,24 +442,21 @@ public class RkInfoServiceImpl implements IRkInfoService
             mainSign.setCreateTime(now);
             recordList.add(mainSign);
 
-            // ✅ 2. 绑定每条 rkInfo 与对应 scanList 的 photoUrl
+            // 现场照片记录
             int index = 0;
             for (RkInfoItemDTO item : dto.getRkList()) {
-                List<RkInfoScanDTO> scanList = item.getScanList();
+                if (item.getScanList() == null) continue;
-                if (scanList == null || scanList.isEmpty()) continue;
+                for (RkInfoScanDTO scan : item.getScanList()) {
-
-                for (RkInfoScanDTO scan : scanList) {
                     RkInfo rk = saveList.get(index++);
-
                     if (StringUtils.isNotBlank(scan.getPhotoUrl())) {
                         AuditSignature photo = new AuditSignature();
                         photo.setBillNo(billNo);
                         photo.setBillType("0");
                         photo.setRkId(rk.getId());
                         photo.setSignerId(userId);
-                        photo.setSignerRole("2"); // 拍照人
+                        photo.setSignerRole("2");
                         photo.setSignUrl(scan.getPhotoUrl());
-                        photo.setImageType("1"); // 现场图
+                        photo.setImageType("1");
                         photo.setSignTime(now);
                         photo.setApproverId(dto.getApproverId());
                         photo.setIsCurrent("1");
@@ -407,7 +471,6 @@ public class RkInfoServiceImpl implements IRkInfoService
                 }
             }
 
-            // ✅ 3. 批量写入 audit_signature
             if (!recordList.isEmpty()) {
                 auditSignatureMapper.batchInsert(recordList);
             }
@@ -500,10 +563,18 @@ public class RkInfoServiceImpl implements IRkInfoService
 
             if (needAudit) {
                 update.setStatus("3"); // 出库待审核
-                update.setIsChuku("2");
+                if ("JLCK".equals(dto.getCkType())) {
+                    update.setIsChuku("3"); // 借料出库（待审核）
+                } else {
+                    update.setIsChuku("2"); // 普通出库待审核
+                }
             } else {
-                update.setIsChuku("1");
                 update.setStatus("1"); // 审核通过
+                if ("JLCK".equals(dto.getCkType())) {
+                    update.setIsChuku("3"); // 借料出库（已审核）
+                } else {
+                    update.setIsChuku("1"); // 普通出库已审核
+                }
             }
 
             rkInfoMapper.updateById(update);

src/main/resources/mybatis/wisdom/GysJhMapper.xml

@@ -22,6 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="htQty"    column="ht_qty"    />
         <result property="dw"    column="dw"    />
         <result property="status"    column="status"    />
+        <result property="entityId" column="entity_id" />
         <result property="remark"    column="remark"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -31,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectGysJhVo">
-        select id, index_no, xj, xm_no, xm_ms, wl_no, wl_ms, gys_no, gys_mc, jh_amt, ht_dj, sap_no, xh, jh_qty, ht_qty, dw, status, remark, create_by, create_time, update_by, update_time, is_delete from gys_jh
+        select id, index_no, xj, xm_no, xm_ms, wl_no, wl_ms, gys_no, gys_mc, jh_amt, ht_dj, sap_no, xh, jh_qty, ht_qty, dw, status,entity_id, remark, create_by, create_time, update_by, update_time, is_delete from gys_jh
     </sql>
 
     <select id="selectGysJhList" parameterType="GysJh" resultMap="GysJhResult">
@@ -54,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getBySapNo" parameterType="java.lang.String" resultMap="GysJhResult">
         <include refid="selectGysJhVo"/>
         WHERE sap_no = #{sapNo}
-        AND status = '0'
+        AND status != '1'
     </select>
 
     <select id="existsByUniqueKeys" resultType="boolean">
@@ -63,7 +64,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE sap_no = #{sapNo}
           AND xm_no = #{xmNo}
           AND wl_no = #{wlNo}
-          AND is_delete = '0'
+          AND is_delete != '1'
+    </select>
+
+    <select id="selectByIds" resultMap="GysJhResult">
+        SELECT * FROM gys_jh
+        WHERE id IN
+        <foreach collection="ids" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
     </select>
 
     <insert id="insertGysJh" parameterType="GysJh" useGeneratedKeys="true" keyProperty="id">
@@ -85,6 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="htQty != null">ht_qty,</if>
             <if test="dw != null">dw,</if>
             <if test="status != null">status,</if>
+            <if test="entityId != null">entity_id,</if>
             <if test="remark != null">remark,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -109,6 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="htQty != null">#{htQty},</if>
             <if test="dw != null">#{dw},</if>
             <if test="status != null">#{status},</if>
+            <if test="entityId != null">#{entityId},</if>
             <if test="remark != null">#{remark},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -137,6 +148,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="htQty != null">ht_qty = #{htQty},</if>
             <if test="dw != null">dw = #{dw},</if>
             <if test="status != null">status = #{status},</if>
+            <if test="entityId != null">entity_id = #{entityId},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
@@ -164,13 +176,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="batchUpdateStatusByIds">
         UPDATE gys_jh
-        SET status = '1'
+        SET status = '2'
         WHERE id IN
-        <foreach collection="idSet" item="id" open="(" separator="," close=")">
+        <foreach collection="ids" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
     </update>
 
+    <update id="decreaseJhQtyById">
+        UPDATE gys_jh
+        SET jh_qty = jh_qty - #{realQty}
+        WHERE id = #{id}
+    </update>
+
     <delete id="deleteGysJhById" parameterType="Long">
         delete from gys_jh where id = #{id}
     </delete>

src/main/resources/mybatis/wisdom/RkInfoMapper.xml

@@ -166,10 +166,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectRkInfoList" parameterType="RkInfo" resultMap="RkInfoResult">
         <include refid="selectRkInfoVo"/>
         <where>
-            <!-- and is_chuku = '0' -->
             <if test="isChuku != null and isChuku != ''">
                 and is_chuku = #{isChuku}
             </if>
+
             <if test="keyword != null and keyword != ''">
                 and (
                 xm_no like concat('%', #{keyword}, '%')
@@ -180,48 +180,112 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 or gys_mc like concat('%', #{keyword}, '%')
                 or sap_no like concat('%', #{keyword}, '%')
                 or bill_no like concat('%', #{keyword}, '%')
+                or bill_no_ck like concat('%', #{keyword}, '%')
                 or ck_type like concat('%', #{keyword}, '%')
                 or pcode like concat('%', #{keyword}, '%')
                 )
             </if>
-            <if test="rkType != null  and rkType != ''"> and rk_type = #{rkType}</if>
+
-            <if test="wlType != null  and wlType != ''"> and wl_type = #{wlType}</if>
+            <if test="rkType != null and rkType != ''">
-            <if test="cangku != null  and cangku != ''"> and cangku = #{cangku}</if>
+                and rk_type like concat('%', #{rkType}, '%')
+            </if>
+            <if test="wlType != null and wlType != ''">
+                and wl_type like concat('%', #{wlType}, '%')
+            </if>
+            <if test="cangku != null and cangku != ''">
+                and cangku like concat('%', #{cangku}, '%')
+            </if>
+
             <if test="ids != null and ids.size > 0">
                 AND ri.id IN
                 <foreach collection="ids" item="id" open="(" separator="," close=")">
                     #{id}
                 </foreach>
             </if>
+
             <if test="startTime != null">
                 <![CDATA[ and rk_time >= #{startTime} ]]>
             </if>
             <if test="endTime != null">
                 <![CDATA[ and rk_time <= #{endTime} ]]>
             </if>
-            <if test="lihuoY != null  and lihuoY != ''"> and lihuo_y = #{lihuoY}</if>
+
-            <if test="xj != null  and xj != ''"> and xj = #{xj}</if>
+            <if test="lihuoY != null and lihuoY != ''">
-            <if test="billNo != null and billNo != ''"> and bill_no = #{billNo}</if>
+                and lihuo_y like concat('%', #{lihuoY}, '%')
-            <if test="xmNo != null  and xmNo != ''"> and xm_no = #{xmNo}</if>
+            </if>
-            <if test="xmMs != null  and xmMs != ''"> and xm_ms = #{xmMs}</if>
+            <if test="xj != null and xj != ''">
-            <if test="wlNo != null  and wlNo != ''"> and wl_no = #{wlNo}</if>
+                and xj like concat('%', #{xj}, '%')
-            <if test="wlMs != null  and wlMs != ''"> and wl_ms = #{wlMs}</if>
+            </if>
-            <if test="gysNo != null  and gysNo != ''"> and gys_no = #{gysNo}</if>
+            <if test="billNo != null and billNo != ''">
-            <if test="gysMc != null  and gysMc != ''"> and gys_mc = #{gysMc}</if>
+                and bill_no like concat('%', #{billNo}, '%')
-            <if test="jhAmt != null "> and jh_amt = #{jhAmt}</if>
+            </if>
-            <if test="htDj != null "> and ht_dj = #{htDj}</if>
+            <if test="billNoCk != null and billNoCk != ''">
-            <if test="sapNo != null  and sapNo != ''"> and sap_no = #{sapNo}</if>
+                and bill_no_ck like concat('%', #{billNoCk}, '%')
-            <if test="xh != null  and xh != ''"> and xh = #{xh}</if>
+            </if>
-            <if test="jhQty != null "> and jh_qty = #{jhQty}</if>
+            <if test="xmNo != null and xmNo != ''">
-            <if test="htQty != null "> and ht_qty = #{htQty}</if>
+                and xm_no like concat('%', #{xmNo}, '%')
-            <if test="dw != null  and dw != ''"> and dw = #{dw}</if>
+            </if>
-            <if test="realQty != null "> and real_qty = #{realQty}</if>
+            <if test="xmMs != null and xmMs != ''">
-            <if test="pcode != null  and pcode != ''"> and pcode = #{pcode}</if>
+                and xm_ms like concat('%', #{xmMs}, '%')
-            <if test="lyTime != null"> and ri.ly_time = #{lyTime}</if>
+            </if>
-            <if test="returnTime != null"> and ri.return_time = #{returnTime}</if>
+            <if test="wlNo != null and wlNo != ''">
-            <if test="trayCode != null  and trayCode != ''"> and tray_code = #{trayCode}</if>
+                and wl_no like concat('%', #{wlNo}, '%')
-            <if test="entityId != null  and entityId != ''"> and entity_id = #{entityId}</if>
+            </if>
-            <if test="ckType != null  and ckType != ''"> and ck_type = #{ckType}</if>
+            <if test="wlMs != null and wlMs != ''">
+                and wl_ms like concat('%', #{wlMs}, '%')
+            </if>
+            <if test="gysNo != null and gysNo != ''">
+                and gys_no like concat('%', #{gysNo}, '%')
+            </if>
+            <if test="gysMc != null and gysMc != ''">
+                and gys_mc like concat('%', #{gysMc}, '%')
+            </if>
+
+            <if test="jhAmt != null">
+                and jh_amt = #{jhAmt}
+            </if>
+            <if test="htDj != null">
+                and ht_dj = #{htDj}
+            </if>
+
+            <if test="sapNo != null and sapNo != ''">
+                and sap_no like concat('%', #{sapNo}, '%')
+            </if>
+            <if test="xh != null and xh != ''">
+                and xh like concat('%', #{xh}, '%')
+            </if>
+            <if test="jhQty != null">
+                and jh_qty = #{jhQty}
+            </if>
+            <if test="htQty != null">
+                and ht_qty = #{htQty}
+            </if>
+            <if test="dw != null and dw != ''">
+                and dw like concat('%', #{dw}, '%')
+            </if>
+            <if test="realQty != null">
+                and real_qty = #{realQty}
+            </if>
+
+            <if test="pcode != null and pcode != ''">
+                and pcode like concat('%', #{pcode}, '%')
+            </if>
+            <if test="lyTime != null">
+                and ri.ly_time = #{lyTime}
+            </if>
+            <if test="returnTime != null">
+                and ri.return_time = #{returnTime}
+            </if>
+            <if test="trayCode != null and trayCode != ''">
+                and tray_code like concat('%', #{trayCode}, '%')
+            </if>
+            <if test="entityId != null and entityId != ''">
+                and entity_id like concat('%', #{entityId}, '%')
+            </if>
+            <if test="ckType != null and ckType != ''">
+                and ck_type like concat('%', #{ckType}, '%')
+            </if>
+
             <if test="isDelete != null and isDelete != ''">
                 and ri.is_delete = #{isDelete}
             </if>