diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsGoodsSJDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsGoodsSJDto.java
index 75cc68d6a7..9f2e8ee2f5 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsGoodsSJDto.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsGoodsSJDto.java
@@ -20,4 +20,7 @@ public class AppOldPartsGoodsSJDto implements Dto {
private String houseCode;
@ApiModelProperty("数量")
private BigDecimal count;
+
+ @ApiModelProperty("图号")
+ private String goodsCode;
}
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsScanVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsScanVo.java
index c029594dd9..e2d93baca2 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsScanVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/as/oldparts/AppOldPartsScanVo.java
@@ -26,4 +26,7 @@ public class AppOldPartsScanVo implements Vo {
private String houseName;
@ApiModelProperty("仓库地址")
private String houseAddress;
+
+ @ApiModelProperty("图号")
+ private String goodsCode;
}
diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/oldparts/AppOldPartsService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/oldparts/AppOldPartsService.java
index 741a86db2f..333c24d676 100644
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/oldparts/AppOldPartsService.java
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/oldparts/AppOldPartsService.java
@@ -190,6 +190,7 @@ public class AppOldPartsService {
wmsBusrepairInventorybillDetailOldApp.setGoodsID(appOldPartsGoodsSJDto.getGoodsID());
wmsBusrepairInventorybillDetailOldApp.setWarehouseRackCode(appOldPartsGoodsSJDto.getHouseCode());
wmsBusrepairInventorybillDetailOldApp.setCount(appOldPartsGoodsSJDto.getCount());
+ wmsBusrepairInventorybillDetailOldApp.setGoodsCode(appOldPartsGoodsSJDto.getGoodsCode());
wmsBusrepairInventorybillDetailOldApps.add(wmsBusrepairInventorybillDetailOldApp);
}
wmsOldGroundConfirmApp.setOldList(wmsBusrepairInventorybillDetailOldApps);
@@ -222,6 +223,7 @@ public class AppOldPartsService {
appOldPartsScanVo.setGoodsID(content);
appOldPartsScanVo.setGoodsName(asBusrepairInventorybillDetail.getGoodsSkuTitle());
appOldPartsScanVo.setGoodsMax(chae.setScale(0,BigDecimal.ROUND_DOWN).toString());
+ appOldPartsScanVo.setGoodsCode(asBusrepairInventorybillDetail.getGoodsSkuCode());
} else if ("1".equals(type)) {//库位码
if (!content.contains("#")) {
return rb.setMsg("请扫描库位码");
diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldinventory/WmsBusrepairInventorybillDetailOldApp.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldinventory/WmsBusrepairInventorybillDetailOldApp.java
index 77aa4f407b..c72c8ee331 100644
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldinventory/WmsBusrepairInventorybillDetailOldApp.java
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/fegin/wmsoldinventory/WmsBusrepairInventorybillDetailOldApp.java
@@ -14,4 +14,6 @@ public class WmsBusrepairInventorybillDetailOldApp {
private String warehouseRackCode;
@ApiModelProperty("出/退库数量")
private BigDecimal count;
+
+ private String goodsCode;
}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandle.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandle.java
index 9a0fd513c1..85a9dd90ee 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandle.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandle.java
@@ -33,30 +33,17 @@ import lombok.Data;
import java.math.BigDecimal;
-/**
- * Project: yxt-as(旧件处理申请)
- * File: AsOldparthandle.java
- * Class: com.yxt.anrui.as.api.asoldparthandle.AsOldparthandle
- * Description: 处理旧件列表.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-04-23 17:56:59
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Data
@ApiModel(value = "处理旧件列表", description = "处理旧件列表")
@TableName("as_oldparthandle")
public class AsOldparthandle extends BaseEntity {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("主表sid")
+ @ApiModelProperty("主表sid")
private String mainSid; // 主表sid
- @ApiModelProperty("车架号")
+ @ApiModelProperty("车架号")
private String vinNo; // 车架号
- @ApiModelProperty("商品ID")
+ @ApiModelProperty("商品ID")
private String goodsID; // 商品ID
@ApiModelProperty("商品spuSid")
private String goodsSpuSid;
@@ -74,21 +61,25 @@ public class AsOldparthandle extends BaseEntity {
private String manufacturerSid;
@ApiModelProperty("厂家名称")
private String manufacturerName;
- @ApiModelProperty("单位")
+ @ApiModelProperty("单位")
private String unit; // 单位
@ApiModelProperty("供应商sid")
private String supplierSid;
@ApiModelProperty("供应商名称")
private String supplierName;
- @ApiModelProperty("仓库sid")
+ @ApiModelProperty("仓库sid")
private String warehouseSid; // 仓库sid
- @ApiModelProperty("仓库名称")
+ @ApiModelProperty("仓库名称")
private String warehouseName; // 仓库名称
- @ApiModelProperty("库位sid")
+ @ApiModelProperty("库区sid")
+ private String warehouseAreaSid;
+ @ApiModelProperty("库区名称")
+ private String warehouseAreaName;
+ @ApiModelProperty("库位sid")
private String warehouseRackSid; // 库位sid
- @ApiModelProperty("库位编码")
+ @ApiModelProperty("库位编码")
private String warehouseRackCode; // 库位编码
- @ApiModelProperty("数量")
+ @ApiModelProperty("数量")
private BigDecimal count; // 数量
@ApiModelProperty("收益金额")
private BigDecimal profit;
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDetailsVo.java
index 24b64bfd29..dac9f3e33c 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDetailsVo.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDetailsVo.java
@@ -25,7 +25,6 @@
*********************************************************/
package com.yxt.anrui.as.api.asoldparthandle;
-
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
@@ -34,28 +33,15 @@ import lombok.Data;
import java.math.BigDecimal;
-/**
- * Project: yxt-as(旧件处理申请)
- * File: AsOldparthandleVo.java
- * Class: com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleVo
- * Description: 处理旧件列表 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-04-23 17:56:59
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Data
@ApiModel(value = "处理旧件列表 视图数据详情", description = "处理旧件列表 视图数据详情")
public class AsOldparthandleDetailsVo implements Vo {
private String sid; // sid
- @ApiModelProperty("主表sid")
+ @ApiModelProperty("主表sid")
private String mainSid; // 主表sid
- @ApiModelProperty("车架号")
+ @ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("商品ID")
private String goodsID; // 商品ID
@@ -81,15 +67,19 @@ public class AsOldparthandleDetailsVo implements Vo {
private String supplierSid;
@ApiModelProperty("供应商名称")
private String supplierName;
- @ApiModelProperty("仓库sid")
+ @ApiModelProperty("仓库sid")
private String warehouseSid; // 仓库sid
- @ApiModelProperty("仓库名称")
+ @ApiModelProperty("仓库名称")
private String warehouseName; // 仓库名称
- @ApiModelProperty("库位sid")
+ @ApiModelProperty("库区sid")
+ private String warehouseAreaSid;
+ @ApiModelProperty("库区名称")
+ private String warehouseAreaName;
+ @ApiModelProperty("库位sid")
private String warehouseRackSid; // 库位sid
- @ApiModelProperty("库位编码")
+ @ApiModelProperty("库位编码")
private String warehouseRackCode; // 库位编码
- @ApiModelProperty("数量")
+ @ApiModelProperty("数量")
private BigDecimal count; // 数量
@ApiModelProperty("收益金额")
private BigDecimal profit;
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDto.java
index 64910eb183..ed6d0dae02 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDto.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldparthandle/AsOldparthandleDto.java
@@ -25,7 +25,6 @@
*********************************************************/
package com.yxt.anrui.as.api.asoldparthandle;
-
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
@@ -34,28 +33,15 @@ import lombok.Data;
import java.math.BigDecimal;
-/**
- * Project: yxt-as(旧件处理申请)
- * File: AsOldparthandleDto.java
- * Class: com.yxt.anrui.as.api.asoldparthandle.AsOldparthandleDto
- * Description: 处理旧件列表 数据传输对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-04-23 17:56:59
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Data
@ApiModel(value = "处理旧件列表 数据传输对象", description = "处理旧件列表 数据传输对象")
public class AsOldparthandleDto implements Dto {
private String sid; // sid
- @ApiModelProperty("主表sid")
+ @ApiModelProperty("主表sid")
private String mainSid; // 主表sid
- @ApiModelProperty("车架号")
+ @ApiModelProperty("车架号")
private String vinNo; // 车架号
@ApiModelProperty("商品ID")
private String goodsID; // 商品ID
@@ -81,15 +67,19 @@ public class AsOldparthandleDto implements Dto {
private String supplierSid;
@ApiModelProperty("供应商名称")
private String supplierName;
- @ApiModelProperty("仓库sid")
+ @ApiModelProperty("仓库sid")
private String warehouseSid; // 仓库sid
- @ApiModelProperty("仓库名称")
+ @ApiModelProperty("仓库名称")
private String warehouseName; // 仓库名称
- @ApiModelProperty("库位sid")
+ @ApiModelProperty("库区sid")
+ private String warehouseAreaSid;
+ @ApiModelProperty("库区名称")
+ private String warehouseAreaName;
+ @ApiModelProperty("库位sid")
private String warehouseRackSid; // 库位sid
- @ApiModelProperty("库位编码")
+ @ApiModelProperty("库位编码")
private String warehouseRackCode; // 库位编码
- @ApiModelProperty("数量")
+ @ApiModelProperty("数量")
private BigDecimal count; // 数量
@ApiModelProperty("收益金额")
private BigDecimal profit;
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturn/AsOldpartreturnDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturn/AsOldpartreturnDetailsVo.java
index 6c04ea718f..f2b2508736 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturn/AsOldpartreturnDetailsVo.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturn/AsOldpartreturnDetailsVo.java
@@ -25,30 +25,13 @@
*********************************************************/
package com.yxt.anrui.as.api.asoldpartreturn;
-
-import com.yxt.anrui.as.api.asoldpartreturndetail.AsOldpartreturnDetailDetailsVo;
import com.yxt.common.core.vo.Vo;
-
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
-import java.util.List;
-/**
- * Project: anrui-as(旧件返厂)
- * File: AsOldpartreturnVo.java
- * Class: com.yxt.anrui.as.api.asoldpartreturn.AsOldpartreturnVo
- * Description: 返厂旧件列表 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-04-17 10:29:50
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Data
@ApiModel(value = "返厂旧件列表 视图数据详情", description = "返厂旧件列表 视图数据详情")
public class AsOldpartreturnDetailsVo implements Vo {
@@ -85,8 +68,8 @@ public class AsOldpartreturnDetailsVo implements Vo {
private String claimBillNo;
@ApiModelProperty("是否迟返(1是0否)")
private String isCf;
- @ApiModelProperty("需返厂数量")
+ @ApiModelProperty("需返厂数量")
private BigDecimal needReturnCount; // 需返厂数量
- @ApiModelProperty("实际返厂数量")
+ @ApiModelProperty("实际返厂数量")
private BigDecimal actualReturnCount; // 实际返厂数量
}
\ No newline at end of file
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnapply/AsOldpartreturnApplyQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnapply/AsOldpartreturnApplyQuery.java
index be0e743fd8..fc27b2ef6d 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnapply/AsOldpartreturnApplyQuery.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnapply/AsOldpartreturnApplyQuery.java
@@ -25,28 +25,16 @@
*********************************************************/
package com.yxt.anrui.as.api.asoldpartreturnapply;
-
import com.yxt.common.core.query.Query;
import com.fasterxml.jackson.annotation.JsonFormat;
+
import java.util.Date;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-/**
- * Project: anrui-as(旧件返厂)
- * File: AsOldpartreturnApplyQuery.java
- * Class: com.yxt.anrui.as.api.asoldpartreturnapply.AsOldpartreturnApplyQuery
- * Description: 旧件返厂申请 查询条件.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-04-17 10:29:49
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Data
@ApiModel(value = "旧件返厂申请 查询条件", description = "旧件返厂申请 查询条件")
public class AsOldpartreturnApplyQuery implements Query {
@@ -57,7 +45,7 @@ public class AsOldpartreturnApplyQuery implements Query {
private String deptName;
@ApiModelProperty("申请人")
private String createByName;
- @ApiModelProperty("单据编号")
+ @ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("申请开始日期")
private String createStartTime;
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnconfirm/AsOldpartreturnConfirmQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnconfirm/AsOldpartreturnConfirmQuery.java
index fafdc238fd..4007901a1d 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnconfirm/AsOldpartreturnConfirmQuery.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnconfirm/AsOldpartreturnConfirmQuery.java
@@ -25,26 +25,12 @@
*********************************************************/
package com.yxt.anrui.as.api.asoldpartreturnconfirm;
-
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-/**
- * Project: yxt-as(旧件返厂厂家确认)
- * File: AsOldpartreturnConfirmQuery.java
- * Class: com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmQuery
- * Description: 旧件返厂厂家确认 查询条件.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-08-26 15:52:00
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Data
@ApiModel(value = "旧件返厂厂家确认 查询条件", description = "旧件返厂厂家确认 查询条件")
public class AsOldpartreturnConfirmQuery implements Query {
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnconfirm/AsOldpartreturnConfirmVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnconfirm/AsOldpartreturnConfirmVo.java
index e9082b9b3c..6370404a2a 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnconfirm/AsOldpartreturnConfirmVo.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asoldpartreturnconfirm/AsOldpartreturnConfirmVo.java
@@ -25,7 +25,6 @@
*********************************************************/
package com.yxt.anrui.as.api.asoldpartreturnconfirm;
-
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
@@ -37,19 +36,6 @@ import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
-/**
- * Project: yxt-as(旧件返厂厂家确认)
- * File: AsOldpartreturnConfirmVo.java
- * Class: com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmVo
- * Description: 旧件返厂厂家确认 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-08-26 15:52:00
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Data
@ApiModel(value = "旧件返厂厂家确认 视图数据对象", description = "旧件返厂厂家确认 视图数据对象")
public class AsOldpartreturnConfirmVo implements Vo {
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.xml
index 15e439ac0f..cef66fdff7 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.xml
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairinventorybilldetail/AsBusrepairInventorybillDetailMapper.xml
@@ -58,7 +58,7 @@
FROM
as_busrepair_inventorybill_detail ad
LEFT JOIN as_busrepair_inventorybill ai
- ON ad.`billSid` = ai.`sid`
+ ON ad.billSid = ai.sid
WHERE ai.sourceBillSid = #{repairBillSid}
AND ad.oldGoodsSkuCode = #{goodsSkuCode}
LIMIT 1
@@ -90,7 +90,7 @@
LEFT JOIN as_busrepair_inventorybill AS b
ON b.sid = d.billSid
LEFT JOIN yxt_wms.wms_warehouse_rack wr
- ON d.warehouseRackSid = wr.`sid`
+ ON d.warehouseRackSid = wr.sid
LEFT JOIN yxt_wms.wms_warehouse_area wa
ON wr.locationSid = wa.sid
WHERE b.sourceBillSid = #{busRepairBillSid}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.java
index 127d12997c..a34f2c9a3c 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.java
@@ -39,35 +39,22 @@ import org.apache.ibatis.annotations.Update;
import java.util.List;
import java.util.Map;
-/**
- * Project: anrui-as(旧件返厂)
- * File: AsOldpartreturnApplyMapper.java
- * Class: com.yxt.anrui.as.biz.asoldpartreturnapply.AsOldpartreturnApplyMapper
- * Description: 旧件返厂申请.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-04-17 10:29:50
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Mapper
public interface AsOldpartreturnApplyMapper extends BaseMapper {
- IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw);
+ IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw);
- int updateFlowFiled(Map map);
+ int updateFlowFiled(Map map);
int selectBySid(String join);
- String selectNum(String billNo);
+ String selectNum(String billNo);
List downloadTobeOutExcel(String sid);
- @Update("update as_oldpartreturn_apply set state = #{state} where sid = #{sid}")
- void updateState(@Param("sid") String sid,@Param("state") String state);
+ @Update("update as_oldpartreturn_apply set state = #{state} where sid = #{sid}")
+ void updateState(@Param("sid") String sid, @Param("state") String state);
- @Update("update as_oldpartreturn_apply set state = #{state} where billNo = #{billNo}")
- void updateStateByBillNo(@Param("billNo") String billNo,@Param("state") String state);
+ @Update("update as_oldpartreturn_apply set state = #{state} where billNo = #{billNo}")
+ void updateStateByBillNo(@Param("billNo") String billNo, @Param("state") String state);
}
\ No newline at end of file
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.xml
index 23758c3511..90bfa3d306 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.xml
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.xml
@@ -12,7 +12,7 @@
FROM
as_oldpartreturn_apply aoa
LEFT JOIN as_oldpartreturn AS ao
- ON aoa.`sid` = ao.`mainSid`
+ ON aoa.sid = ao.mainSid
LEFT JOIN as_oldpartreturn_confirm ac
ON aoa.billNo = ac.billNo
LEFT JOIN anrui_portal.sys_organization AS s ON aoa.deptSid = s.sid
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyRest.java
index f259f8e24a..873b2f42dd 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyRest.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyRest.java
@@ -54,137 +54,124 @@ import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.List;
-/**
- * Project: anrui-as(旧件返厂)
- * File: AsOldpartreturnApplyFeignFallback.java
- * Class: com.yxt.anrui.as.biz.asoldpartreturnapply.AsOldpartreturnApplyRest
- * Description: 旧件返厂申请.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-04-17 10:29:50
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Api(tags = "旧件返厂申请")
@RestController
@RequestMapping("v1/asoldpartreturnapply")
-public class AsOldpartreturnApplyRest{
-
- @Autowired
- private AsOldpartreturnApplyService asOldpartreturnApplyService;
- @Autowired
- HttpServletResponse response;
-
- @ApiOperation("根据条件分页查询数据的列表")
- @PostMapping("/listPage")
- public ResultBean> listPage(@RequestBody PagerQuery pq){
- ResultBean rb = ResultBean.fireFail();
- PagerVo pv = asOldpartreturnApplyService.listPageVo(pq);
- return rb.success().setData(pv);
- }
-
- @ApiOperation("新增或修改")
- @PostMapping("/save")
- public ResultBean save(@RequestBody AsOldpartreturnApplyDto dto){
- ResultBean rb = ResultBean.fireFail();
- asOldpartreturnApplyService.saveOrUpdateDto(dto);
- return rb.success();
- }
-
- @ApiOperation("下载待出库旧件明细")
- @PostMapping("/downloadTobeOutExcel/{sid}")
- public void downloadTobeOutExcel(@PathVariable("sid") String sid){
- //得到所有要导出的数据
- List exportVoList = asOldpartreturnApplyService.downloadTobeOutExcel(sid);
- //定义导出的excel名字
- String excelName = "待出库旧件明细";
- String fileNameURL = "";
- try {
- fileNameURL = URLEncoder.encode(excelName, "UTF-8");
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- }
- ExportExcelUtils.export(fileNameURL, exportVoList, AsOldpartreturnDetailExcelVo.class, response);
- }
-
- @ApiOperation("根据sid批量删除")
+public class AsOldpartreturnApplyRest {
+
+ @Autowired
+ private AsOldpartreturnApplyService asOldpartreturnApplyService;
+ @Autowired
+ HttpServletResponse response;
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq) {
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = asOldpartreturnApplyService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ public ResultBean save(@RequestBody AsOldpartreturnApplyDto dto) {
+ ResultBean rb = ResultBean.fireFail();
+ asOldpartreturnApplyService.saveOrUpdateDto(dto);
+ return rb.success();
+ }
+
+ @ApiOperation("下载待出库旧件明细")
+ @PostMapping("/downloadTobeOutExcel/{sid}")
+ public void downloadTobeOutExcel(@PathVariable("sid") String sid) {
+ //得到所有要导出的数据
+ List exportVoList = asOldpartreturnApplyService.downloadTobeOutExcel(sid);
+ //定义导出的excel名字
+ String excelName = "待出库旧件明细";
+ String fileNameURL = "";
+ try {
+ fileNameURL = URLEncoder.encode(excelName, "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+ ExportExcelUtils.export(fileNameURL, exportVoList, AsOldpartreturnDetailExcelVo.class, response);
+ }
+
+ @ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")
- public ResultBean delBySids(@RequestBody String[] sids){
- return asOldpartreturnApplyService.delAll(sids);
- }
+ public ResultBean delBySids(@RequestBody String[] sids) {
+ return asOldpartreturnApplyService.delAll(sids);
+ }
- @ApiOperation("根据SID获取一条记录")
+ @ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
- public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){
- ResultBean rb = ResultBean.fireFail();
- AsOldpartreturnApplyDetailsVo vo = asOldpartreturnApplyService.fetchDetailsVoBySid(sid);
- return rb.success().setData(vo);
- }
-
- @ApiOperation("提交审批流程")
- @PostMapping("/submit")
- public ResultBean submit(@RequestBody @Valid SubmitAsOldpartreturnApplyDto dto) {
- return asOldpartreturnApplyService.submit(dto);
- }
-
- @ApiOperation(value = "办理（同意）")
- @PostMapping("/complete")
- public ResultBean complete(@Valid @RequestBody AsOldpartreturnApplyCompleteDto query) {
- BusinessVariables bv = new BusinessVariables();
- BeanUtil.copyProperties(query, bv);
- bv.setModelId(ProcDefEnum.ASOLDPARTRETURNAPPLY.getProDefId());
- return asOldpartreturnApplyService.complete(bv);
- }
-
- @ApiOperation(value = "获取上一个环节")
- @GetMapping(value = "/getPreviousNodesForReject")
- public ResultBean> getPreviousNodesForReject(@Valid @SpringQueryMap AsOldpartreturnApplyNodeQuery query) {
- return asOldpartreturnApplyService.getPreviousNodesForReject(query);
- }
-
- @ApiOperation(value = "获取下一个环节")
- @GetMapping(value = "/getNextNodesForSubmit")
- public ResultBean> getNextNodesForSubmit(@Valid @SpringQueryMap AsOldpartreturnApplyNodeQuery query) {
- return asOldpartreturnApplyService.getNextNodesForSubmit(query);
- }
-
- @ApiOperation(value = "驳回任务")
- @PostMapping(value = "/reject")
- public ResultBean reject(@Valid @RequestBody AsOldpartreturnApplyTaskQuery query) {
- return asOldpartreturnApplyService.reject(query);
- }
-
- @ApiOperation(value = "撤回流程")
- @PostMapping(value = "/revokeProcess")
- public ResultBean revokeProcess(@Valid @RequestBody AsOldpartreturnApplyTaskQuery query) {
- return asOldpartreturnApplyService.revokeProcess(query);
- }
-
- @ApiOperation(value = "终止任务")
- @PostMapping(value = "/breakProcess")
- public ResultBean breakProcess(@Valid @RequestBody AsOldpartreturnApplyTaskQuery query) {
- return asOldpartreturnApplyService.breakProcess(query);
- }
-
- @ApiOperation(value = "加签")
- @PostMapping(value = "/delegate")
- public ResultBean delegate(@RequestBody AsOldpartreturnApplyDelegateQuery query) {
- return asOldpartreturnApplyService.delegate(query);
- }
-
- @PostMapping("/downloadModPriceExcel")
- @ApiOperation(value = "下载模板")
- @ResponseBody
- public void downloadExcel() {
- asOldpartreturnApplyService.downloadExcel();
- }
-
- @PostMapping("/getExcelInfo")
- @ResponseBody
- @ApiOperation(value = "导入")
- public ResultBean> getExcelInfo(MultipartFile file, HttpServletRequest request) throws IOException {
- return asOldpartreturnApplyService.getExcelInfo(file, request);
- }
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ AsOldpartreturnApplyDetailsVo vo = asOldpartreturnApplyService.fetchDetailsVoBySid(sid);
+ return rb.success().setData(vo);
+ }
+
+ @ApiOperation("提交审批流程")
+ @PostMapping("/submit")
+ public ResultBean submit(@RequestBody @Valid SubmitAsOldpartreturnApplyDto dto) {
+ return asOldpartreturnApplyService.submit(dto);
+ }
+
+ @ApiOperation(value = "办理（同意）")
+ @PostMapping("/complete")
+ public ResultBean complete(@Valid @RequestBody AsOldpartreturnApplyCompleteDto query) {
+ BusinessVariables bv = new BusinessVariables();
+ BeanUtil.copyProperties(query, bv);
+ bv.setModelId(ProcDefEnum.ASOLDPARTRETURNAPPLY.getProDefId());
+ return asOldpartreturnApplyService.complete(bv);
+ }
+
+ @ApiOperation(value = "获取上一个环节")
+ @GetMapping(value = "/getPreviousNodesForReject")
+ public ResultBean> getPreviousNodesForReject(@Valid @SpringQueryMap AsOldpartreturnApplyNodeQuery query) {
+ return asOldpartreturnApplyService.getPreviousNodesForReject(query);
+ }
+
+ @ApiOperation(value = "获取下一个环节")
+ @GetMapping(value = "/getNextNodesForSubmit")
+ public ResultBean> getNextNodesForSubmit(@Valid @SpringQueryMap AsOldpartreturnApplyNodeQuery query) {
+ return asOldpartreturnApplyService.getNextNodesForSubmit(query);
+ }
+
+ @ApiOperation(value = "驳回任务")
+ @PostMapping(value = "/reject")
+ public ResultBean reject(@Valid @RequestBody AsOldpartreturnApplyTaskQuery query) {
+ return asOldpartreturnApplyService.reject(query);
+ }
+
+ @ApiOperation(value = "撤回流程")
+ @PostMapping(value = "/revokeProcess")
+ public ResultBean revokeProcess(@Valid @RequestBody AsOldpartreturnApplyTaskQuery query) {
+ return asOldpartreturnApplyService.revokeProcess(query);
+ }
+
+ @ApiOperation(value = "终止任务")
+ @PostMapping(value = "/breakProcess")
+ public ResultBean breakProcess(@Valid @RequestBody AsOldpartreturnApplyTaskQuery query) {
+ return asOldpartreturnApplyService.breakProcess(query);
+ }
+
+ @ApiOperation(value = "加签")
+ @PostMapping(value = "/delegate")
+ public ResultBean delegate(@RequestBody AsOldpartreturnApplyDelegateQuery query) {
+ return asOldpartreturnApplyService.delegate(query);
+ }
+
+ @PostMapping("/downloadModPriceExcel")
+ @ApiOperation(value = "下载模板")
+ @ResponseBody
+ public void downloadExcel() {
+ asOldpartreturnApplyService.downloadExcel();
+ }
+
+ @PostMapping("/getExcelInfo")
+ @ResponseBody
+ @ApiOperation(value = "导入")
+ public ResultBean> getExcelInfo(MultipartFile file, HttpServletRequest request) throws IOException {
+ return asOldpartreturnApplyService.getExcelInfo(file, request);
+ }
}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyService.java
index bebc963bbd..8b5e8a70f5 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyService.java
@@ -205,6 +205,9 @@ public class AsOldpartreturnApplyService extends MybatisBaseService
- * File: AsOldpartreturnConfirmMapper.java
- * Class: com.yxt.anrui.as.biz.asoldpartreturnconfirm.AsOldpartreturnConfirmMapper
- * Description: 旧件返厂厂家确认.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-08-26 15:52:01
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Mapper
public interface AsOldpartreturnConfirmMapper extends BaseMapper {
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmMapper.xml
index 294b301cc8..5c932d34f1 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmMapper.xml
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmMapper.xml
@@ -12,7 +12,7 @@
FROM
as_oldpartreturn_confirm aoc
LEFT JOIN as_oldpartreturn_confirm_detail AS aod
- ON aoc.`sid` = aod.`mainSid`
+ ON aoc.sid = aod.mainSid
LEFT JOIN anrui_portal.sys_organization AS s ON aoc.deptSid = s.sid
${ew.sqlSegment}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmRest.java
index 87778895be..bddbe0a888 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmRest.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmRest.java
@@ -38,48 +38,35 @@ import com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmVo;
import com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmDetailsVo;
import com.yxt.anrui.as.api.asoldpartreturnconfirm.AsOldpartreturnConfirmDto;
-/**
- * Project: yxt-as(旧件返厂厂家确认)
- * File: AsOldpartreturnConfirmFeignFallback.java
- * Class: com.yxt.anrui.as.biz.asoldpartreturnconfirm.AsOldpartreturnConfirmRest
- * Description: 旧件返厂厂家确认.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-08-26 15:52:01
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Api(tags = "旧件返厂厂家确认")
@RestController
@RequestMapping("v1/asoldpartreturnconfirm")
public class AsOldpartreturnConfirmRest {
- @Autowired
- private AsOldpartreturnConfirmService asOldpartreturnConfirmService;
+ @Autowired
+ private AsOldpartreturnConfirmService asOldpartreturnConfirmService;
- @ApiOperation("根据条件分页查询数据的列表")
- @PostMapping("/listPage")
- public ResultBean> listPage(@RequestBody PagerQuery pq){
- ResultBean rb = ResultBean.fireFail();
- PagerVo pv = asOldpartreturnConfirmService.listPageVo(pq);
- return rb.success().setData(pv);
- }
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq) {
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = asOldpartreturnConfirmService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
- @ApiOperation("确认")
- @PostMapping("/confirm")
- public ResultBean confirm(@RequestBody AsOldpartreturnConfirmDto dto){
- ResultBean rb = ResultBean.fireFail();
- asOldpartreturnConfirmService.saveOrUpdateDto(dto);
- return rb.success();
- }
+ @ApiOperation("确认")
+ @PostMapping("/confirm")
+ public ResultBean confirm(@RequestBody AsOldpartreturnConfirmDto dto) {
+ ResultBean rb = ResultBean.fireFail();
+ asOldpartreturnConfirmService.saveOrUpdateDto(dto);
+ return rb.success();
+ }
- @ApiOperation("根据SID获取一条记录")
+ @ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
- public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){
- ResultBean rb = ResultBean.fireFail();
- AsOldpartreturnConfirmDetailsVo vo = asOldpartreturnConfirmService.fetchDetailsVoBySid(sid);
- return rb.success().setData(vo);
- }
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ AsOldpartreturnConfirmDetailsVo vo = asOldpartreturnConfirmService.fetchDetailsVoBySid(sid);
+ return rb.success().setData(vo);
+ }
}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmService.java
index 6f4fb598ad..9dbdb1c14a 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnconfirm/AsOldpartreturnConfirmService.java
@@ -56,19 +56,6 @@ import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
-/**
- * Project: yxt-as(旧件返厂厂家确认)
- * File: AsOldpartreturnConfirmService.java
- * Class: com.yxt.anrui.as.biz.asoldpartreturnconfirm.AsOldpartreturnConfirmService
- * Description: 旧件返厂厂家确认 业务逻辑.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-08-26 15:52:01
- *
- * @author liupopo
- * @version 1.0
- * @since 1.0
- */
@Service
public class AsOldpartreturnConfirmService extends MybatisBaseService {
@@ -138,6 +125,9 @@ public class AsOldpartreturnConfirmService extends MybatisBaseService page = PagerUtil.queryToPage(pq);
IPage pagging = baseMapper.returnFactGoodsListPage(page, qw);
PagerVo p = PagerUtil.pageToVo(pagging, null);
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsUpdateCountQuery.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsUpdateCountQuery.java
index 847929c2d8..bdf880c298 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsUpdateCountQuery.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsUpdateCountQuery.java
@@ -14,4 +14,6 @@ public class WmsUpdateCountQuery {
private String sid;
private BigDecimal count;
private Integer addOrReduce; // 0增加 1减少
+
+ private String goodsCode;
}
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java
index 9ec7a8bd50..3a33501346 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java
@@ -208,8 +208,8 @@ public class WmsInventoryCheckbillService extends MybatisBaseService page = PagerUtil.queryToPage(pq);
@@ -357,7 +357,7 @@ public class WmsInventoryCheckbillService extends MybatisBaseService
diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java
index 3251ad7b77..8809fdfd38 100644
--- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java
+++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsoldinventory/WmsOldInventoryService.java
@@ -599,6 +599,7 @@ public class WmsOldInventoryService extends MybatisBaseService