From 6c696606a420be0b99f820807045b2f21b05266e Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期日, 21 七月 2024 15:38:36 +0800
Subject: [PATCH] 森林防火 供应商管理
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/InventoriesSuppliesVO.java | 5
ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlGoodsShelfMapper.xml | 16 --
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/InventoriesSuppliesInfoVO.java | 2
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionCkgl.java | 7
ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlVolumeProductionCkglMapper.xml | 15 -
ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlAuditRecordMapper.xml | 13 -
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionZygl.java | 6
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkglServiceImpl.java | 12
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionCkglService.java | 8
ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlVolumeProductionCkMapper.xml | 19 --
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/ManagementGoodsMaterialsServiceImpl.java | 21 +
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java | 27 ++-
ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlVolumeProductionZyglMapper.xml | 16 --
ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlVolumeProductionRkMapper.xml | 20 --
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionZyglController.java | 10
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkService.java | 2
ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlEquipmentMapper.xml | 14 -
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/InventoriesSuppliesQuery.java | 2
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlVolumeProductionZyDTO.java | 2
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkglService.java | 6
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/InventoriesSuppliesServiceImpl.java | 10
ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlVolumeProductionZyMapper.xml | 19 --
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java | 12 +
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/InventoriesSuppliesInfoServiceImpl.java | 30 ++
ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlStoreManagementMapper.xml | 22 --
ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlStoreManagementImgMapper.xml | 13 -
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/InventoriesSuppliesInfoController.java | 2
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionZyglService.java | 2
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SupplierVolumeProductionRkglVO.java | 5
ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlGoodsMaterialsMapper.xml | 17 --
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkglController.java | 23 +-
ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/InventoriesSuppliesInfoMapper.xml | 2
ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlAuditMapper.xml | 13 -
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionZyglServiceImpl.java | 6
ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlVolumeProductionRkglMapper.xml | 15 -
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionRkgl.java | 6
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java | 6
ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/ManagementGoodsMaterialsMapper.xml | 2
ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/InventoriesSuppliesMapper.xml | 2
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkglController.java | 20 +-
40 files changed, 146 insertions(+), 304 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/InventoriesSuppliesInfoController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/InventoriesSuppliesInfoController.java
index 1b43a8d..73834c9 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/InventoriesSuppliesInfoController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/InventoriesSuppliesInfoController.java
@@ -58,7 +58,7 @@
@PostMapping("/submitInventoriesSuppliesInfo")
@ApiOperation(value = "提交物资盘点数据")
public R submitInventoriesSuppliesInfo(@RequestBody InventoriesSuppliesInfoDTO inventoriesSuppliesInfoDTO) {
- inventoriesSuppliesInfoService.getInventoriesSuppliesInfo(inventoriesSuppliesInfoDTO);
+ inventoriesSuppliesInfoService.submitInventoriesSuppliesInfo(inventoriesSuppliesInfoDTO);
return R.ok();
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkglController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkglController.java
index b5b55c9..702d4d5 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkglController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkglController.java
@@ -55,36 +55,36 @@
return R.ok();
}
- @PostMapping("/getVolumeProductionCkglnfo")
+ @GetMapping("/getVolumeProductionCkglnfo/{id}")
@ApiOperation(value = "获取出库库管理详情")
- public R<VolumeProductionCkglInfoVO> getVolumeProductionCkglnfo(@ApiParam(name = "id", value = "出库管理id", required = true) @PathVariable("id") Integer id) {
+ public R<VolumeProductionCkglInfoVO> getVolumeProductionCkglnfo(@ApiParam(name = "id", value = "出库管理id", required = true) @PathVariable("id") Long id) {
return R.ok(slVolumeProductionCkglService.getVolumeProductionCkglnfo(id));
}
- @PostMapping("/getVolumeProductionCkglInventory")
+ @PostMapping("/getVolumeProductionCkglInventory/{id}")
@ApiOperation(value = "获取出库管理打印清单")
- public R<VolumeProductionCkglInventoryVO> getVolumeProductionCkglInventory(@ApiParam(name = "id", value = "入库管理id", required = true) @PathVariable("id") Integer id) {
+ public R<VolumeProductionCkglInventoryVO> getVolumeProductionCkglInventory(@ApiParam(name = "id", value = "入库管理id", required = true) @PathVariable("id") Long id) {
return R.ok(slVolumeProductionCkglService.getVolumeProductionCkglInventory(id));
}
@ApiOperation("出库管理出库")
- @DeleteMapping("/ck/{id}")
- public R<?> ck(@ApiParam(name = "id", value = "出库管理id", required = true) @PathVariable("id") Integer id) {
+ @GetMapping("/ck/{id}")
+ public R<?> ck(@ApiParam(name = "id", value = "出库管理id", required = true) @PathVariable("id") Long id) {
slVolumeProductionCkglService.ck(id);
return R.ok();
}
@ApiOperation("出库管理归还")
- @DeleteMapping("/gh/{id}")
- public R<?> gh(@ApiParam(name = "id", value = "出库管理id", required = true) @PathVariable("id") Integer id) {
+ @GetMapping("/gh/{id}")
+ public R<?> gh(@ApiParam(name = "id", value = "出库管理id", required = true) @PathVariable("id") Long id) {
slVolumeProductionCkglService.gh(id);
return R.ok();
}
@ApiOperation("取消出库管理")
- @DeleteMapping("/{id}")
+ @GetMapping("/{id}")
public R<?> delStoreManagement(
- @ApiParam(name = "id", value = "出库管理id", required = true) @PathVariable("id") Integer id) {
+ @ApiParam(name = "id", value = "出库管理id", required = true) @PathVariable("id") Long id) {
SlVolumeProductionCkgl byId = slVolumeProductionCkglService.getById(id);
byId.setPresentState(5);
byId.setAuditStatus(8);
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java
index db35733..8525768 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java
@@ -54,20 +54,20 @@
@ApiOperation("删除入库批次")
@DeleteMapping("/{id}")
public R<?> delStoreManagement(
- @ApiParam(name = "id", value = "入库批次id", required = true) @PathVariable("id") Integer id) {
+ @ApiParam(name = "id", value = "入库批次id", required = true) @PathVariable("id") Long id) {
slVolumeProductionRkService.removeById(id);
return R.ok();
}
@PostMapping("/getVolumeProductionRkgCode")
@ApiOperation(value = "获取入库管理二维码")
- public R<PageDTO<getVolumeProductionRkgCodeVO>> getVolumeProductionRkgCode(VolumeProductionRkgCodeQuery volumeProductionRkgCodeQuery) {
+ public R<PageDTO<getVolumeProductionRkgCodeVO>> getVolumeProductionRkgCode(@RequestBody VolumeProductionRkgCodeQuery volumeProductionRkgCodeQuery) {
return R.ok(slVolumeProductionRkService.getVolumeProductionRkgCode(volumeProductionRkgCodeQuery));
}
@PostMapping("/codeInfo/{id}")
@ApiOperation(value = "获取二维码样式")
- public R<ManagementimgVolumeProductionRkVO> codeInfo( @ApiParam(name = "id", value = "入库批次id", required = true) @PathVariable("id") Integer id){
+ public R<ManagementimgVolumeProductionRkVO> codeInfo( @ApiParam(name = "id", value = "入库批次id", required = true) @PathVariable("id") Long id){
return R.ok(slVolumeProductionRkService.codeInfo(id));
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkglController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkglController.java
index 732f579..385908a 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkglController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkglController.java
@@ -39,6 +39,7 @@
@Resource
private SlVolumeProductionRkglService slVolumeProductionRkglService;
+
@Resource
private SlAuditMapper slAuditMapper;
@@ -49,9 +50,9 @@
return R.ok(slVolumeProductionRkglService.getSupplierVolumeProductionRkglList(supplierVolumeProductionRkglQuery));
}
- @PostMapping("/getVolumeProductionRkgInfo")
+ @GetMapping("/getVolumeProductionRkgInfo/{id}")
@ApiOperation(value = "获取入库管理详情")
- public R<VolumeProductionRkgInfoVO> getVolumeProductionRkgInfo(@ApiParam(name = "id", value = "入库管理id", required = true) @PathVariable("id") Integer id) {
+ public R<VolumeProductionRkgInfoVO> getVolumeProductionRkgInfo(@ApiParam(name = "id", value = "入库管理id", required = true) @PathVariable("id") Long id) {
return R.ok(slVolumeProductionRkglService.getVolumeProductionRkgInfo(id));
}
@@ -70,9 +71,9 @@
}
@ApiOperation("取消入库管理")
- @DeleteMapping("/{id}")
+ @GetMapping("/{id}")
public R<?> delStoreManagement(
- @ApiParam(name = "id", value = "入库管理id", required = true) @PathVariable("id") Integer id) {
+ @ApiParam(name = "id", value = "入库管理id", required = true) @PathVariable("id") Long id) {
SlVolumeProductionRkgl byId = slVolumeProductionRkglService.getById(id);
byId.setPresentState(5);
byId.setAuditStatus(7);
@@ -83,20 +84,22 @@
wrapper.eq( SlAudit::getDelFlag,0);
wrapper.eq(SlAudit::getRkId,id);
SlAudit slAudit = slAuditMapper.selectOne(wrapper);
- slAudit.setState(6);
-
+ if (slAudit!=null){
+ slAudit.setState(6);
+ slAuditMapper.updateById(slAudit);
+ }
return R.ok();
}
- @PostMapping("/getVolumeProductionRkgInventory")
+ @GetMapping("/getVolumeProductionRkgInventory/{id}")
@ApiOperation(value = "获取入库管理打印清单")
- public R<VolumeProductionRkgInventoryVO> getVolumeProductionRkgInventory(@ApiParam(name = "id", value = "入库管理id", required = true) @PathVariable("id") Integer id) {
+ public R<VolumeProductionRkgInventoryVO> getVolumeProductionRkgInventory(@ApiParam(name = "id", value = "入库管理id", required = true) @PathVariable("id") Long id) {
return R.ok(slVolumeProductionRkglService.getVolumeProductionRkgInventory(id));
}
@ApiOperation("入库管理入库")
- @DeleteMapping("/rk/{id}")
- public R<?> rk(@ApiParam(name = "id", value = "入库管理id", required = true) @PathVariable("id") Integer id) {
+ @GetMapping("/rk/{id}")
+ public R<?> rk(@ApiParam(name = "id", value = "入库管理id", required = true) @PathVariable("id") Long id) {
slVolumeProductionRkglService.rk(id);
return R.ok();
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionZyglController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionZyglController.java
index 1ab8cad..7c09489 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionZyglController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionZyglController.java
@@ -57,13 +57,13 @@
return R.ok();
}
- @PostMapping("/getVolumeProductionzZyglnfo")
+ @GetMapping("/getVolumeProductionzZyglnfo/{id}")
@ApiOperation(value = "获取转移管理详情")
- public R<VolumeProductionZyglInfoVO> getVolumeProductionzZyglnfo(@ApiParam(name = "id", value = "转移管理id", required = true) @PathVariable("id") Integer id) {
+ public R<VolumeProductionZyglInfoVO> getVolumeProductionzZyglnfo(@ApiParam(name = "id", value = "转移管理id", required = true) @PathVariable("id") Long id) {
return R.ok(slVolumeProductionZyglService.getVolumeProductionzZyglnfo(id));
}
- @PostMapping("/getVolumeProductionZyglnventory")
+ @GetMapping("/getVolumeProductionZyglnventory/{id}")
@ApiOperation(value = "获取转移管理打印清单")
public R<VolumeProductionZyglInventoryVO> getVolumeProductionZyglnventory(@ApiParam(name = "id", value = "转移管理id", required = true) @PathVariable("id") Integer id) {
return R.ok(slVolumeProductionZyglService.getVolumeProductionZyglnventory(id));
@@ -71,7 +71,7 @@
@ApiOperation("取转移管理")
- @DeleteMapping("/{id}")
+ @GetMapping("/{id}")
public R<?> delStoreManagement(
@ApiParam(name = "id", value = "转移管理id", required = true) @PathVariable("id") Integer id) {
SlVolumeProductionZygl byId = slVolumeProductionZyglService.getById(id);
@@ -90,7 +90,7 @@
}
@ApiOperation("转移管理入库")
- @DeleteMapping("/zy/{id}")
+ @GetMapping("/zy/{id}")
public R<?> zy(@ApiParam(name = "id", value = "转移管理id", required = true) @PathVariable("id") Integer id) {
slVolumeProductionZyglService.zy(id);
return R.ok();
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionCkgl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionCkgl.java
index 7b55634..7e94c20 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionCkgl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionCkgl.java
@@ -80,12 +80,11 @@
private String source;
@ApiModelProperty("附件")
- @TableField("attachment")
+ @TableField("attachment_url")
private String attachmentUrl;
@ApiModelProperty("审批单")
- @TableField("authorization")
- private String authorization;
-
+ @TableField("authorization_url")
+ private String authorizationUrl;
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionRkgl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionRkgl.java
index 98ba9f4..982ebfa 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionRkgl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionRkgl.java
@@ -76,7 +76,7 @@
private Long supplierId;
@ApiModelProperty("附件")
- @TableField("attachment")
+ @TableField("attachment_url")
private String attachmentUrl;
@ApiModelProperty("来源")
@@ -88,8 +88,8 @@
private String remark;
@ApiModelProperty("审批单")
- @TableField("authorization")
- private String authorization;
+ @TableField("authorization_url")
+ private String authorizationUrl;
@ApiModelProperty("拒绝理由")
@TableField("reasons_refusal")
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionZygl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionZygl.java
index cb138e4..f30b904 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionZygl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionZygl.java
@@ -80,15 +80,17 @@
private String reasonsRefusal;
-
@ApiModelProperty("转移原因")
+ @TableField("source")
private String source;
@ApiModelProperty("附件")
+ @TableField("attachment_url")
private String attachmentUrl;
@ApiModelProperty("审批单")
- private String authorization;
+ @TableField("authorization_url")
+ private String authorizationUrl;
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/InventoriesSuppliesQuery.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/InventoriesSuppliesQuery.java
index 7049f4a..d46f764 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/InventoriesSuppliesQuery.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/InventoriesSuppliesQuery.java
@@ -9,7 +9,7 @@
import java.util.Date;
@Data
-@ApiModel("货架未放置查询传输对象")
+@ApiModel("盘点传输对象")
public class InventoriesSuppliesQuery extends BasePage {
@ApiModelProperty("仓库名称")
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlVolumeProductionZyDTO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlVolumeProductionZyDTO.java
index ae02448..bfb1c04 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlVolumeProductionZyDTO.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlVolumeProductionZyDTO.java
@@ -7,7 +7,7 @@
import lombok.Data;
@Data
-@ApiModel("入库批次修改数据传输对象")
+@ApiModel("转移批次修改数据传输对象")
public class SlVolumeProductionZyDTO {
@TableId(value = "id", type = IdType.ASSIGN_ID)
private Long id;
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/InventoriesSuppliesInfoVO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/InventoriesSuppliesInfoVO.java
index 80d461c..0bd9d49 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/InventoriesSuppliesInfoVO.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/InventoriesSuppliesInfoVO.java
@@ -7,7 +7,7 @@
import lombok.Data;
@Data
-@ApiModel(value = "通过物资拿出库物资的数据对象", description = "通过物资拿出库物资的数据对象")
+@ApiModel(value = "物资判断详情数据对象", description = "物资判断详情数据对象")
public class InventoriesSuppliesInfoVO {
private Long id;
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/InventoriesSuppliesVO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/InventoriesSuppliesVO.java
index a5449a7..28f28da 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/InventoriesSuppliesVO.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/InventoriesSuppliesVO.java
@@ -1,5 +1,6 @@
package com.ruoyi.management.domain.vo;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -21,7 +22,9 @@
@ApiModelProperty("仓库编号")
private String storeManagementNo;
-
@ApiModelProperty("盘点人名称")
private String pdrName;
+
+ @ApiModelProperty("盘点时间")
+ private Date pdTime;
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SupplierVolumeProductionRkglVO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SupplierVolumeProductionRkglVO.java
index 89023a9..9d1dc79 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SupplierVolumeProductionRkglVO.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SupplierVolumeProductionRkglVO.java
@@ -11,6 +11,9 @@
@Data
@ApiModel(value = "仓库管理入库", description = "仓库管理入库")
public class SupplierVolumeProductionRkglVO {
+
+ private Long id;
+
@ApiModelProperty("用户名称")
@JsonInclude(JsonInclude.Include.ALWAYS)
private String nickName;
@@ -19,7 +22,7 @@
@JsonInclude(JsonInclude.Include.ALWAYS)
private String phonenumber;
- private Integer id;
+
@ApiModelProperty("仓库名称")
@JsonInclude(JsonInclude.Include.ALWAYS)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionCkglService.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionCkglService.java
index 6cf6ab1..7c9bc80 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionCkglService.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionCkglService.java
@@ -25,11 +25,11 @@
void addslVolumeProductionCkgl(VolumeProductionCkglDTO volumeProductionCkglDTO);
- VolumeProductionCkglInfoVO getVolumeProductionCkglnfo (Integer id);
+ VolumeProductionCkglInfoVO getVolumeProductionCkglnfo (Long id);
- VolumeProductionCkglInventoryVO getVolumeProductionCkglInventory(Integer id);
+ VolumeProductionCkglInventoryVO getVolumeProductionCkglInventory(Long id);
- void ck(Integer id);
+ void ck(Long id);
- void gh(Integer id);
+ void gh(Long id);
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkService.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkService.java
index 5ec07bd..813353b 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkService.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkService.java
@@ -29,7 +29,7 @@
void uplSlVolumeProductionRk(@RequestBody SlVolumeProductionRkDTO SlVolumeProductionRkDTO);
PageDTO<getVolumeProductionRkgCodeVO> getVolumeProductionRkgCode(VolumeProductionRkgCodeQuery volumeProductionRkgCodeQuery);
- ManagementimgVolumeProductionRkVO codeInfo(Integer id);
+ ManagementimgVolumeProductionRkVO codeInfo(Long id);
PageDTO<ManagementimgVolumeProductionRkVO> getroductionRkList(umeProductionRkQuery meProductionRkQuery);
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkglService.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkglService.java
index 1d25f00..4840788 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkglService.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkglService.java
@@ -24,14 +24,14 @@
*/
public interface SlVolumeProductionRkglService extends IService<SlVolumeProductionRkgl> {
PageDTO<SupplierVolumeProductionRkglVO> getSupplierVolumeProductionRkglList( SupplierVolumeProductionRkglQuery supplierVolumeProductionRkglQuery);
- VolumeProductionRkgInfoVO getVolumeProductionRkgInfo(Integer id);
+ VolumeProductionRkgInfoVO getVolumeProductionRkgInfo(Long id);
PageDTO<SupplierVolumeProductionRkglVO> getslVolumeProductionRkglList( getVolumeProductionRkQuery getVolumeProductionRkQuery) ;
void addVolumeProductionRkgl(@RequestBody VolumeProductionRkglDTO volumeProductionRkglDTO);
- VolumeProductionRkgInventoryVO getVolumeProductionRkgInventory(Integer id);
+ VolumeProductionRkgInventoryVO getVolumeProductionRkgInventory(Long id);
- void rk (Integer id) ;
+ void rk (Long id) ;
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionZyglService.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionZyglService.java
index 1f3e104..83ba6b3 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionZyglService.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionZyglService.java
@@ -25,7 +25,7 @@
void addsVolumeProductionzZygl(@RequestBody SlVolumeProductionZyDTO slVolumeProductionZyDTO);
- VolumeProductionZyglInfoVO getVolumeProductionzZyglnfo(Integer id);
+ VolumeProductionZyglInfoVO getVolumeProductionzZyglnfo(Long id);
VolumeProductionZyglInventoryVO getVolumeProductionZyglnventory( Integer id);
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/InventoriesSuppliesInfoServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/InventoriesSuppliesInfoServiceImpl.java
index b4a13d0..47f122c 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/InventoriesSuppliesInfoServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/InventoriesSuppliesInfoServiceImpl.java
@@ -10,6 +10,7 @@
import com.ruoyi.management.domain.vo.InventoriesSuppliesInfoVO;
import com.ruoyi.management.domain.vo.InventoriesSuppliesVO;
import com.ruoyi.management.mapper.InventoriesSuppliesInfoMapper;
+import com.ruoyi.management.mapper.ManagementGoodsMaterialsMapper;
import com.ruoyi.management.mapper.SlGoodsMaterialsMapper;
import com.ruoyi.management.mapper.SlVolumeProductionRkMapper;
import com.ruoyi.management.service.InventoriesSuppliesInfoService;
@@ -38,12 +39,15 @@
@Resource
private SlGoodsMaterialsMapper slGoodsMaterialsMapper;
+
+ @Resource
+ private ManagementGoodsMaterialsMapper managementGoodsMaterialsMapper;
@Override
public PageDTO<InventoriesSuppliesInfoVO> inventoriesSuppliesInfoService(InventoriesSuppliesInfoQuery inventoriesSuppliesInfoQuery) {
Page<InventoriesSuppliesInfo> page = new Page<>(inventoriesSuppliesInfoQuery.getPageCurr(), inventoriesSuppliesInfoQuery.getPageSize());
LambdaQueryWrapper< InventoriesSuppliesInfo> wrapper1= Wrappers.lambdaQuery();
- wrapper1.gt(InventoriesSuppliesInfo::getSuppliesId, inventoriesSuppliesInfoQuery.getSuppliesId());
+ wrapper1.eq(InventoriesSuppliesInfo::getSuppliesId, inventoriesSuppliesInfoQuery.getSuppliesId());
wrapper1.eq( InventoriesSuppliesInfo::getDelFlag,0);
wrapper1.orderByDesc(InventoriesSuppliesInfo::getCreateTime);
wrapper1.orderByDesc(InventoriesSuppliesInfo::getType);
@@ -54,6 +58,7 @@
SlVolumeProductionRk slVolumeProductionRk = slVolumeProductionRkMapper.selectById(sl.getRkId());
sl.setRkNumber(slVolumeProductionRk.getRkNumber());
sl.setRkModel(slVolumeProductionRk.getRkModel());
+ sl.setZkNum(slVolumeProductionRk.getRepertoryZhai());
SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsMapper.selectById(slVolumeProductionRk.getMaterialsId());
sl.setGoodsMaterialsName(slGoodsMaterials.getGoodsMaterialsName());
sl.setIsConsume(slGoodsMaterials.getIsConsume());
@@ -64,7 +69,7 @@
@Override
public void addInventoriesSuppliesInfo(InventoriesSuppliesInfoDTO inventoriesSuppliesInfoDTO) {
- if (inventoriesSuppliesInfoDTO.getId()==0){
+ if (inventoriesSuppliesInfoDTO.getId()==null){
InventoriesSuppliesInfo inventoriesSuppliesInf=new InventoriesSuppliesInfo();
inventoriesSuppliesInf.setSuppliesId(inventoriesSuppliesInfoDTO.getSuppliesId());
inventoriesSuppliesInf.setRkId(inventoriesSuppliesInfoDTO.getRkId());
@@ -83,8 +88,8 @@
@Override
public InventoriesSuppliesInfo getInventoriesSuppliesInfo(InventoriesSuppliesInfoDTO inventoriesSuppliesInfoDTO) {
LambdaQueryWrapper< InventoriesSuppliesInfo> wrapper1= Wrappers.lambdaQuery();
- wrapper1.gt(InventoriesSuppliesInfo::getSuppliesId, inventoriesSuppliesInfoDTO.getSuppliesId());
- wrapper1.gt(InventoriesSuppliesInfo::getRkId, inventoriesSuppliesInfoDTO.getSuppliesId());
+ wrapper1.eq(InventoriesSuppliesInfo::getSuppliesId, inventoriesSuppliesInfoDTO.getSuppliesId());
+ wrapper1.eq(InventoriesSuppliesInfo::getRkId, inventoriesSuppliesInfoDTO.getSuppliesId());
wrapper1.eq( InventoriesSuppliesInfo::getDelFlag,0);
InventoriesSuppliesInfo page2 = this.getOne(wrapper1);
return page2;
@@ -93,7 +98,7 @@
@Override
public void submitInventoriesSuppliesInfo(InventoriesSuppliesInfoDTO inventoriesSuppliesInfoDTO) {
LambdaQueryWrapper< InventoriesSuppliesInfo> wrapper1= Wrappers.lambdaQuery();
- wrapper1.gt(InventoriesSuppliesInfo::getSuppliesId, inventoriesSuppliesInfoDTO.getSuppliesId());
+ wrapper1.eq(InventoriesSuppliesInfo::getSuppliesId, inventoriesSuppliesInfoDTO.getSuppliesId());
wrapper1.eq( InventoriesSuppliesInfo::getDelFlag,0);
List<InventoriesSuppliesInfo> page2 = this.list(wrapper1);
for (InventoriesSuppliesInfo page:page2){
@@ -108,14 +113,25 @@
public void accomplishInventoriesSuppliesInfo(InventoriesSuppliesInfoDTO inventoriesSuppliesInfoDTO) {
LambdaQueryWrapper< InventoriesSuppliesInfo> wrapper1= Wrappers.lambdaQuery();
- wrapper1.gt(InventoriesSuppliesInfo::getSuppliesId, inventoriesSuppliesInfoDTO.getSuppliesId());
- wrapper1.gt(InventoriesSuppliesInfo::getType, 2);
+ wrapper1.eq(InventoriesSuppliesInfo::getSuppliesId, inventoriesSuppliesInfoDTO.getSuppliesId());
+ wrapper1.eq(InventoriesSuppliesInfo::getType, 2);
wrapper1.eq( InventoriesSuppliesInfo::getDelFlag,0);
List<InventoriesSuppliesInfo> page2 = this.list(wrapper1);
for (InventoriesSuppliesInfo page:page2){
SlVolumeProductionRk slVolumeProductionRk = slVolumeProductionRkMapper.selectById(page.getRkId());
slVolumeProductionRk.setRepertoryZhai(page.getSuppliesNum());
slVolumeProductionRkMapper.updateById(slVolumeProductionRk);
+
+
+ LambdaQueryWrapper<ManagementGoodsMaterials> wrapper2 = Wrappers.lambdaQuery();
+ wrapper2.eq(ManagementGoodsMaterials::getGoodsMaterialsId,slVolumeProductionRk.getMaterialsId());
+ wrapper2.eq(ManagementGoodsMaterials::getManagementId,slVolumeProductionRk.getManagementId());
+ wrapper2.eq(ManagementGoodsMaterials::getDelFlag, 0);
+ ManagementGoodsMaterials managementGoodsMaterials = managementGoodsMaterialsMapper.selectOne(wrapper2);
+ if (managementGoodsMaterials!=null){
+ managementGoodsMaterials.setRepertoryZhai(page.getSuppliesNum());
+ managementGoodsMaterialsMapper.updateById(managementGoodsMaterials);
+ }
}
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/InventoriesSuppliesServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/InventoriesSuppliesServiceImpl.java
index 7d02b3b..a1c2e2b 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/InventoriesSuppliesServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/InventoriesSuppliesServiceImpl.java
@@ -62,10 +62,10 @@
@Override
public PageDTO<InventoriesSuppliesVO> getInventoriesSuppliesList(InventoriesSuppliesQuery inventoriesSuppliesQuery) {
LambdaQueryWrapper<SlStoreManagement> wrapper= Wrappers.lambdaQuery();
- if (inventoriesSuppliesQuery.getStoreManagementName()!=null){
+ if (inventoriesSuppliesQuery.getStoreManagementName()!=null&&inventoriesSuppliesQuery.getStoreManagementName()!=""){
wrapper.eq(SlStoreManagement::getStoreManagementName,inventoriesSuppliesQuery.getStoreManagementName());
}
- if (inventoriesSuppliesQuery.getStoreManagementNo()!=null){
+ if (inventoriesSuppliesQuery.getStoreManagementNo()!=null&&inventoriesSuppliesQuery.getStoreManagementNo()!=""){
wrapper.eq(SlStoreManagement::getStoreManagementNo,inventoriesSuppliesQuery.getStoreManagementNo());
}
List<SlStoreManagement> slStoreManagements = slStoreManagementMapper.selectList(wrapper);
@@ -76,7 +76,9 @@
Page<InventoriesSupplies> page = new Page<>(inventoriesSuppliesQuery.getPageCurr(), inventoriesSuppliesQuery.getPageSize());
LambdaQueryWrapper< InventoriesSupplies> wrapper1= Wrappers.lambdaQuery();
- wrapper1.like(InventoriesSupplies::getPdrName,inventoriesSuppliesQuery.getPdrName());
+ if (inventoriesSuppliesQuery.getPdrName()!=null&&inventoriesSuppliesQuery.getPdrName()!=""){
+ wrapper1.like(InventoriesSupplies::getPdrName,inventoriesSuppliesQuery.getPdrName());
+ }
if (slStoreManagementIdList.size()>0){
wrapper1.in(InventoriesSupplies::getMaterialsId,slStoreManagementIdList);
}else {
@@ -88,7 +90,7 @@
wrapper1.gt(InventoriesSupplies::getPdTime, inventoriesSuppliesQuery.getStartpdTime());
}
- if (inventoriesSuppliesQuery.getEndpdTime()!=null){
+ if (inventoriesSuppliesQuery.getEndpdTime()!=null&&inventoriesSuppliesQuery.getPdrName()!=""){
wrapper1.le(InventoriesSupplies::getPdTime, inventoriesSuppliesQuery.getEndpdTime());
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/ManagementGoodsMaterialsServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/ManagementGoodsMaterialsServiceImpl.java
index 15c634d..97f56d1 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/ManagementGoodsMaterialsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/ManagementGoodsMaterialsServiceImpl.java
@@ -18,6 +18,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
@@ -46,19 +47,19 @@
@Override
public PageDTO<ManagementGoodsMaterialsVO> getManagementGoodsMaterialsList(ManagementGoodsMaterialsQuery managementGoodsMaterialsQuery) {
LambdaQueryWrapper<SlStoreManagement> wrapper= Wrappers.lambdaQuery();
- if (managementGoodsMaterialsQuery.getStoreManagementName()!=null){
+ if (managementGoodsMaterialsQuery.getStoreManagementName()!=null&&managementGoodsMaterialsQuery.getStoreManagementName()!=""){
wrapper.like(SlStoreManagement::getStoreManagementName,managementGoodsMaterialsQuery.getStoreManagementName());
}
- if (managementGoodsMaterialsQuery.getStoreManagementNo()!=null){
+ if (managementGoodsMaterialsQuery.getStoreManagementNo()!=null&&managementGoodsMaterialsQuery.getStoreManagementNo()!=""){
wrapper.eq(SlStoreManagement::getStoreManagementNo,managementGoodsMaterialsQuery.getStoreManagementNo());
}
- if (managementGoodsMaterialsQuery.getCityCode()!=null){
+ if (managementGoodsMaterialsQuery.getCityCode()!=null&&managementGoodsMaterialsQuery.getCityCode()!=""){
wrapper.eq(SlStoreManagement::getCityCode,managementGoodsMaterialsQuery.getCityCode());
}
- if (managementGoodsMaterialsQuery.getCountyCode()!=null){
+ if (managementGoodsMaterialsQuery.getCountyCode()!=null&&managementGoodsMaterialsQuery.getCountyCode()!=""){
wrapper.eq(SlStoreManagement::getCountyCode,managementGoodsMaterialsQuery.getCountyCode());
}
- if (managementGoodsMaterialsQuery.getTownCode()!=null){
+ if (managementGoodsMaterialsQuery.getTownCode()!=null&&managementGoodsMaterialsQuery.getTownCode()!=""){
wrapper.eq(SlStoreManagement::getTownCode,managementGoodsMaterialsQuery.getTownCode());
}
List<SlStoreManagement> slStoreManagements = slStoreManagementMapper.selectList(wrapper);
@@ -67,7 +68,7 @@
.collect(Collectors.toSet());
LambdaQueryWrapper<SlGoodsMaterials> wrapper1= Wrappers.lambdaQuery();
- if (managementGoodsMaterialsQuery.getGoodsMaterialsName()!=null){
+ if (managementGoodsMaterialsQuery.getGoodsMaterialsName()!=null&&managementGoodsMaterialsQuery.getGoodsMaterialsName()!=""){
wrapper1.like(SlGoodsMaterials::getGoodsMaterialsName,managementGoodsMaterialsQuery.getGoodsMaterialsName());
}
@@ -83,9 +84,17 @@
if (slVolumeProductionIdList.size()>0){
wrapper3.in(ManagementGoodsMaterials::getManagementId,slVolumeProductionIdList);
+ }else{
+ slVolumeProductionIdList=new HashSet<>();
+ slVolumeProductionIdList.add(0L);
+ wrapper3.in(ManagementGoodsMaterials::getGoodsMaterialsId,slVolumeProductionIdList);
}
if (SlGoodsMaterialsList.size()>0){
wrapper3.in(ManagementGoodsMaterials::getGoodsMaterialsId,SlGoodsMaterialsList);
+ }else{
+ SlGoodsMaterialsList=new HashSet<>();
+ SlGoodsMaterialsList.add(0L);
+ wrapper3.in(ManagementGoodsMaterials::getGoodsMaterialsId,SlGoodsMaterialsList);
}
wrapper3.apply("repertory_zhai<repertory");
wrapper3.eq( ManagementGoodsMaterials::getDelFlag,0);
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkglServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkglServiceImpl.java
index db3a8a6..01ffd04 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkglServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkglServiceImpl.java
@@ -94,7 +94,7 @@
if (volumeProductionCkglDTO.getId()!=null){
SlVolumeProductionCkgl slVolumeProductionRkgl=new SlVolumeProductionCkgl();
slVolumeProductionRkgl.setAttachmentUrl(volumeProductionCkglDTO.getAttachmentUrl());
- slVolumeProductionRkgl.setAuthorization(volumeProductionCkglDTO.getAuthorization());
+ slVolumeProductionRkgl.setAuthorizationUrl(volumeProductionCkglDTO.getAuthorization());
slVolumeProductionRkgl.setSource(volumeProductionCkglDTO.getSource());
slVolumeProductionRkgl.setAuditStatus(1);
slVolumeProductionRkgl.setManagementId(volumeProductionCkglDTO.getManagementId());
@@ -112,14 +112,14 @@
byId.setAttachmentUrl(volumeProductionCkglDTO.getAttachmentUrl());
}
if (volumeProductionCkglDTO.getAuthorization()!=null){
- byId.setAuthorization(volumeProductionCkglDTO.getAuthorization());
+ byId.setAuthorizationUrl(volumeProductionCkglDTO.getAuthorization());
}
this.updateById(byId);
}
}
@Override
- public VolumeProductionCkglInfoVO getVolumeProductionCkglnfo(Integer id) {
+ public VolumeProductionCkglInfoVO getVolumeProductionCkglnfo(Long id) {
SlVolumeProductionCkgl byId = this.getById(id);
VolumeProductionCkglInfoVO v= BeanUtils.copyBean(byId, VolumeProductionCkglInfoVO.class);
@@ -132,7 +132,7 @@
}
@Override
- public VolumeProductionCkglInventoryVO getVolumeProductionCkglInventory(Integer id) {
+ public VolumeProductionCkglInventoryVO getVolumeProductionCkglInventory(Long id) {
SlVolumeProductionCkgl byId = this.getById(id);
VolumeProductionCkglInventoryVO vo = new VolumeProductionCkglInventoryVO();
SysUser data = sysUserClient.getSysUser(byId.getId()).getData();
@@ -202,7 +202,7 @@
}
@Override
- public void ck(Integer id) {
+ public void ck(Long id) {
LambdaQueryWrapper<SlVolumeProductionCk> wrapper1 = Wrappers.lambdaQuery();
wrapper1.eq(SlVolumeProductionCk::getCkglId, id);
wrapper1.eq(SlVolumeProductionCk::getDelFlag, 0);
@@ -234,7 +234,7 @@
}
@Override
- public void gh(Integer id) {
+ public void gh(Long id) {
LambdaQueryWrapper<SlVolumeProductionCk> wrapper1 = Wrappers.lambdaQuery();
wrapper1.eq(SlVolumeProductionCk::getCkglId, id);
wrapper1.eq(SlVolumeProductionCk::getDelFlag, 0);
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java
index 9ca0a0e..be8a26d 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java
@@ -157,7 +157,7 @@
}
@Override
- public ManagementimgVolumeProductionRkVO codeInfo(Integer id) {
+ public ManagementimgVolumeProductionRkVO codeInfo(Long id) {
SlVolumeProductionRk byId = this.getById(id);
ManagementimgVolumeProductionRkVO vo=new ManagementimgVolumeProductionRkVO();
SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsMapper.selectById(byId.getMaterialsId());
@@ -177,7 +177,9 @@
public PageDTO<ManagementimgVolumeProductionRkVO> getroductionRkList(umeProductionRkQuery meProductionRkQuery) {
LambdaQueryWrapper< SlGoodsMaterials> wrapper= Wrappers.lambdaQuery();
- wrapper.eq(SlGoodsMaterials::getGoodsMaterialsName,meProductionRkQuery.getGoodsMaterialsName());
+ if (meProductionRkQuery.getGoodsMaterialsName()!=null&&meProductionRkQuery.getGoodsMaterialsName()!=""){
+ wrapper.eq(SlGoodsMaterials::getGoodsMaterialsName,meProductionRkQuery.getGoodsMaterialsName());
+ }
if (meProductionRkQuery.getIsConsume()!=0){
wrapper.eq(SlGoodsMaterials::getIsConsume,meProductionRkQuery.getIsConsume());
}
@@ -191,12 +193,14 @@
Page<SlVolumeProductionRk> page = new Page<>(meProductionRkQuery.getPageCurr(), meProductionRkQuery.getPageSize());
LambdaQueryWrapper<SlVolumeProductionRk> wrapper1= Wrappers.lambdaQuery();
+ if(meProductionRkQuery.getManagementId()!=null&&meProductionRkQuery.getManagementId()!=0){
wrapper1.eq(SlVolumeProductionRk::getManagementId,meProductionRkQuery.getManagementId());
+ }
if (goodsSkuIdList.size()>0){
wrapper1.in(SlVolumeProductionRk::getMaterialsId,goodsSkuIdList);
- }if(meProductionRkQuery.getStoreManagementNumber()!=null){
+ }if(meProductionRkQuery.getStoreManagementNumber()!=null&&meProductionRkQuery.getStoreManagementNumber()!=0){
wrapper1.eq(SlVolumeProductionRk::getStoreManagementNumber,meProductionRkQuery.getStoreManagementNumber());
- }if(meProductionRkQuery.getShelfId()!=null){
+ }if(meProductionRkQuery.getShelfId()!=null&&meProductionRkQuery.getShelfId()!=0){
wrapper1.eq(SlVolumeProductionRk::getShelfId,meProductionRkQuery.getShelfId());
}
wrapper1.eq( SlVolumeProductionRk::getDelFlag,0);
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java
index a1f01f0..0c20646 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java
@@ -79,7 +79,7 @@
}
@Override
- public VolumeProductionRkgInfoVO getVolumeProductionRkgInfo(Integer id) {
+ public VolumeProductionRkgInfoVO getVolumeProductionRkgInfo(Long id) {
SlVolumeProductionRkgl byId = this.getById(id);
VolumeProductionRkgInfoVO v=BeanUtils.copyBean(byId, VolumeProductionRkgInfoVO.class);
SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(byId.getManagementId());
@@ -103,10 +103,16 @@
.collect(Collectors.toSet());
LambdaQueryWrapper< SlVolumeProductionRkgl> wrapper1= Wrappers.lambdaQuery();
- wrapper1.eq(SlVolumeProductionRkgl::getPresentState,getVolumeProductionRkQuery.getPresentState());
- wrapper1.eq(SlVolumeProductionRkgl::getAuditStatus,getVolumeProductionRkQuery.getAuditStatus());
+ if (getVolumeProductionRkQuery.getPresentState()!=0&&getVolumeProductionRkQuery.getPresentState()!=null){
+ wrapper1.eq(SlVolumeProductionRkgl::getPresentState,getVolumeProductionRkQuery.getPresentState());
+ }
+ if (getVolumeProductionRkQuery.getAuditStatus()!=0&&getVolumeProductionRkQuery.getAuditStatus()!=null) {
+ wrapper1.eq(SlVolumeProductionRkgl::getAuditStatus, getVolumeProductionRkQuery.getAuditStatus());
+ }
if (goodsSkuIdList.size()>0){
wrapper1.in(SlVolumeProductionRkgl::getSysId,goodsSkuIdList);
+ }else{
+
}
wrapper1.eq( SlVolumeProductionRkgl::getDelFlag,0);
wrapper1.orderByDesc(SlVolumeProductionRkgl::getCreateTime);
@@ -127,10 +133,10 @@
@Override
public void addVolumeProductionRkgl(VolumeProductionRkglDTO volumeProductionRkglDTO) {
Long userid = SecurityUtils.getUserId();
- if (volumeProductionRkglDTO.getId()!=null){
+ if (volumeProductionRkglDTO.getId()==null){
SlVolumeProductionRkgl slVolumeProductionRkgl=new SlVolumeProductionRkgl();
slVolumeProductionRkgl.setAttachmentUrl(volumeProductionRkglDTO.getAttachmentUrl());
- slVolumeProductionRkgl.setAuthorization(volumeProductionRkglDTO.getAuthorization());
+ slVolumeProductionRkgl.setAuthorizationUrl(volumeProductionRkglDTO.getAuthorization());
slVolumeProductionRkgl.setAuditStatus(1);
slVolumeProductionRkgl.setManagementId(volumeProductionRkglDTO.getManagementId());
slVolumeProductionRkgl.setPresentState(1);
@@ -155,14 +161,14 @@
byId.setAttachmentUrl(volumeProductionRkglDTO.getAttachmentUrl());
}
if (volumeProductionRkglDTO.getAuthorization()!=null){
- byId.setAuthorization(volumeProductionRkglDTO.getAuthorization());
+ byId.setAuthorizationUrl(volumeProductionRkglDTO.getAuthorization());
}
this.updateById(byId);
}
}
@Override
- public VolumeProductionRkgInventoryVO getVolumeProductionRkgInventory(Integer id) {
+ public VolumeProductionRkgInventoryVO getVolumeProductionRkgInventory(Long id) {
SlVolumeProductionRkgl byId = this.getById(id);
VolumeProductionRkgInventoryVO vo = new VolumeProductionRkgInventoryVO();
SysUser data = sysUserClient.getSysUser(byId.getId()).getData();
@@ -229,7 +235,7 @@
}
@Override
- public void rk(Integer id) {
+ public void rk(Long id) {
LambdaQueryWrapper<SlVolumeProductionRk> wrapper1 = Wrappers.lambdaQuery();
wrapper1.eq(SlVolumeProductionRk::getVolumeProductionRkglId, id);
wrapper1.eq(SlVolumeProductionRk::getDelFlag, 0);
@@ -241,6 +247,9 @@
wrapper2.eq(ManagementGoodsMaterials::getManagementId,list.getManagementId());
wrapper2.eq(ManagementGoodsMaterials::getDelFlag, 0);
ManagementGoodsMaterials managementGoodsMaterials = managementGoodsMaterialsMapper.selectOne(wrapper2);
+
+ SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsMapper.selectById(list.getMaterialsId());
+
if (managementGoodsMaterials!=null){
Long repertorySum = managementGoodsMaterials.getRepertorySum();
Long repertoryZhai = managementGoodsMaterials.getRepertoryZhai();
@@ -248,6 +257,7 @@
Long re1=repertoryZhai+list.getRkNum();
managementGoodsMaterials.setRepertorySum(re);
managementGoodsMaterials.setRepertoryZhai(re1);
+ managementGoodsMaterials.setRepertory(slGoodsMaterials.getRepertory());
managementGoodsMaterialsMapper.updateById(managementGoodsMaterials);
}else{
ManagementGoodsMaterials managementGoodsMaterials1=new ManagementGoodsMaterials();
@@ -255,6 +265,7 @@
managementGoodsMaterials1.setGoodsMaterialsId(list.getMaterialsId());
managementGoodsMaterials1.setRepertoryZhai(list.getRkNum());
managementGoodsMaterials1.setRepertorySum(list.getRkNum());
+ managementGoodsMaterials.setRepertory(slGoodsMaterials.getRepertory());
managementGoodsMaterialsMapper.insert(managementGoodsMaterials1);
}
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionZyglServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionZyglServiceImpl.java
index 78e2432..2738285 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionZyglServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionZyglServiceImpl.java
@@ -98,7 +98,7 @@
if (slVolumeProductionZyDTO.getId()!=null){
SlVolumeProductionZygl slVolumeProductionZygl=new SlVolumeProductionZygl();
slVolumeProductionZygl.setAttachmentUrl(slVolumeProductionZyDTO.getAttachmentUrl());
- slVolumeProductionZygl.setAuthorization(slVolumeProductionZyDTO.getAuthorization());
+ slVolumeProductionZygl.setAuthorizationUrl(slVolumeProductionZyDTO.getAuthorization());
slVolumeProductionZygl.setSource(slVolumeProductionZyDTO.getSource());
slVolumeProductionZygl.setManagementId(slVolumeProductionZyDTO.getManagementId());
slVolumeProductionZygl.setBmanagementId(slVolumeProductionZyDTO.getBmanagementId());
@@ -115,14 +115,14 @@
byId.setAttachmentUrl(slVolumeProductionZyDTO.getAttachmentUrl());
}
if (slVolumeProductionZyDTO.getAuthorization()!=null){
- byId.setAuthorization(slVolumeProductionZyDTO.getAuthorization());
+ byId.setAuthorizationUrl(slVolumeProductionZyDTO.getAuthorization());
}
this.updateById(byId);
}
}
@Override
- public VolumeProductionZyglInfoVO getVolumeProductionzZyglnfo(Integer id) {
+ public VolumeProductionZyglInfoVO getVolumeProductionzZyglnfo(Long id) {
SlVolumeProductionZygl byId = this.getById(id);
VolumeProductionZyglInfoVO v= BeanUtils.copyBean(byId, VolumeProductionZyglInfoVO.class);
SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(byId.getManagementId());
diff --git a/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/InventoriesSuppliesInfoMapper.xml b/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/InventoriesSuppliesInfoMapper.xml
index 3976f0a..a0a7a71 100644
--- a/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/InventoriesSuppliesInfoMapper.xml
+++ b/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/InventoriesSuppliesInfoMapper.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.rouyi.management.mapper.InventoriesSuppliesInfoMapper">
+<mapper namespace="com.ruoyi.management.mapper.InventoriesSuppliesInfoMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.ruoyi.management.domain.InventoriesSuppliesInfo">
diff --git a/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/InventoriesSuppliesMapper.xml b/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/InventoriesSuppliesMapper.xml
index c28a8d2..892a50a 100644
--- a/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/InventoriesSuppliesMapper.xml
+++ b/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/InventoriesSuppliesMapper.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.rouyi.management.mapper.InventoriesSuppliesMapper">
+<mapper namespace="com.ruoyi.management.mapper.InventoriesSuppliesMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.ruoyi.management.domain.InventoriesSupplies">
diff --git a/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/ManagementGoodsMaterialsMapper.xml b/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/ManagementGoodsMaterialsMapper.xml
index 721d034..7845762 100644
--- a/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/ManagementGoodsMaterialsMapper.xml
+++ b/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/ManagementGoodsMaterialsMapper.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.rouyi.management.mapper.ManagementGoodsMaterialsMapper">
+<mapper namespace="com.ruoyi.management.mapper.ManagementGoodsMaterialsMapper">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.ruoyi.management.domain.ManagementGoodsMaterials">
diff --git a/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlAuditMapper.xml b/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlAuditMapper.xml
index 27d3619..5961cfa 100644
--- a/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlAuditMapper.xml
+++ b/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlAuditMapper.xml
@@ -2,18 +2,5 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.management.mapper.SlAuditMapper">
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlAudit">
- <id column="id" property="id" />
- <result column="rk_id" property="rkId" />
- <result column="del_flag" property="delFlag" />
- <result column="create_by" property="createBy" />
- <result column="create_time" property="createTime" />
- <result column="update_by" property="updateBy" />
- <result column="update_time" property="updateTime" />
- <result column="state" property="state" />
- <result column="type" property="type" />
- <result column="cause" property="cause" />
- </resultMap>
</mapper>
diff --git a/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlAuditRecordMapper.xml b/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlAuditRecordMapper.xml
index dcf38ed..bcef46a 100644
--- a/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlAuditRecordMapper.xml
+++ b/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlAuditRecordMapper.xml
@@ -2,18 +2,5 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.management.mapper.SlAuditRecordMapper">
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlAuditRecord">
- <id column="id" property="id" />
- <result column="audit_id" property="auditId" />
- <result column="shenh_id" property="shenhId" />
- <result column="type" property="type" />
- <result column="state" property="state" />
- <result column="del_flag" property="delFlag" />
- <result column="create_by" property="createBy" />
- <result column="create_time" property="createTime" />
- <result column="update_by" property="updateBy" />
- <result column="update_time" property="updateTime" />
- </resultMap>
</mapper>
diff --git a/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlEquipmentMapper.xml b/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlEquipmentMapper.xml
index 300a602..f62b42a 100644
--- a/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlEquipmentMapper.xml
+++ b/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlEquipmentMapper.xml
@@ -2,18 +2,4 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.management.mapper.SlEquipmentMapper">
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlEquipment">
- <id column="id" property="id" />
- <result column="equipment_name" property="equipmentName" />
- <result column="equipment_num" property="equipmentNum" />
- <result column="type" property="type" />
- <result column="management_id" property="managementId" />
- <result column="del_flag" property="delFlag" />
- <result column="create_by" property="createBy" />
- <result column="create_time" property="createTime" />
- <result column="update_by" property="updateBy" />
- <result column="update_time" property="updateTime" />
- </resultMap>
-
</mapper>
diff --git a/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlGoodsMaterialsMapper.xml b/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlGoodsMaterialsMapper.xml
index 79ee950..1f589d4 100644
--- a/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlGoodsMaterialsMapper.xml
+++ b/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlGoodsMaterialsMapper.xml
@@ -2,22 +2,5 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.management.mapper.SlGoodsMaterialsMapper">
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlGoodsMaterials">
- <id column="id" property="id" />
- <result column="goods_materials_name" property="goodsMaterialsName" />
- <result column="is_consume" property="isConsume" />
- <result column="repertory" property="repertory" />
- <result column="del_flag" property="delFlag" />
- <result column="create_by" property="createBy" />
- <result column="create_time" property="createTime" />
- <result column="update_by" property="updateBy" />
- <result column="update_time" property="updateTime" />
- <result column="repertory_sum" property="repertorySum" />
- <result column="repertory_zhai" property="repertoryZhai" />
- <result column="repertory_chu" property="repertoryChu" />
- <result column="repertory_yishi" property="repertoryYishi" />
- <result column="check_num" property="checkNum" />
- </resultMap>
</mapper>
diff --git a/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlGoodsShelfMapper.xml b/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlGoodsShelfMapper.xml
index 250ea2d..e190722 100644
--- a/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlGoodsShelfMapper.xml
+++ b/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlGoodsShelfMapper.xml
@@ -2,21 +2,5 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.management.mapper.SlGoodsShelfMapper">
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlGoodsShelf">
- <id column="id" property="id" />
- <result column="goods_shelf_name" property="goodsShelfName" />
- <result column="store_management_id" property="storeManagementId" />
- <result column="is_store_management" property="isStoreManagement" />
- <result column="img_id" property="imgId" />
- <result column="zb_x" property="zbX" />
- <result column="zb_y" property="zbY" />
- <result column="store_management_number" property="storeManagementNumber" />
- <result column="del_flag" property="delFlag" />
- <result column="create_by" property="createBy" />
- <result column="create_time" property="createTime" />
- <result column="update_by" property="updateBy" />
- <result column="update_time" property="updateTime" />
- </resultMap>
</mapper>
diff --git a/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlStoreManagementImgMapper.xml b/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlStoreManagementImgMapper.xml
index 69dd644..c36c375 100644
--- a/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlStoreManagementImgMapper.xml
+++ b/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlStoreManagementImgMapper.xml
@@ -2,17 +2,6 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.management.mapper.SlStoreManagementImgMapper">
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlStoreManagementImg">
- <id column="id" property="id" />
- <result column="img_url" property="imgUrl" />
- <result column="store_management_number" property="storeManagementNumber" />
- <result column="store_management_id" property="storeManagementId" />
- <result column="del_flag" property="delFlag" />
- <result column="create_by" property="createBy" />
- <result column="create_time" property="createTime" />
- <result column="update_by" property="updateBy" />
- <result column="update_time" property="updateTime" />
- </resultMap>
+
</mapper>
diff --git a/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlStoreManagementMapper.xml b/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlStoreManagementMapper.xml
index 7ea9aa7..bad5244 100644
--- a/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlStoreManagementMapper.xml
+++ b/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlStoreManagementMapper.xml
@@ -2,26 +2,4 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.management.mapper.SlStoreManagementMapper">
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlStoreManagement">
- <id column="id" property="id" />
- <result column="store_management_name" property="storeManagementName" />
- <result column="store_management_no" property="storeManagementNo" />
- <result column="store_management_number" property="storeManagementNumber" />
- <result column="store_management_grade" property="storeManagementGrade" />
- <result column="store_management_city" property="storeManagementCity" />
- <result column="store_management_county" property="storeManagementCounty" />
- <result column="store_management_village" property="storeManagementVillage" />
- <result column="director_id" property="directorId" />
- <result column="competent_id" property="competentId" />
- <result column="administrator_id" property="administratorId" />
- <result column="store_management_adder" property="storeManagementAdder" />
- <result column="store_management_explain" property="storeManagementExplain" />
- <result column="del_flag" property="delFlag" />
- <result column="create_by" property="createBy" />
- <result column="create_time" property="createTime" />
- <result column="update_by" property="updateBy" />
- <result column="update_time" property="updateTime" />
- </resultMap>
-
</mapper>
diff --git a/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlVolumeProductionCkMapper.xml b/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlVolumeProductionCkMapper.xml
index f877988..e719bb9 100644
--- a/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlVolumeProductionCkMapper.xml
+++ b/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlVolumeProductionCkMapper.xml
@@ -2,24 +2,5 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.management.mapper.SlVolumeProductionCkMapper">
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlVolumeProductionCk">
- <id column="id" property="id" />
- <result column="materials_id" property="materialsId" />
- <result column="rk_id" property="rkId" />
- <result column="ck_num" property="ckNum" />
- <result column="del_flag" property="delFlag" />
- <result column="create_by" property="createBy" />
- <result column="create_time" property="createTime" />
- <result column="update_by" property="updateBy" />
- <result column="update_time" property="updateTime" />
- <result column="supplier_id" property="supplierId" />
- <result column="attachment" property="attachment" />
- <result column="source" property="source" />
- <result column="remark" property="remark" />
- <result column="state" property="state" />
- <result column="guih_num" property="guihNum" />
- <result column="type" property="type" />
- </resultMap>
</mapper>
diff --git a/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlVolumeProductionCkglMapper.xml b/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlVolumeProductionCkglMapper.xml
index 2bb1322..64ace9f 100644
--- a/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlVolumeProductionCkglMapper.xml
+++ b/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlVolumeProductionCkglMapper.xml
@@ -2,20 +2,5 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.management.mapper.SlVolumeProductionCkglMapper">
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlVolumeProductionCkgl">
- <id column="id" property="id" />
- <result column="sys_id" property="sysId" />
- <result column="management_id" property="managementId" />
- <result column="starti_time" property="startiTime" />
- <result column="end_time" property="endTime" />
- <result column="del_flag" property="delFlag" />
- <result column="create_by" property="createBy" />
- <result column="create_time" property="createTime" />
- <result column="update_by" property="updateBy" />
- <result column="update_time" property="updateTime" />
- <result column="present_state" property="presentState" />
- <result column="audit_status" property="auditStatus" />
- </resultMap>
</mapper>
diff --git a/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlVolumeProductionRkMapper.xml b/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlVolumeProductionRkMapper.xml
index 88dac5b..5acad16 100644
--- a/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlVolumeProductionRkMapper.xml
+++ b/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlVolumeProductionRkMapper.xml
@@ -2,26 +2,6 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.management.mapper.SlVolumeProductionRkMapper">
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlVolumeProductionRk">
- <id column="id" property="id" />
- <result column="materials_id" property="materialsId" />
- <result column="rk_num" property="rkNum" />
- <result column="rk_model" property="rkModel" />
- <result column="rk_pice" property="rkPice" />
- <result column="store_management_number" property="storeManagementNumber" />
- <result column="shelf_id" property="shelfId" />
- <result column="del_flag" property="delFlag" />
- <result column="create_by" property="createBy" />
- <result column="create_time" property="createTime" />
- <result column="update_by" property="updateBy" />
- <result column="update_time" property="updateTime" />
- <result column="supplier_id" property="supplierId" />
- <result column="attachment" property="attachment" />
- <result column="source" property="source" />
- <result column="remark" property="remark" />
- <result column="state" property="state" />
- </resultMap>
<select id="getManagementInventoryList" resultType="java.lang.Integer">
SELECT ifnull(COUNT(*), 0) FROM sl_volume_production_rk sl
diff --git a/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlVolumeProductionRkglMapper.xml b/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlVolumeProductionRkglMapper.xml
index 1c1efa5..549cbbe 100644
--- a/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlVolumeProductionRkglMapper.xml
+++ b/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlVolumeProductionRkglMapper.xml
@@ -2,20 +2,5 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.management.mapper.SlVolumeProductionRkglMapper">
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlVolumeProductionRkgl">
- <id column="id" property="id" />
- <result column="sys_id" property="sysId" />
- <result column="management_id" property="managementId" />
- <result column="starti_time" property="startiTime" />
- <result column="end_time" property="endTime" />
- <result column="del_flag" property="delFlag" />
- <result column="create_by" property="createBy" />
- <result column="create_time" property="createTime" />
- <result column="update_by" property="updateBy" />
- <result column="update_time" property="updateTime" />
- <result column="present_state" property="presentState" />
- <result column="audit_status" property="auditStatus" />
- </resultMap>
</mapper>
diff --git a/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlVolumeProductionZyMapper.xml b/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlVolumeProductionZyMapper.xml
index 3e5b166..af6fa96 100644
--- a/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlVolumeProductionZyMapper.xml
+++ b/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlVolumeProductionZyMapper.xml
@@ -2,24 +2,5 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.management.mapper.SlVolumeProductionZyMapper">
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlVolumeProductionZy">
- <id column="id" property="id" />
- <result column="materials_id" property="materialsId" />
- <result column="rk_id" property="rkId" />
- <result column="zy_num" property="zyNum" />
- <result column="del_flag" property="delFlag" />
- <result column="create_by" property="createBy" />
- <result column="create_time" property="createTime" />
- <result column="update_by" property="updateBy" />
- <result column="update_time" property="updateTime" />
- <result column="supplier_id" property="supplierId" />
- <result column="attachment" property="attachment" />
- <result column="source" property="source" />
- <result column="remark" property="remark" />
- <result column="state" property="state" />
- <result column="guih_num" property="guihNum" />
- <result column="type" property="type" />
- </resultMap>
</mapper>
diff --git a/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlVolumeProductionZyglMapper.xml b/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlVolumeProductionZyglMapper.xml
index 35bd618..cdb876e 100644
--- a/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlVolumeProductionZyglMapper.xml
+++ b/ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlVolumeProductionZyglMapper.xml
@@ -2,21 +2,5 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.management.mapper.SlVolumeProductionZyglMapper">
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlVolumeProductionZygl">
- <id column="id" property="id" />
- <result column="sys_id" property="sysId" />
- <result column="management_id" property="managementId" />
- <result column="starti_time" property="startiTime" />
- <result column="end_time" property="endTime" />
- <result column="del_flag" property="delFlag" />
- <result column="create_by" property="createBy" />
- <result column="create_time" property="createTime" />
- <result column="update_by" property="updateBy" />
- <result column="update_time" property="updateTime" />
- <result column="present_state" property="presentState" />
- <result column="audit_status" property="auditStatus" />
- <result column="bmanagement_id" property="bmanagementId" />
- </resultMap>
</mapper>
--
Gitblit v1.7.1