diff --git a/pom.xml b/pom.xml
index 6d2e104..5b5c387 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,6 @@
jar
zg
- http://www.zg.vip
智慧实物管理系统
diff --git a/src/main/java/com/zg/project/wisdom/controller/GysJhController.java b/src/main/java/com/zg/project/wisdom/controller/GysJhController.java
index 6a86dd4..6a18030 100644
--- a/src/main/java/com/zg/project/wisdom/controller/GysJhController.java
+++ b/src/main/java/com/zg/project/wisdom/controller/GysJhController.java
@@ -33,7 +33,7 @@ public class GysJhController extends BaseController
@Autowired
private IGysJhService gysJhService;
- /**A
+ /**
* 查询供应计划列表
*/
@PreAuthorize("@ss.hasPermi('plan:jh:list')")
@@ -52,10 +52,8 @@ public class GysJhController extends BaseController
*/
// @PreAuthorize("@ss.hasPermi('plan:jh:list')")
@GetMapping("/getBySapNo")
- public AjaxResult getBySapNo(String sapNo)
- {
- List list = gysJhService.getBySapNo(sapNo);
- return success(list);
+ public AjaxResult getBySapNo(@RequestParam String sapNo) {
+ return gysJhService.getBySapNo(sapNo);
}
/**
diff --git a/src/main/java/com/zg/project/wisdom/controller/RkInfoController.java b/src/main/java/com/zg/project/wisdom/controller/RkInfoController.java
index a59a9e6..f88fdc2 100644
--- a/src/main/java/com/zg/project/wisdom/controller/RkInfoController.java
+++ b/src/main/java/com/zg/project/wisdom/controller/RkInfoController.java
@@ -6,11 +6,10 @@ import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import com.github.pagehelper.PageHelper;
+import com.zg.common.utils.StringUtils;
import com.zg.project.wisdom.domain.dto.*;
import com.zg.project.wisdom.domain.vo.DeliveryBillVO;
-import com.zg.project.wisdom.domain.vo.PcodeQtyVO;
import com.zg.project.wisdom.service.QwenOcrRemoteService;
-import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -117,7 +116,7 @@ public class RkInfoController extends BaseController
{
List list = rkInfoService.selectRkInfoList(rkInfo);
ExcelUtil util = new ExcelUtil(RkInfo.class);
- util.exportExcel(response, list, "库存单据主数据");
+ util.exportExcel(response, list, "数据导出");
}
/**
@@ -152,6 +151,19 @@ public class RkInfoController extends BaseController
return toAjax(rkInfoService.updateRkInfo(rkInfo));
}
+ /**
+ * 根据出库单据号修改库存单据
+ */
+ @PreAuthorize("@ss.hasPermi('wisdom:stock:edit')")
+ @Log(title = "库存单据-按出库单号修改", businessType = BusinessType.UPDATE)
+ @PostMapping("/updateByBillNoCk")
+ public AjaxResult updateByBillNoCk(@RequestBody RkInfo rkInfo) {
+ if (StringUtils.isBlank(rkInfo.getBillNoCk())) {
+ return AjaxResult.error("出库单据号 billNoCk 不能为空");
+ }
+ return toAjax(rkInfoService.updateRkInfoByBillNoCk(rkInfo));
+ }
+
/**
* 删除库存单据主
*/
diff --git a/src/main/java/com/zg/project/wisdom/domain/GysJh.java b/src/main/java/com/zg/project/wisdom/domain/GysJh.java
index 270371c..a42af5a 100644
--- a/src/main/java/com/zg/project/wisdom/domain/GysJh.java
+++ b/src/main/java/com/zg/project/wisdom/domain/GysJh.java
@@ -1,6 +1,9 @@
package com.zg.project.wisdom.domain;
import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.zg.framework.aspectj.lang.annotation.Excel;
@@ -77,7 +80,7 @@ public class GysJh extends BaseEntity
private String dw;
/** 0：未到货，1：已入库，2部分入库 */
- @Excel(name = "0：未到货，1：已入库，2部分入库")
+ @Excel(name = "0：未到货,1：已入库,2部分入库")
private String status;
/** 身份码 */
@@ -89,9 +92,17 @@ public class GysJh extends BaseEntity
private String remark;
/** 是否删除（0正常 1删除） */
- @Excel(name = "是否删除", readConverterExp = "0=正常,1=删除")
+// @Excel(name = "是否删除", readConverterExp = "0=正常,1=删除")
private String isDelete;
+ /** 查询开始时间（yyyy-MM-dd HH:mm:ss） */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date beginTime;
+
+ /** 查询结束时间（yyyy-MM-dd HH:mm:ss） */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date endTime;
+
public void setId(Long id)
{
this.id = id;
@@ -278,6 +289,23 @@ public class GysJh extends BaseEntity
return isDelete;
}
+
+ public Date getBeginTime() {
+ return beginTime;
+ }
+
+ public void setBeginTime(Date beginTime) {
+ this.beginTime = beginTime;
+ }
+
+ public Date getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(Date endTime) {
+ this.endTime = endTime;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
diff --git a/src/main/java/com/zg/project/wisdom/domain/RkInfo.java b/src/main/java/com/zg/project/wisdom/domain/RkInfo.java
index 8905c48..80975ca 100644
--- a/src/main/java/com/zg/project/wisdom/domain/RkInfo.java
+++ b/src/main/java/com/zg/project/wisdom/domain/RkInfo.java
@@ -29,8 +29,12 @@ public class RkInfo extends BaseEntity {
@TableField(exist = false)
private List ids;
+ /** 是否已出库（0已入库，1已出库，2待审批，3借料出库，4入库撤销，5出库撤销） */
+ @Excel(name = "库存状态", readConverterExp = "0=已入库,1=已出库,2=待审批,3=借料出库,4=入库撤销,5=出库撤销")
+ private String isChuku;
+
/** 供应计划ID（对应供应计划表主键） */
- @Excel(name = "供应计划ID")
+// @Excel(name = "供应计划ID")
private Long gysJhId;
/** 审批人ID（非数据库字段） */
@@ -70,7 +74,7 @@ public class RkInfo extends BaseEntity {
/** 所属大仓编码 */
@TableField(exist = false)
- @Excel(name = "所属大仓编码")
+// @Excel(name = "所属大仓编码")
private String parentWarehouseCode;
/** 所属大仓名称 */
@@ -111,10 +115,6 @@ public class RkInfo extends BaseEntity {
/** 理货员名称（联查显示用，导出专用） */
private String lihuoYName;
- /** 是否已出库（0已入库，1已出库，2待审批，3借料出库，4入库撤销，5出库撤销） */
- @Excel(name = "是否已出库", readConverterExp = "0已入库，1已出库，2待审批，3借料出库，4入库撤销，5出库撤销")
- private String isChuku;
-
/** 单据号 */
@Excel(name = "单据号")
private String billNo;
@@ -124,11 +124,11 @@ public class RkInfo extends BaseEntity {
private String billNoCk;
/** 是否需要配送(0否 1是 2配送中 3配送完成) */
- @Excel(name = "是否需要配送", readConverterExp = "0=否,1=是,2=配送中,3=配送完成")
+// @Excel(name = "是否需要配送", readConverterExp = "0=否,1=是,2=配送中,3=配送完成")
private String isDelivery;
/** 县局 */
- @Excel(name = "县局")
+// @Excel(name = "县局")
private String xj;
/** 项目号 */
@@ -139,10 +139,10 @@ public class RkInfo extends BaseEntity {
@Excel(name = "库存项目描述")
private String xmMs;
- @Excel(name = "领取方项目号")
+// @Excel(name = "领取方项目号")
private String xmNoCk;
- @Excel(name = "领取方项目描述")
+// @Excel(name = "领取方项目描述")
private String xmMsCk;
/** 物料号 */
@@ -174,7 +174,7 @@ public class RkInfo extends BaseEntity {
private String sapNo;
/** 行号 */
- @Excel(name = "行号")
+// @Excel(name = "行号")
private String xh;
/** 计划交货数量 */
@@ -198,7 +198,7 @@ public class RkInfo extends BaseEntity {
private String pcode;
/** 库位主键ID（pcde_detail.id） */
- @Excel(name = "库位主键ID")
+// @Excel(name = "库位主键ID")
private String pcodeId;
/** 托盘码 */
@@ -206,7 +206,7 @@ public class RkInfo extends BaseEntity {
private String trayCode;
/** 实物ID */
- @Excel(name = "实物ID")
+// @Excel(name = "实物ID")
private String entityId;
/** 一货一图 - 货物照片URL（非表字段） */
@@ -227,21 +227,21 @@ public class RkInfo extends BaseEntity {
private String teamName;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "领用时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "出库时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date lyTime;
@Excel(name = "出库备注")
private String ckRemark;
- @Excel(name = "出库备注")
+// @Excel(name = "审核状态")
private String status;
/** 是否移库过（0否 1是） */
- @Excel(name = "是否移库过")
+// @Excel(name = "是否移库过")
private String hasMoved;
/** 是否借料（0否 1是 2已归还） */
- @Excel(name = "是否借料", readConverterExp = "0=否,1=是,2=已归还")
+// @Excel(name = "是否借料", readConverterExp = "0=否,1=是,2=已归还")
private String isBorrowed;
/** 签字图片URL（image_type = sign，非表字段） */
diff --git a/src/main/java/com/zg/project/wisdom/domain/dto/RefundRequestDTO.java b/src/main/java/com/zg/project/wisdom/domain/dto/RefundRequestDTO.java
index 4332f22..25720fd 100644
--- a/src/main/java/com/zg/project/wisdom/domain/dto/RefundRequestDTO.java
+++ b/src/main/java/com/zg/project/wisdom/domain/dto/RefundRequestDTO.java
@@ -14,6 +14,9 @@ public class RefundRequestDTO {
/** 新库位码 */
private String pcode;
+ /** 新仓库 */
+ private String warehouseCode;
+
/** 入库类型 */
private String rkType;
}
diff --git a/src/main/java/com/zg/project/wisdom/mapper/RkInfoMapper.java b/src/main/java/com/zg/project/wisdom/mapper/RkInfoMapper.java
index 8513d8b..0224a61 100644
--- a/src/main/java/com/zg/project/wisdom/mapper/RkInfoMapper.java
+++ b/src/main/java/com/zg/project/wisdom/mapper/RkInfoMapper.java
@@ -34,12 +34,12 @@ public interface RkInfoMapper
/**
* 使用 selectRkInfoVo 作为子查询，外层按 bill_no 分组聚合
- * 不新增 resultMap / VO，直接用 RkInfoResult 映射需要的字段
*/
List selectGroupedByBill(@Param("q") RkInfoQueryDTO query,
@Param("needAudit") Integer needAudit);
+
/**
* 修改库存单据主
*
@@ -48,6 +48,14 @@ public interface RkInfoMapper
*/
public int updateRkInfo(RkInfo rkInfo);
+ /**
+ * 根据出库单据号更新库存单据
+ *
+ * @param rkInfo 库存单据
+ * @return 影响行数
+ */
+ int updateByBillNoCk(RkInfo rkInfo);
+
/**
* 删除库存单据主
*
@@ -107,7 +115,7 @@ public interface RkInfoMapper
List selectTopOverdueStock(@Param("limit") int limit);
/**
- * 出库操作
+ *
* @param update
*/
void updateById(RkInfo update);
@@ -230,6 +238,7 @@ public interface RkInfoMapper
Long selectPcde(RkInfo query);
+
int updateBillInfo(RkInfo query);
/**
diff --git a/src/main/java/com/zg/project/wisdom/service/IGysJhService.java b/src/main/java/com/zg/project/wisdom/service/IGysJhService.java
index 8a5d50e..670667a 100644
--- a/src/main/java/com/zg/project/wisdom/service/IGysJhService.java
+++ b/src/main/java/com/zg/project/wisdom/service/IGysJhService.java
@@ -1,6 +1,8 @@
package com.zg.project.wisdom.service;
import java.util.List;
+
+import com.zg.framework.web.domain.AjaxResult;
import com.zg.project.wisdom.domain.GysJh;
import com.zg.project.wisdom.domain.dto.ExcelFieldMapping;
import org.springframework.web.multipart.MultipartFile;
@@ -74,7 +76,7 @@ public interface IGysJhService
* @param sapNo
* @return
*/
- List getBySapNo(String sapNo);
+ AjaxResult getBySapNo(String sapNo);
/**
* 按字段映射导入供应计划
diff --git a/src/main/java/com/zg/project/wisdom/service/IRkInfoService.java b/src/main/java/com/zg/project/wisdom/service/IRkInfoService.java
index 2fdf2e2..69ea005 100644
--- a/src/main/java/com/zg/project/wisdom/service/IRkInfoService.java
+++ b/src/main/java/com/zg/project/wisdom/service/IRkInfoService.java
@@ -46,6 +46,14 @@ public interface IRkInfoService
*/
public int updateRkInfo(RkInfo rkInfo);
+ /**
+ * 根据出库单据号修改库存单据
+ *
+ * @param rkInfo 库存单据
+ * @return 影响行数
+ */
+ int updateRkInfoByBillNoCk(RkInfo rkInfo);
+
/**
* 批量删除库存单据主
*
@@ -164,6 +172,7 @@ public interface IRkInfoService
Long selectPcde(RkInfo query);
+
public int updateBillInfo(RkInfo rkInfo);
/**
diff --git a/src/main/java/com/zg/project/wisdom/service/impl/GysJhServiceImpl.java b/src/main/java/com/zg/project/wisdom/service/impl/GysJhServiceImpl.java
index bd2cf50..09873dd 100644
--- a/src/main/java/com/zg/project/wisdom/service/impl/GysJhServiceImpl.java
+++ b/src/main/java/com/zg/project/wisdom/service/impl/GysJhServiceImpl.java
@@ -8,6 +8,7 @@ import com.zg.common.exception.ServiceException;
import com.zg.common.utils.DateUtils;
import com.zg.common.utils.SecurityUtils;
import com.zg.common.utils.StringUtils;
+import com.zg.framework.web.domain.AjaxResult;
import com.zg.project.wisdom.domain.dto.ExcelFieldMapping;
import org.apache.poi.ss.usermodel.*;
import org.springframework.beans.factory.annotation.Autowired;
@@ -162,11 +163,40 @@ public class GysJhServiceImpl implements IGysJhService
* @return
*/
@Override
- public List getBySapNo(String sapNo) {
- return gysJhMapper.getBySapNo(sapNo);
+ public AjaxResult getBySapNo(String sapNo) {
+
+ List list = gysJhMapper.getBySapNo(sapNo);
+
+ AjaxResult result = AjaxResult.success(list);
+
+ if (list == null || list.isEmpty()) {
+ return result;
+ }
+
+ // 找出已入库(status=1)的物料号，去重、过滤空值
+ List inStockWlNos = list.stream()
+ .filter(x -> x != null && "1".equals(String.valueOf(x.getStatus()).trim()))
+ .map(GysJh::getWlNo)
+ .filter(wlNo -> wlNo != null && !wlNo.trim().isEmpty())
+ .map(String::trim)
+ .distinct()
+ .collect(java.util.stream.Collectors.toList());
+
+ if (!inStockWlNos.isEmpty()) {
+ result.put("warn", true);
+ result.put("inStockWlNos", inStockWlNos);
+
+ // 组装提示文案（可根据前端展示需要调整长度）
+ String msg = "该 SAP 订单号下，以下物料号已入库过，请注意："
+ + String.join("、", inStockWlNos);
+ result.put("msg", msg);
+ }
+
+ return result;
}
+
@Override
@Transactional(rollbackFor = Exception.class)
public int importByMapping(MultipartFile file, List mapping) throws Exception {
diff --git a/src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java b/src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java
index 7c2d56c..497dc51 100644
--- a/src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java
+++ b/src/main/java/com/zg/project/wisdom/service/impl/RkInfoServiceImpl.java
@@ -2,6 +2,8 @@ package com.zg.project.wisdom.service.impl;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
+import java.time.Duration;
+import java.time.Instant;
import java.time.LocalDate;
import java.time.ZoneId;
import java.time.temporal.ChronoUnit;
@@ -181,6 +183,7 @@ public class RkInfoServiceImpl implements IRkInfoService
boolean needAudit = "1".equals(configService.selectConfigByKey("rk.audit.enabled"));
// 直接传给 Mapper；不改 DTO 结构，走多参数方式
return rkInfoMapper.selectGroupedByBill(query, needAudit ? 1 : 0);
+// return rkInfoMapper.selectGroupedByBillSimple(query);
}
@Override
@@ -233,6 +236,42 @@ public class RkInfoServiceImpl implements IRkInfoService
return rkInfoMapper.updateRkInfo(rkInfo);
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public int updateRkInfoByBillNoCk(RkInfo rkInfo) {
+
+ // ====== 基础校验 ======
+ if (StringUtils.isBlank(rkInfo.getBillNoCk())) {
+ throw new ServiceException("出库单据号 billNoCk 不能为空");
+ }
+
+ // 通用审计字段
+ rkInfo.setUpdateTime(DateUtils.getNowDate());
+ rkInfo.setUpdateBy(SecurityUtils.getUserId().toString());
+
+ // ====== 仓库 + 库位校验（保持与你 updateRkInfo 完全一致） ======
+ String warehouseCode = rkInfo.getWarehouseCode();
+ if (StringUtils.isBlank(warehouseCode)) {
+ warehouseCode = rkInfo.getCangku();
+ }
+ String pcode = rkInfo.getPcode();
+
+ if (StringUtils.isNotBlank(warehouseCode) && StringUtils.isNotBlank(pcode)) {
+ PcRkInfoBatchDTO tmpDto = new PcRkInfoBatchDTO();
+ tmpDto.setWarehouseCode(warehouseCode);
+
+ PcRkInfoItemDTO item = new PcRkInfoItemDTO();
+ item.setPcode(pcode);
+
+ tmpDto.setRkList(Collections.singletonList(item));
+ validateWarehouseAndPcode(tmpDto);
+ }
+
+ // ====== 按 bill_no_ck 批量更新 ======
+ return rkInfoMapper.updateByBillNoCk(rkInfo);
+ }
+
+
/**
* 批量处理撤销入库 / 撤销出库的逻辑（不是通用删除接口）
*
@@ -1237,8 +1276,6 @@ public class RkInfoServiceImpl implements IRkInfoService
@Override
public int refundMaterial(RefundRequestDTO dto) {
Long originalId = dto.getOriginalId();
- String newPcode = dto.getPcode();
-
// 1. 查原出库记录
RkInfo original = rkInfoMapper.selectRkInfoById(originalId);
if (original == null || "1".equals(original.getIsDelete())) {
@@ -1250,9 +1287,11 @@ public class RkInfoServiceImpl implements IRkInfoService
BeanUtils.copyProperties(original, newEntry);
newEntry.setId(null);
newEntry.setIsChuku("0");
- newEntry.setPcode(newPcode);
+ newEntry.setPcode(dto.getPcode());
+ newEntry.setCangku(dto.getWarehouseCode());
newEntry.setRkType(dto.getRkType());
newEntry.setRkTime(DateUtils.getNowDate());
+ newEntry.setBorrowTime(original.getBorrowTime());
newEntry.setBillNo(BillNoUtil.generateTodayBillNo("RK", rkInfoMapper));
newEntry.setCreateBy(SecurityUtils.getUserId().toString());
newEntry.setCreateTime(DateUtils.getNowDate());
@@ -1270,6 +1309,8 @@ public class RkInfoServiceImpl implements IRkInfoService
update.setReturnTime(DateUtils.getNowDate());
update.setUpdateBy(getUsername());
update.setUpdateTime(DateUtils.getNowDate());
+ update.setPcode(dto.getPcode());
+ update.setCangku(dto.getWarehouseCode());
rkInfoMapper.updateById(update);
return rows;
@@ -1331,10 +1372,20 @@ public class RkInfoServiceImpl implements IRkInfoService
return rkInfoMapper.listRkInfoByPcode(pcode);
}
-
@Override
public List selectAllRkInfo(RkInfo query) {
- return rkInfoMapper.selectAllRkInfo(query);
+
+ List list = rkInfoMapper.selectAllRkInfo(query);
+
+ Instant now = Instant.now();
+ for (RkInfo ri : list) {
+ Date rkTime = ri.getRkTime();
+ if (rkTime != null) {
+ long days = Duration.between(rkTime.toInstant(), now).toDays();
+ ri.setStockAge(days);
+ }
+ }
+ return list;
}
@Override
@@ -1346,6 +1397,7 @@ public class RkInfoServiceImpl implements IRkInfoService
public Long selectPcde(RkInfo query) {
return rkInfoMapper.selectPcde(query);
}
+
@Override
public int updateBillInfo(RkInfo query) {
return rkInfoMapper.updateBillInfo(query);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index fb74471..09ed352 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -188,7 +188,7 @@ mqtt:
# MQTT 客户端 ID（在 EMQX 中唯一）
# 建议：系统名 + 模块名，避免重复
- clientId: zg-wms-backend
+ clientId: zg-wms-backend-test
# MQTT 账号（EMQX Dashboard 中配置）
username: demo02
diff --git a/src/main/resources/mybatis/wisdom/GysJhMapper.xml b/src/main/resources/mybatis/wisdom/GysJhMapper.xml
index 3986c36..41bb082 100644
--- a/src/main/resources/mybatis/wisdom/GysJhMapper.xml
+++ b/src/main/resources/mybatis/wisdom/GysJhMapper.xml
@@ -59,11 +59,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and status = #{status}
- and (status is null or trim(status) != '1')
-
+
and is_delete = #{isDelete}
+
+
+ and create_time =]]> #{beginTime}
+
+
+ and create_time #{endTime}
+
@@ -75,7 +81,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
diff --git a/src/main/resources/mybatis/wisdom/RkInfoMapper.xml b/src/main/resources/mybatis/wisdom/RkInfoMapper.xml
index 2a8e3d6..d077a75 100644
--- a/src/main/resources/mybatis/wisdom/RkInfoMapper.xml
+++ b/src/main/resources/mybatis/wisdom/RkInfoMapper.xml
@@ -181,7 +181,7 @@
sap_no, xh, jh_qty, ht_qty, dw, real_qty,
pcode, tray_code, entity_id,
ck_lihuo_y, ck_type, team_code, ck_remark,
- ly_time, bill_no_ck, has_moved,
+ ly_time, bill_no_ck, has_moved, borrow_time,
gys_jh_id,
status,
create_by, create_time, update_by, update_time, is_delete
@@ -192,7 +192,7 @@
#{sapNo}, #{xh}, #{jhQty}, #{htQty}, #{dw}, #{realQty},
#{pcode}, #{trayCode}, #{entityId},
#{ckLihuoY}, #{ckType}, #{teamCode}, #{ckRemark},
- #{lyTime}, #{billNoCk}, #{hasMoved},
+ #{lyTime}, #{billNoCk}, #{hasMoved}, #{borrowTime},
#{gysJhId},
#{status},
#{createBy}, #{createTime}, #{updateBy}, #{updateTime}, #{isDelete}
@@ -870,6 +870,42 @@
WHERE id = #{id}
+
+ UPDATE rk_info
+
+ rk_type = #{rkType},
+ wl_type = #{wlType},
+
+ cangku = #{cangku},
+
+ rk_time = #{rkTime},
+ lihuo_y = #{lihuoY},
+ is_chuku = #{isChuku},
+ is_borrowed = #{isBorrowed},
+
+ remark = #{remark},
+ xm_no_ck = #{xmNoCk},
+ xm_ms_ck = #{xmMsCk},
+
+ ck_lihuo_y = #{ckLihuoY},
+ ck_type = #{ckType},
+ team_code = #{teamCode},
+ ck_remark = #{ckRemark},
+
+ ly_time = #{lyTime},
+ borrow_time = #{borrowTime},
+ return_time = #{returnTime},
+
+ is_delivery = #{isDelivery},
+ has_moved = #{hasMoved},
+
+ update_by = #{updateBy},
+ update_time = #{updateTime},
+
+ WHERE bill_no_ck = #{billNoCk}
+ AND is_delete = '0'
+
+
update rk_info
@@ -905,6 +941,8 @@
ly_time = #{lyTime},
borrow_time = #{borrowTime},
return_time = #{returnTime},
+ pcode = #{pcode},
+ cangku = #{cangku},
status = #{status},
real_qty = #{realQty},
@@ -988,10 +1026,20 @@
(ri.is_delete = '0' OR ri.is_delete = 0 OR ri.is_delete IS NULL)
-
+
+ AND ri.is_chuku IN
+
+ #{item}
+
+
+
AND ri.is_chuku = #{isChuku}
-
AND ri.cangku = #{warehouseCode}
@@ -1214,7 +1262,6 @@
-