open_platform/ss-common-storage
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

重命名

Browse Source
This commit is contained in:
wangpengfei
2024-06-06 16:31:57 +08:00
parent 4d164aa76e
commit ed5e0da99b
145 changed files with 1410 additions and 872 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/main/java/com/yxt/warehouse/apiadmin/WarehouseAnsBillDetailsRest.java Normal file
View File

@@ -0,0 +1,56 @@
package com.yxt.warehouse.apiadmin;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillDetailDto;
import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillDetailQuery;
import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillDetailService;
import com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillDetailVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
* @author wangpengfei
* @date 2024/6/6 15:04
*/
@Api(tags = "预期到货通知单明细")
@RestController
@RequestMapping("/apiadmin/wmsansbilldetails")
public class WarehouseAnsBillDetailsRest {
@Autowired
private WarehouseAnsBillDetailService warehouseAnsBillDetailService;
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<WarehouseAnsBillDetailVo>> listPage(@RequestBody PagerQuery<WarehouseAnsBillDetailQuery> pq){
return warehouseAnsBillDetailService.listPage(pq);
}
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody WarehouseAnsBillDetailDto dto){
ResultBean rb = ResultBean.fireFail();
warehouseAnsBillDetailService.saveOrUpdateDto(dto);
return rb.success();
}
@ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
warehouseAnsBillDetailService.delAll(sids);
return rb.success();
}
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<WarehouseAnsBillDetailVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
WarehouseAnsBillDetailVo vo = warehouseAnsBillDetailService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
}

18
src/main/java/com/yxt/warehouse/apiadmin/WmsWarehouseAreaRest.java → src/main/java/com/yxt/warehouse/apiadmin/WarehouseAreaRest.java
View File

@@ -3,7 +3,7 @@ package com.yxt.warehouse.apiadmin;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.warehouse.biz.wmswarehousearea.*;
import com.yxt.warehouse.biz.warehousearea.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -18,31 +18,31 @@ import java.util.List;
@Api(tags = "库区信息")
@RestController
@RequestMapping("/apiadmin/base/wmswarehousearea")
public class WmsWarehouseAreaRest {
public class WarehouseAreaRest {
@Autowired
WmsWarehouseAreaService wmsWarehouseAreaService;
WarehouseAreaService wmsWarehouseAreaService;
@ApiOperation("分页列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<WmsWarehouseAreaVo>> listPage(@RequestBody PagerQuery<WmsWarehouseAreaQuery> pq) {
public ResultBean<PagerVo<WarehouseAreaVo>> listPage(@RequestBody PagerQuery<WarehouseAreaQuery> pq) {
return wmsWarehouseAreaService.listPage(pq);
}
@ApiOperation("查询所有的库区")
@GetMapping("/listAll")
public ResultBean<WmsWarehouseAreaVo> listAll() {
public ResultBean<WarehouseAreaVo> listAll() {
return wmsWarehouseAreaService.getAllType();
}
@ApiOperation("保存修改")
@PostMapping("/saveOrUpdate")
public ResultBean<String> saveOrUpdate(@RequestBody WmsWarehouseAreaDto dto) {
public ResultBean<String> saveOrUpdate(@RequestBody WarehouseAreaDto dto) {
return wmsWarehouseAreaService.saveOrUpdate(dto);
}
@ApiOperation("初始化")
@GetMapping("/initialization/{sid}")
public ResultBean<WmsWarehouseAreaVo> initialization(@PathVariable("sid") String sid) {
public ResultBean<WarehouseAreaVo> initialization(@PathVariable("sid") String sid) {
return wmsWarehouseAreaService.initialization(sid);
}
@@ -67,9 +67,9 @@ public class WmsWarehouseAreaRest {
@ApiOperation("根据仓库sid查询所有库位")
@GetMapping("/selectAll")
public ResultBean<List<WmsWarehouseAreaAllVo>> selectAll(@RequestParam("ckSid") String ckSid){
public ResultBean<List<WarehouseAreaAllVo>> selectAll(@RequestParam("ckSid") String ckSid){
ResultBean rb = ResultBean.fireFail();
List<WmsWarehouseAreaAllVo> vo = wmsWarehouseAreaService.selectAll(ckSid);
List<WarehouseAreaAllVo> vo = wmsWarehouseAreaService.selectAll(ckSid);
return rb.success().setData(vo);
}
}

20
src/main/java/com/yxt/warehouse/apiadmin/WmsWarehouseAreaTypeRest.java → src/main/java/com/yxt/warehouse/apiadmin/WarehouseAreaTypeRest.java
View File

@@ -3,10 +3,10 @@ package com.yxt.warehouse.apiadmin;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.warehouse.biz.wmswarehouseareatype.WmsWarehouseAreaTypeDto;
import com.yxt.warehouse.biz.wmswarehouseareatype.WmsWarehouseAreaTypeQuery;
import com.yxt.warehouse.biz.wmswarehouseareatype.WmsWarehouseAreaTypeService;
import com.yxt.warehouse.biz.wmswarehouseareatype.WmsWarehouseAreaTypeVo;
import com.yxt.warehouse.biz.warehouseareatype.WarehouseAreaTypeDto;
import com.yxt.warehouse.biz.warehouseareatype.WarehouseAreaTypeQuery;
import com.yxt.warehouse.biz.warehouseareatype.WarehouseAreaTypeService;
import com.yxt.warehouse.biz.warehouseareatype.WarehouseAreaTypeVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,31 +19,31 @@ import org.springframework.web.bind.annotation.*;
@Api(tags = "库区类型信息")
@RestController
@RequestMapping("/apiadmin/base/wmswarehouseareatype")
public class WmsWarehouseAreaTypeRest {
public class WarehouseAreaTypeRest {
@Autowired
WmsWarehouseAreaTypeService wmsWarehouseAreaTypeService;
WarehouseAreaTypeService wmsWarehouseAreaTypeService;
@ApiOperation("分页列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<WmsWarehouseAreaTypeVo>> listPage(@RequestBody PagerQuery<WmsWarehouseAreaTypeQuery> pq) {
public ResultBean<PagerVo<WarehouseAreaTypeVo>> listPage(@RequestBody PagerQuery<WarehouseAreaTypeQuery> pq) {
return wmsWarehouseAreaTypeService.listPage(pq);
}
@ApiOperation("查询所有的")
@GetMapping("/listAll")
public ResultBean<WmsWarehouseAreaTypeVo> listAll() {
public ResultBean<WarehouseAreaTypeVo> listAll() {
return wmsWarehouseAreaTypeService.listAll();
}
@ApiOperation("保存修改")
@PostMapping("/saveOrUpdate")
public ResultBean<String> saveOrUpdate(@RequestBody WmsWarehouseAreaTypeDto dto) {
public ResultBean<String> saveOrUpdate(@RequestBody WarehouseAreaTypeDto dto) {
return wmsWarehouseAreaTypeService.saveOrUpdate(dto);
}
@ApiOperation("初始化")
@GetMapping("/initialization/{sid}")
public ResultBean<WmsWarehouseAreaTypeVo> initialization(@PathVariable("sid") String sid) {
public ResultBean<WarehouseAreaTypeVo> initialization(@PathVariable("sid") String sid) {
return wmsWarehouseAreaTypeService.initialization(sid);
}

14
src/main/java/com/yxt/warehouse/apiadmin/WmsWarehouseExtendRest.java → src/main/java/com/yxt/warehouse/apiadmin/WarehouseExtendRest.java
View File

@@ -1,9 +1,9 @@
package com.yxt.warehouse.apiadmin;
import com.yxt.common.core.result.ResultBean;
import com.yxt.warehouse.biz.wmswarehouseextend.WmsWarehouseExtendDto;
import com.yxt.warehouse.biz.wmswarehouseextend.WmsWarehouseExtendService;
import com.yxt.warehouse.biz.wmswarehouseextend.WmsWarehouseExtendVo;
import com.yxt.warehouse.biz.warehouseextend.WarehouseExtendDto;
import com.yxt.warehouse.biz.warehouseextend.WarehouseExtendService;
import com.yxt.warehouse.biz.warehouseextend.WarehouseExtendVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,21 +16,21 @@ import org.springframework.web.bind.annotation.*;
@Api(tags = "库区信息")
@RestController
@RequestMapping("/apiadmin/base/wmswarehouseextend")
public class WmsWarehouseExtendRest {
public class WarehouseExtendRest {
@Autowired
WmsWarehouseExtendService wmsWarehouseExtendService;
WarehouseExtendService wmsWarehouseExtendService;
@ApiOperation("保存修改")
@PostMapping("/saveOrUpdate")
public ResultBean<String> saveOrUpdate(@RequestBody WmsWarehouseExtendDto dto) {
public ResultBean<String> saveOrUpdate(@RequestBody WarehouseExtendDto dto) {
return wmsWarehouseExtendService.saveOrUpdate(dto);
}
@ApiOperation("初始化")
@GetMapping("/initialization/{sid}")
public ResultBean<WmsWarehouseExtendVo> initialization(@PathVariable("sid") String sid) {
public ResultBean<WarehouseExtendVo> initialization(@PathVariable("sid") String sid) {
return wmsWarehouseExtendService.initialization(sid);
}

20
src/main/java/com/yxt/warehouse/apiadmin/WmsWarehouseInfoRest.java → src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java
View File

@@ -3,8 +3,8 @@ package com.yxt.warehouse.apiadmin;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.warehouse.biz.wmswarehousearea.WmsWarehouseAreaAllVo;
import com.yxt.warehouse.biz.wmswarehouseinfo.*;
import com.yxt.warehouse.biz.warehousearea.WarehouseAreaAllVo;
import com.yxt.warehouse.biz.warehousewarehouseinfo.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,31 +19,31 @@ import java.util.List;
@Api(tags = "仓库信息")
@RestController
@RequestMapping("/apiadmin/base/wmswarehouseinfo")
public class WmsWarehouseInfoRest {
public class WarehouseInfoRest {
@Autowired
WmsWarehouseInfoService wmsWarehouseService;
WarehouseInfoService wmsWarehouseService;
@ApiOperation("分页列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<WmsWarehouseInfoVo>> listPage(@RequestBody PagerQuery<WmsWarehouseInfoQuery> pq) {
public ResultBean<PagerVo<WarehouseInfoVo>> listPage(@RequestBody PagerQuery<WarehouseInfoQuery> pq) {
return wmsWarehouseService.listPage(pq);
}
@ApiOperation("查询所有的仓库")
@GetMapping("/listAll")
public ResultBean<WmsWarehouseInfoVo> listAll() {
public ResultBean<WarehouseInfoVo> listAll() {
return wmsWarehouseService.listAll();
}
@ApiOperation("保存修改")
@PostMapping("/saveOrUpdate")
public ResultBean<String> saveOrUpdate(@RequestBody WmsWarehouseInfoDto dto) {
public ResultBean<String> saveOrUpdate(@RequestBody WarehouseInfoDto dto) {
return wmsWarehouseService.saveOrUpdate(dto);
}
@ApiOperation("初始化")
@GetMapping("/initialization/{sid}")
public ResultBean<WmsWarehouseInfoVo> initialization(@PathVariable("sid") String sid) {
public ResultBean<WarehouseInfoVo> initialization(@PathVariable("sid") String sid) {
return wmsWarehouseService.initialization(sid);
}
@@ -68,9 +68,9 @@ public class WmsWarehouseInfoRest {
@ApiOperation("查询所有仓库")
@GetMapping("/selectAll")
public ResultBean<List<WmsWarehouseInfoAllVo>> selectAll(){
public ResultBean<List<WarehouseInfoAllVo>> selectAll(){
ResultBean rb = ResultBean.fireFail();
List<WmsWarehouseAreaAllVo> wmsWarehouseAreaAllVos = wmsWarehouseService.selectAll();
List<WarehouseAreaAllVo> wmsWarehouseAreaAllVos = wmsWarehouseService.selectAll();
return rb.success().setData(wmsWarehouseAreaAllVos);
}
}

22
src/main/java/com/yxt/warehouse/apiadmin/WmsInventoryAllocatebillDetailRest.java → src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryAllocatebillDetailRest.java
View File

@@ -28,11 +28,11 @@ package com.yxt.warehouse.apiadmin;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.warehouse.biz.wmsinventoryallocatebill.*;
import com.yxt.warehouse.biz.wmsinventoryallocatebilldetail.WmsInventoryAllocateBillDetailDtoNew;
import com.yxt.warehouse.biz.wmsinventoryallocatebilldetail.WmsInventoryAllocateBillDetailQuery;
import com.yxt.warehouse.biz.wmsinventoryallocatebilldetail.WmsInventoryAllocateBillDetailService;
import com.yxt.warehouse.biz.wmsinventoryallocatebilldetail.WmsInventoryAllocateBillDetailVo;
import com.yxt.warehouse.biz.warehouseinventoryallocatebill.*;
import com.yxt.warehouse.biz.warehouseinventoryallocatebilldetail.WarehouseInventoryAllocatebillDetailDtoNew;
import com.yxt.warehouse.biz.warehouseinventoryallocatebilldetail.WarehouseInventoryAllocatebillDetailQuery;
import com.yxt.warehouse.biz.warehouseinventoryallocatebilldetail.WarehouseInventoryAllocatebillDetailService;
import com.yxt.warehouse.biz.warehouseinventoryallocatebilldetail.WarehouseInventoryAllocatebillDetailVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -54,22 +54,22 @@ import org.springframework.web.bind.annotation.*;
@Api(tags = "(调拨单-明细)")
@RestController
@RequestMapping("v1/wmsinventoryallocatebilldetail")
public class WmsInventoryAllocatebillDetailRest {
public class WarehouseInventoryAllocatebillDetailRest {
@Autowired
private WmsInventoryAllocateBillDetailService wmsInventoryAllocateBillDetailService;
private WarehouseInventoryAllocatebillDetailService wmsInventoryAllocateBillDetailService;
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<WmsInventoryAllocateBillDetailVo>> listPage(@RequestBody PagerQuery<WmsInventoryAllocateBillDetailQuery> pq){
public ResultBean<PagerVo<WarehouseInventoryAllocatebillDetailVo>> listPage(@RequestBody PagerQuery<WarehouseInventoryAllocatebillDetailQuery> pq){
return wmsInventoryAllocateBillDetailService.listPage(pq);
}
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody WmsInventoryAllocateBillDetailDtoNew dto){
public ResultBean save(@RequestBody WarehouseInventoryAllocatebillDetailDtoNew dto){
ResultBean rb = ResultBean.fireFail();
wmsInventoryAllocateBillDetailService.saveOrUpdateDto(dto);
return rb.success();
@@ -85,9 +85,9 @@ public class WmsInventoryAllocatebillDetailRest {
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<WmsInventoryAllocateBillDetailsVoNew> fetchDetailsBySid(@PathVariable("sid") String sid){
public ResultBean<WarehouseInventoryAllocatebillDetailsVoNew> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
WmsInventoryAllocateBillDetailsVoNew vo = wmsInventoryAllocateBillDetailService.fetchDetailsVoBySid(sid);
WarehouseInventoryAllocatebillDetailsVoNew vo = wmsInventoryAllocateBillDetailService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}

18
src/main/java/com/yxt/warehouse/apiadmin/WmsInventoryAllocatebillRest.java → src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryAllocatebillRest.java
View File

@@ -28,7 +28,7 @@ package com.yxt.warehouse.apiadmin;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.warehouse.biz.wmsinventoryallocatebill.*;
import com.yxt.warehouse.biz.warehouseinventoryallocatebill.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -50,22 +50,22 @@ import org.springframework.web.bind.annotation.*;
@Api(tags = "(调拨单)-调出方操作")
@RestController
@RequestMapping("/apiadmin/inventory/wmsinventoryallocatebill")
public class WmsInventoryAllocatebillRest {
public class WarehouseInventoryAllocatebillRest {
@Autowired
private WmsInventoryAllocateBillService wmsInventoryAllocateBillService;
private WarehouseInventoryAllocatebillService wmsInventoryAllocateBillService;
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<WmsInventoryAllocateBillVoNew>> listPage(@RequestBody PagerQuery<WmsInventoryAllocateBillQueryNew> pq){
public ResultBean<PagerVo<WarehouseInventoryAllocatebillVoNew>> listPage(@RequestBody PagerQuery<WarehouseInventoryAllocatebillQueryNew> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<WmsInventoryAllocateBillVoNew> pv = wmsInventoryAllocateBillService.listPageVo(pq);
PagerVo<WarehouseInventoryAllocatebillVoNew> pv = wmsInventoryAllocateBillService.listPageVo(pq);
return rb.success().setData(pv);
}
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody WmsInventoryAllocateBillDtoNew dto){
public ResultBean save(@RequestBody WarehouseInventoryAllocatebillDtoNew dto){
ResultBean rb = ResultBean.fireFail();
wmsInventoryAllocateBillService.saveOrUpdateDto(dto);
return rb.success();
@@ -81,15 +81,15 @@ public class WmsInventoryAllocatebillRest {
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<WmsInventoryAllocateBillDetailsVoNew> fetchDetailsBySid(@PathVariable("sid") String sid){
public ResultBean<WarehouseInventoryAllocatebillDetailsVoNew> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
WmsInventoryAllocateBillDetailsVoNew vo = wmsInventoryAllocateBillService.fetchDetailsVoBySid(sid);
WarehouseInventoryAllocatebillDetailsVoNew vo = wmsInventoryAllocateBillService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
@ApiOperation("调拨")
@PostMapping("/allocation")
public ResultBean allocation(@RequestBody WmsInventoryAllocateBillDtoNew dto){
public ResultBean allocation(@RequestBody WarehouseInventoryAllocatebillDtoNew dto){
ResultBean rb = ResultBean.fireFail();
wmsInventoryAllocateBillService.allocation(dto);
return rb.success();

12
src/main/java/com/yxt/warehouse/apiadmin/WmsInventoryBatchRest.java → src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryBatchRest.java
View File

@@ -3,7 +3,7 @@ package com.yxt.warehouse.apiadmin;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.warehouse.biz.wmsinventorybatch.*;
import com.yxt.warehouse.biz.warehouseinventorybatch.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,28 +16,28 @@ import org.springframework.web.bind.annotation.*;
@Api(tags = "(商品库存-批次属性)")
@RestController
@RequestMapping("/apiadmin/base/inventorybatch")
public class WmsInventoryBatchRest {
public class WarehouseInventoryBatchRest {
@Autowired
WmsInventoryBatchService wmsInventoryBatchService;
WarehouseInventoryBatchService wmsInventoryBatchService;
@ApiOperation("分页列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<WmsInventoryBatchVo>> listPage(@RequestBody PagerQuery<WmsInventoryBatchQuery> pq) {
public ResultBean<PagerVo<WarehouseInventoryBatchVo>> listPage(@RequestBody PagerQuery<WarehouseInventoryBatchQuery> pq) {
return new ResultBean(wmsInventoryBatchService.listPageVo(pq));
}
@ApiOperation("保存修改")
@PostMapping("/saveOrUpdate")
public void saveOrUpdate(@RequestBody WmsInventoryBatchDto dto) {
public void saveOrUpdate(@RequestBody WarehouseInventoryBatchDto dto) {
wmsInventoryBatchService.saveOrUpdateDto(dto);
}
@ApiOperation("初始化")
@GetMapping("/initialization/{sid}")
public ResultBean<WmsInventoryBatchDetailsVo> initialization(@PathVariable("sid") String sid) {
public ResultBean<WarehouseInventoryBatchDetailsVo> initialization(@PathVariable("sid") String sid) {
return new ResultBean<>(wmsInventoryBatchService.fetchDetailsVoBySid(sid));
}

16
src/main/java/com/yxt/warehouse/apiadmin/WmsInventoryCheckbillDetailRest.java → src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryCheckbillDetailRest.java
View File

@@ -28,7 +28,7 @@ package com.yxt.warehouse.apiadmin;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.warehouse.biz.wmsinventorycheckbilldetail.*;
import com.yxt.warehouse.biz.warehouseinventorycheckbilldetail.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -50,22 +50,22 @@ import org.springframework.web.bind.annotation.*;
@Api(tags = "库存盘点-明细")
@RestController
@RequestMapping("wmsinventorycheckbilldetail")
public class WmsInventoryCheckbillDetailRest {
public class WarehouseInventoryCheckbillDetailRest {
@Autowired
private WmsInventoryCheckbillDetailService wmsInventoryCheckbillDetailService;
private WarehouseInventoryCheckbillDetailService wmsInventoryCheckbillDetailService;
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<WmsInventoryCheckbillDetailVo>> listPage(@RequestBody PagerQuery<WmsInventoryCheckbillDetailQuery> pq){
public ResultBean<PagerVo<WarehouseInventoryCheckbillDetailVo>> listPage(@RequestBody PagerQuery<WarehouseInventoryCheckbillDetailQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<WmsInventoryCheckbillDetailVo> pv = wmsInventoryCheckbillDetailService.listPageVo(pq);
PagerVo<WarehouseInventoryCheckbillDetailVo> pv = wmsInventoryCheckbillDetailService.listPageVo(pq);
return rb.success().setData(pv);
}
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody WmsInventoryCheckbillDetailDto dto){
public ResultBean save(@RequestBody WarehouseInventoryCheckbillDetailDto dto){
ResultBean rb = ResultBean.fireFail();
wmsInventoryCheckbillDetailService.saveOrUpdateDto(dto);
return rb.success();
@@ -81,9 +81,9 @@ public class WmsInventoryCheckbillDetailRest {
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<WmsInventoryCheckbillDetailDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
public ResultBean<WarehouseInventoryCheckbillDetailDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
WmsInventoryCheckbillDetailDetailsVo vo = wmsInventoryCheckbillDetailService.fetchDetailsVoBySid(sid);
WarehouseInventoryCheckbillDetailDetailsVo vo = wmsInventoryCheckbillDetailService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
}

18
src/main/java/com/yxt/warehouse/apiadmin/WmsInventoryCheckbillRest.java → src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventoryCheckbillRest.java
View File

@@ -28,7 +28,7 @@ package com.yxt.warehouse.apiadmin;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.warehouse.biz.wmsinventorycheckbill.*;
import com.yxt.warehouse.biz.warehouseinventorycheckbill.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -50,22 +50,22 @@ import org.springframework.web.bind.annotation.*;
@Api(tags = "库存盘点")
@RestController
@RequestMapping("v1/wmsinventorycheckbill")
public class WmsInventoryCheckbillRest {
public class WarehouseInventoryCheckbillRest {
@Autowired
private WmsInventoryCheckbillService wmsInventoryCheckbillService;
private WarehouseInventoryCheckBillService wmsInventoryCheckbillService;
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<WmsInventoryCheckbillVo>> listPage(@RequestBody PagerQuery<WmsInventoryCheckbillQuery> pq){
public ResultBean<PagerVo<WarehouseInventoryCheckBillVo>> listPage(@RequestBody PagerQuery<WarehouseInventoryCheckBillQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<WmsInventoryCheckbillVo> pv = wmsInventoryCheckbillService.listPageVo(pq);
PagerVo<WarehouseInventoryCheckBillVo> pv = wmsInventoryCheckbillService.listPageVo(pq);
return rb.success().setData(pv);
}
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody WmsInventoryCheckbillDto dto){
public ResultBean save(@RequestBody WarehouseInventoryCheckBillDto dto){
ResultBean rb = ResultBean.fireFail();
wmsInventoryCheckbillService.saveOrUpdateDto(dto);
return rb.success();
@@ -81,15 +81,15 @@ public class WmsInventoryCheckbillRest {
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<WmsInventoryCheckbillDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
public ResultBean<WarehouseInventoryCheckBillDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
WmsInventoryCheckbillDetailsVo vo = wmsInventoryCheckbillService.fetchDetailsVoBySid(sid);
WarehouseInventoryCheckBillDetailsVo vo = wmsInventoryCheckbillService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
@ApiOperation("盘点")
@PostMapping("/inven")
public ResultBean inven(@RequestBody WmsInventoryCheckbillDto dto){
public ResultBean inven(@RequestBody WarehouseInventoryCheckBillDto dto){
ResultBean rb = ResultBean.fireFail();
wmsInventoryCheckbillService.inven(dto);
return rb.success();

22
src/main/java/com/yxt/warehouse/apiadmin/WmsInventorySettlebillDetailRest.java → src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventorySettlebillDetailRest.java
View File

@@ -29,7 +29,7 @@ import com.yxt.common.base.utils.ExportExcelUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.warehouse.biz.wmsinventorysettlebilldetail.*;
import com.yxt.warehouse.biz.warehouseinventorysettlebilldetail.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -56,18 +56,18 @@ import java.util.List;
@Api(tags = "库存结算明细")
@RestController
@RequestMapping("/apiadmin/inventory/wmsinventorysettlebilldetail")
public class WmsInventorySettlebillDetailRest{
public class WarehouseInventorySettlebillDetailRest {
@Autowired
private WmsInventorySettlebillDetailService wmsInventorySettlebillDetailService;
private WarehouseInventorySettlebillDetailService wmsInventorySettlebillDetailService;
@Autowired
HttpServletResponse response;
@PostMapping("/exportExcel")
@ApiOperation(value = "导出")
public void exportExcel(@RequestBody WmsInventorySettlebillDetailQuery query) {
public void exportExcel(@RequestBody WarehouseInventorySettlebillDetailQuery query) {
//得到所有要导出的数据
List<WmsInventorySettlebillExportVo> exportVoList = wmsInventorySettlebillDetailService.listExcel(query);
List<WarehouseInventorySettlebillExportVo> exportVoList = wmsInventorySettlebillDetailService.listExcel(query);
//定义导出的excel名字
String excelName = "结转库存列表";
String fileNameURL = "";
@@ -76,22 +76,22 @@ public class WmsInventorySettlebillDetailRest{
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
ExportExcelUtils.export(fileNameURL, exportVoList, WmsInventorySettlebillExportVo.class, response);
ExportExcelUtils.export(fileNameURL, exportVoList, WarehouseInventorySettlebillExportVo.class, response);
}
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<WmsInventorySettlebillDetailVo>> listPage(@RequestBody PagerQuery<WmsInventorySettlebillDetailQuery> pq){
public ResultBean<PagerVo<WarehouseInventorySettlebillDetailVo>> listPage(@RequestBody PagerQuery<WarehouseInventorySettlebillDetailQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<WmsInventorySettlebillDetailVo> pv = wmsInventorySettlebillDetailService.listPageVo(pq);
PagerVo<WarehouseInventorySettlebillDetailVo> pv = wmsInventorySettlebillDetailService.listPageVo(pq);
return rb.success().setData(pv);
}
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody WmsInventorySettlebillDetailDto dto){
public ResultBean save(@RequestBody WarehouseInventorySettlebillDetailDto dto){
ResultBean rb = ResultBean.fireFail();
wmsInventorySettlebillDetailService.saveOrUpdateDto(dto);
return rb.success();
@@ -109,9 +109,9 @@ public class WmsInventorySettlebillDetailRest{
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<WmsInventorySettlebillDetailDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
public ResultBean<WarehouseInventorySettlebillDetailDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
WmsInventorySettlebillDetailDetailsVo vo = wmsInventorySettlebillDetailService.fetchDetailsVoBySid(sid);
WarehouseInventorySettlebillDetailDetailsVo vo = wmsInventorySettlebillDetailService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
}

26
src/main/java/com/yxt/warehouse/apiadmin/WmsInventorySettlebillRest.java → src/main/java/com/yxt/warehouse/apiadmin/WarehouseInventorySettlebillRest.java
View File

@@ -28,8 +28,8 @@ package com.yxt.warehouse.apiadmin;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.warehouse.biz.wmsinventorysettlebill.*;
import com.yxt.warehouse.biz.wmsinventorysettlebilldetail.WmsInventorySettlebillDetailService;
import com.yxt.warehouse.biz.warehouseinventorysettlebill.*;
import com.yxt.warehouse.biz.warehouseinventorysettlebilldetail.WarehouseInventorySettlebillDetailService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -51,16 +51,16 @@ import org.springframework.web.bind.annotation.*;
@Api(tags = "库存结算单")
@RestController
@RequestMapping("/apiadmin/inventory/wmsinventorysettlebill")
public class WmsInventorySettlebillRest {
public class WarehouseInventorySettlebillRest {
@Autowired
private WmsInventorySettlebillService wmsInventorySettlebillService;
private WarehouseInventorySettlebillService wmsInventorySettlebillService;
@Autowired
private WmsInventorySettlebillDetailService wmsInventorySettlebillDetailService;
private WarehouseInventorySettlebillDetailService wmsInventorySettlebillDetailService;
@ApiOperation("库存结转")
@PostMapping("/saveSettlebill")
public ResultBean saveSettlebill(@RequestBody WmsInventorySettlebillDto dto){
public ResultBean saveSettlebill(@RequestBody WarehouseInventorySettlebillDto dto){
ResultBean rb = ResultBean.fireFail();
wmsInventorySettlebillService.saveSettlebill(dto);
return rb.success();
@@ -68,24 +68,24 @@ public class WmsInventorySettlebillRest {
@ApiOperation("结转记录查询")
@PostMapping("/carryForwardList")
public ResultBean<PagerVo<WmsInventorySettleRecordVo>> carryForwardList(@RequestBody PagerQuery<WmsInventorySettleRecordQuery> pq){
public ResultBean<PagerVo<WarehouseInventorySettleRecordVo>> carryForwardList(@RequestBody PagerQuery<WarehouseInventorySettleRecordQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<WmsInventorySettleRecordVo> pv = wmsInventorySettlebillService.carryForwardList(pq);
PagerVo<WarehouseInventorySettleRecordVo> pv = wmsInventorySettlebillService.carryForwardList(pq);
return rb.success().setData(pv);
}
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<WmsInventorySettlebillVo>> listPage(@RequestBody PagerQuery<WmsInventorySettlebillQuery> pq){
public ResultBean<PagerVo<WarehouseInventorySettlebillVo>> listPage(@RequestBody PagerQuery<WarehouseInventorySettlebillQuery> pq){
ResultBean rb = ResultBean.fireFail();
PagerVo<WmsInventorySettlebillVo> pv = wmsInventorySettlebillService.listPageVo(pq);
PagerVo<WarehouseInventorySettlebillVo> pv = wmsInventorySettlebillService.listPageVo(pq);
return rb.success().setData(pv);
}
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody WmsInventorySettlebillDto dto){
public ResultBean save(@RequestBody WarehouseInventorySettlebillDto dto){
ResultBean rb = ResultBean.fireFail();
wmsInventorySettlebillService.saveOrUpdateDto(dto);
return rb.success();
@@ -106,9 +106,9 @@ public class WmsInventorySettlebillRest {
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<WmsInventorySettlebillDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
public ResultBean<WarehouseInventorySettlebillDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
WmsInventorySettlebillDetailsVo vo = wmsInventorySettlebillService.fetchDetailsVoBySid(sid);
WarehouseInventorySettlebillDetailsVo vo = wmsInventorySettlebillService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}

20
src/main/java/com/yxt/warehouse/apiadmin/WmsWarehouseRackRest.java → src/main/java/com/yxt/warehouse/apiadmin/WarehouseRackRest.java
View File

@@ -3,10 +3,10 @@ package com.yxt.warehouse.apiadmin;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.warehouse.biz.wmswarehouserack.WmsWarehouseRackDto;
import com.yxt.warehouse.biz.wmswarehouserack.WmsWarehouseRackQuery;
import com.yxt.warehouse.biz.wmswarehouserack.WmsWarehouseRackService;
import com.yxt.warehouse.biz.wmswarehouserack.WmsWarehouseRackVo;
import com.yxt.warehouse.biz.warehousewarehouserack.WarehouseRackDto;
import com.yxt.warehouse.biz.warehousewarehouserack.WarehouseRackQuery;
import com.yxt.warehouse.biz.warehousewarehouserack.WarehouseRackService;
import com.yxt.warehouse.biz.warehousewarehouserack.WarehouseRackVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,31 +19,31 @@ import org.springframework.web.bind.annotation.*;
@Api(tags = "货架信息")
@RestController
@RequestMapping("/apiadmin/base/wmswarehouserack")
public class WmsWarehouseRackRest {
public class WarehouseRackRest {
@Autowired
WmsWarehouseRackService wmsWarehouseRackService;
WarehouseRackService wmsWarehouseRackService;
@ApiOperation("分页列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<WmsWarehouseRackVo>> listPage(@RequestBody PagerQuery<WmsWarehouseRackQuery> pq) {
public ResultBean<PagerVo<WarehouseRackVo>> listPage(@RequestBody PagerQuery<WarehouseRackQuery> pq) {
return wmsWarehouseRackService.listPage(pq);
}
@ApiOperation("查询所有的库区")
@GetMapping("/getAllType")
public ResultBean<WmsWarehouseRackVo> getAllType() {
public ResultBean<WarehouseRackVo> getAllType() {
return wmsWarehouseRackService.getAllType();
}
@ApiOperation("保存修改")
@PostMapping("/saveOrUpdate")
public ResultBean<String> saveOrUpdate(@RequestBody WmsWarehouseRackDto dto) {
public ResultBean<String> saveOrUpdate(@RequestBody WarehouseRackDto dto) {
return wmsWarehouseRackService.saveOrUpdate(dto);
}
@ApiOperation("初始化")
@GetMapping("/initialization/{sid}")
public ResultBean<WmsWarehouseRackVo> initialization(@PathVariable("sid") String sid) {
public ResultBean<WarehouseRackVo> initialization(@PathVariable("sid") String sid) {
return wmsWarehouseRackService.initialization(sid);
}

55
src/main/java/com/yxt/warehouse/apiadmin/WarehouseReportLoseOperRest.java Normal file
View File

@@ -0,0 +1,55 @@
package com.yxt.warehouse.apiadmin;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.warehouse.biz.warehousereportloseoper.WarehouseReportLoseOperDto;
import com.yxt.warehouse.biz.warehousereportloseoper.WarehouseReportLoseOperQuery;
import com.yxt.warehouse.biz.warehousereportloseoper.WarehouseReportLoseOperService;
import com.yxt.warehouse.biz.warehousereportloseoper.WarehouseReportLoseOperVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
* @author wangpengfei
* @date 2024/6/6 10:30
*/
@Api(tags = "报损处理表")
@RestController
@RequestMapping("/apiadmin/inventory/wmsreportloseoper")
public class WarehouseReportLoseOperRest {
@Autowired
private WarehouseReportLoseOperService wmsReportLoseOperService;
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<WarehouseReportLoseOperVo>> listPage(@RequestBody PagerQuery<WarehouseReportLoseOperQuery> pq){
return wmsReportLoseOperService.listPage(pq);
}
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody WarehouseReportLoseOperDto dto){
ResultBean rb = ResultBean.fireFail();
wmsReportLoseOperService.saveOrUpdateDto(dto);
return rb.success();
}
@ApiOperation("根据sid批量删除")
@DeleteMapping("/delBySids")
public ResultBean delBySids(@RequestBody String[] sids){
ResultBean rb = ResultBean.fireFail();
wmsReportLoseOperService.delAll(sids);
return rb.success();
}
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<WarehouseReportLoseOperVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
WarehouseReportLoseOperVo vo = wmsReportLoseOperService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
}

22
src/main/java/com/yxt/warehouse/apiadmin/WmsReportLoseRest.java → src/main/java/com/yxt/warehouse/apiadmin/WarehouseReportLoseRest.java
View File

@@ -3,10 +3,10 @@ package com.yxt.warehouse.apiadmin;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.warehouse.biz.wmsreportlose.WmsReportLoseDto;
import com.yxt.warehouse.biz.wmsreportlose.WmsReportLoseQuery;
import com.yxt.warehouse.biz.wmsreportlose.WmsReportLoseService;
import com.yxt.warehouse.biz.wmsreportlose.WmsReportLoseVo;
import com.yxt.warehouse.biz.warehousereportlose.WarehouseReportLoseDto;
import com.yxt.warehouse.biz.warehousereportlose.WarehouseReportLoseQuery;
import com.yxt.warehouse.biz.warehousereportlose.WarehouseReportLoseService;
import com.yxt.warehouse.biz.warehousereportlose.WarehouseReportLoseVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,22 +16,22 @@ import org.springframework.web.bind.annotation.*;
* @author wangpengfei
* @date 2024/6/5 16:48
*/
@Api(tags = "库存结算单")
@Api(tags = "报损表")
@RestController
@RequestMapping("/apiadmin/inventory/wmsreportlose")
public class WmsReportLoseRest {
public class WarehouseReportLoseRest {
@Autowired
private WmsReportLoseService wmsReportLoseService;
private WarehouseReportLoseService wmsReportLoseService;
@ApiOperation("根据条件分页查询数据的列表")
@PostMapping("/listPage")
public ResultBean<PagerVo<WmsReportLoseVo>> listPage(@RequestBody PagerQuery<WmsReportLoseQuery> pq){
public ResultBean<PagerVo<WarehouseReportLoseVo>> listPage(@RequestBody PagerQuery<WarehouseReportLoseQuery> pq){
return wmsReportLoseService.listPage(pq);
}
@ApiOperation("新增或修改")
@PostMapping("/save")
public ResultBean save(@RequestBody WmsReportLoseDto dto){
public ResultBean save(@RequestBody WarehouseReportLoseDto dto){
ResultBean rb = ResultBean.fireFail();
wmsReportLoseService.saveOrUpdateDto(dto);
return rb.success();
@@ -47,9 +47,9 @@ public class WmsReportLoseRest {
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
public ResultBean<WmsReportLoseVo> fetchDetailsBySid(@PathVariable("sid") String sid){
public ResultBean<WarehouseReportLoseVo> fetchDetailsBySid(@PathVariable("sid") String sid){
ResultBean rb = ResultBean.fireFail();
WmsReportLoseVo vo = wmsReportLoseService.fetchDetailsVoBySid(sid);
WarehouseReportLoseVo vo = wmsReportLoseService.fetchDetailsVoBySid(sid);
return rb.success().setData(vo);
}
}

1
src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailDto.java
View File

@@ -10,6 +10,7 @@ import lombok.Data;
**/
@Data
public class WarehouseAnsBillDetailDto {
private String sid;
@ApiModelProperty("商品基础信息sid")
private String goodSpuSid;

10
src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailMapper.java
View File

@@ -1,7 +1,12 @@
package com.yxt.warehouse.biz.warehouseansbilldetail;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -12,7 +17,10 @@ import java.util.List;
**/
@Mapper
public interface WarehouseAnsBillDetailMapper extends BaseMapper<WarehouseAnsBillDetail> {
IPage<WarehouseAnsBillDetailVo> listPage(IPage<WarehouseAnsBillDetail> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseAnsBillDetail> qw);
WarehouseAnsBillDetailVo initialization (@Param("sid") String sid);
int deleteDetails(String sid);
@Delete("delete from wms_ans_bill_details where sid = #{sid}")
void delByMainSid(String billSid);
List<WarehouseAnsListDetailsVo> selectByBillSid(String sid);
}

15
src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailMapper.xml
View File

@@ -22,4 +22,19 @@
from warehouse_ans_bill_detail wd
where billSid = #{sid}
</select>
<select id="listPage" resultType="com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillDetailVo">
select
a.*
from warehouse_ans_bill_detail a
<where>
${ew.sqlSegment}
</where>
</select>
<select id="initialization" resultType="com.yxt.warehouse.biz.warehouseansbilldetail.WarehouseAnsBillDetailVo">
select
a.*
from warehouse_ans_bill_detail a
where a.sid =#{sid}
</select>
</mapper>

13
src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailQuery.java Normal file
View File

@@ -0,0 +1,13 @@
package com.yxt.warehouse.biz.warehouseansbilldetail;
import com.yxt.common.core.query.Query;
import lombok.Data;
/**
* @author wangpengfei
* @date 2024/6/6 15:10
*/
@Data
public class WarehouseAnsBillDetailQuery implements Query {
private String name;
}

110
src/main/java/com/yxt/warehouse/biz/warehouseansbilldetail/WarehouseAnsBillDetailService.java
View File

@@ -1,7 +1,16 @@
package com.yxt.warehouse.biz.warehouseansbilldetail;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateTime;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -26,4 +35,105 @@ public class WarehouseAnsBillDetailService extends MybatisBaseService<WarehouseA
public List<WarehouseAnsListDetailsVo> selectByBillSid(String sid) {
return baseMapper.selectByBillSid(sid);
}
public ResultBean<PagerVo<WarehouseAnsBillDetailVo>> listPage(PagerQuery<WarehouseAnsBillDetailQuery> pq) {
ResultBean rb = ResultBean.fireFail();
WarehouseAnsBillDetailQuery query = pq.getParams();
QueryWrapper<WarehouseAnsBillDetail> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getName())) {
qw.like("rackName", query.getName());
}
IPage<WarehouseAnsBillDetail> page = PagerUtil.queryToPage(pq);
IPage<WarehouseAnsBillDetailVo> pagging = baseMapper.listPage(page, qw);
PagerVo<WarehouseAnsBillDetailVo> p = PagerUtil.pageToVo(pagging, null);
List<WarehouseAnsBillDetailVo> records = pagging.getRecords();
return rb.success().setData(p);
}
public ResultBean<String> saveOrUpdate(WarehouseAnsBillDetailDto dto) {
ResultBean rb = ResultBean.fireFail();
String sid = "";
if (StringUtils.isNotBlank(dto.getSid())) {
sid = dto.getSid();
WarehouseAnsBillDetail wmsWarehouseRack = fetchBySid(dto.getSid());
BeanUtil.copyProperties(dto, wmsWarehouseRack, "id", "sid");
baseMapper.updateById(wmsWarehouseRack);
} else {
WarehouseAnsBillDetail wmsWarehouseRack = new WarehouseAnsBillDetail();
sid = wmsWarehouseRack.getSid();
BeanUtil.copyProperties(dto, wmsWarehouseRack, "id", "sid");
wmsWarehouseRack.setCreateTime(new DateTime());
baseMapper.insert(wmsWarehouseRack);
}
return rb.success().setMsg("成功");
}
public ResultBean<WarehouseAnsBillDetailVo> initialization(String sid) {
ResultBean rb = ResultBean.fireFail();
WarehouseAnsBillDetailVo vo = baseMapper.initialization(sid);
return rb.success().setData(vo);
}
public void delAll(String[] sids) {
delBySids(sids);
}
public ResultBean delete(String sid) {
ResultBean rb = ResultBean.fireFail();
WarehouseAnsBillDetail wmsWarehouseRack = fetchBySid(sid);
if (null != wmsWarehouseRack) {
baseMapper.deleteById(wmsWarehouseRack.getId());
}
return rb.success();
}
public ResultBean updateIsEnable(String sid, String isEnable) {
ResultBean rb = ResultBean.fireFail();
WarehouseAnsBillDetail wmsWarehouseRack = fetchBySid(sid);
if (null != wmsWarehouseRack) {
wmsWarehouseRack.setIsEnable(Integer.parseInt(isEnable));
baseMapper.updateById(wmsWarehouseRack);
}
return rb.success().setMsg("成功");
}
public void delByMainSid(String billSid) {
baseMapper.delByMainSid(billSid);
}
public void saveOrUpdateDto(WarehouseAnsBillDetailDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
return;
}
this.updateByDto(dto);
}
public void insertByDto(WarehouseAnsBillDetailDto dto) {
WarehouseAnsBillDetail entity = new WarehouseAnsBillDetail();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(WarehouseAnsBillDetailDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
}
public WarehouseAnsBillDetailVo fetchDetailsVoBySid(String sid) {
WarehouseAnsBillDetail entity = fetchBySid(sid);
WarehouseAnsBillDetailVo vo = new WarehouseAnsBillDetailVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
}

4
src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseArea.java → src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseArea.java
View File

@@ -1,4 +1,4 @@
package com.yxt.warehouse.biz.wmswarehousearea;
package com.yxt.warehouse.biz.warehousearea;
import com.yxt.common.core.domain.BaseEntity;
import lombok.Data;
@@ -8,7 +8,7 @@ import lombok.Data;
* @date 2024/2/28 8:38
*/
@Data
public class WmsWarehouseArea extends BaseEntity {
public class WarehouseArea extends BaseEntity {
// private String id;
// private String sid= UUID.randomUUID().toString();
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

4
src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaAllVo.java → src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaAllVo.java
View File

@@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.warehouse.biz.wmswarehousearea;
package com.yxt.warehouse.biz.warehousearea;
import com.yxt.common.core.vo.Vo;
@@ -46,7 +46,7 @@ import lombok.Data;
*/
@Data
@ApiModel(value = "库区 视图数据详情", description = "库区 视图数据详情")
public class WmsWarehouseAreaAllVo implements Vo {
public class WarehouseAreaAllVo implements Vo {
private String sid;
@ApiModelProperty("库位名称")

4
src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaDto.java → src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaDto.java
View File

@@ -1,4 +1,4 @@
package com.yxt.warehouse.biz.wmswarehousearea;
package com.yxt.warehouse.biz.warehousearea;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.dto.Dto;
@@ -11,7 +11,7 @@ import java.util.Date;
* @date 2024/2/26 13:38
*/
@Data
public class WmsWarehouseAreaDto implements Dto {
public class WarehouseAreaDto implements Dto {
private String id;
private String sid;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

10
src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaMapper.java → src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaMapper.java
View File

@@ -1,4 +1,4 @@
package com.yxt.warehouse.biz.wmswarehousearea;
package com.yxt.warehouse.biz.warehousearea;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -15,10 +15,10 @@ import java.util.List;
* @date 2024/2/26 13:40
*/
@Mapper
public interface WmsWarehouseAreaMapper extends BaseMapper<WmsWarehouseArea> {
IPage<WmsWarehouseAreaVo> listPage(IPage<WmsWarehouseArea> page, @Param(Constants.WRAPPER) QueryWrapper<WmsWarehouseArea> qw);
WmsWarehouseAreaVo initialization (@Param("sid") String sid);
public interface WarehouseAreaMapper extends BaseMapper<WarehouseArea> {
IPage<WarehouseAreaVo> listPage(IPage<WarehouseArea> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseArea> qw);
WarehouseAreaVo initialization (@Param("sid") String sid);
int updateBySidIsDelete(List<String> list);
@Select("select * from wms_warehouse_area where warehouseSid = #{ckSid}")
List<WmsWarehouseAreaAllVo> selectAll(String ckSid);
List<WarehouseAreaAllVo> selectAll(String ckSid);
}

20
src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaMapper.xml → src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaMapper.xml
View File

@@ -1,30 +1,30 @@
<?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.yxt.warehouse.biz.wmswarehousearea.WmsWarehouseAreaMapper">
<mapper namespace="com.yxt.warehouse.biz.warehousearea.WarehouseAreaMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="listPage" resultType="com.yxt.warehouse.biz.wmswarehousearea.WmsWarehouseAreaVo">
<select id="listPage" resultType="com.yxt.warehouse.biz.warehousearea.WarehouseAreaVo">
select
a.*,b.warehouseName as warehouseName,c.warehouseAreaTypeName as areaTypeName
from wms_warehouse_area a
left join wms_warehouse_info b on b.sid=a.warehouseSid
left join wms_warehouse_area_type c on c.sid =a.areaTypeSid
from warehouse_area a
left join warehouse_info b on b.sid=a.warehouseSid
left join warehouse_area_type c on c.sid =a.areaTypeSid
<where>
${ew.sqlSegment}
</where>
</select>
<select id="initialization" resultType="com.yxt.warehouse.biz.wmswarehousearea.WmsWarehouseAreaVo">
<select id="initialization" resultType="com.yxt.warehouse.biz.warehousearea.WarehouseAreaVo">
select
a.*,b.warehouseName as warehouseName,c.warehouseAreaTypeName as areaTypeName
from wms_warehouse_area a
left join wms_warehouse_info b on b.sid=a.warehouseSid
left join wms_warehouse_area_type c on c.sid =a.areaTypeSid
from warehouse_area a
left join warehouse_info b on b.sid=a.warehouseSid
left join warehouse_area_type c on c.sid =a.areaTypeSid
where a.sid =#{sid}
</select>
<update id="updateBySidIsDelete">
UPDATE wms_warehouse_area
UPDATE warehouse_area
SET isDelete=1
where sid in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">

4
src/main/java/com/yxt/warehouse/biz/wmswarehouserack/WmsWarehouseRackQuery.java → src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaQuery.java
View File

@@ -1,4 +1,4 @@
package com.yxt.warehouse.biz.wmswarehouserack;
package com.yxt.warehouse.biz.warehousearea;
import com.yxt.common.core.query.Query;
import lombok.Data;
@@ -8,7 +8,7 @@ import lombok.Data;
* @date 2024/2/26 13:37
*/
@Data
public class WmsWarehouseRackQuery implements Query {
public class WarehouseAreaQuery implements Query {
private String name;//名字
private String code;//编码
private String warehouseSid;//仓库

38
src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaService.java → src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaService.java
View File

@@ -1,4 +1,4 @@
package com.yxt.warehouse.biz.wmswarehousearea;
package com.yxt.warehouse.biz.warehousearea;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateTime;
@@ -22,13 +22,13 @@ import java.util.stream.Collectors;
* @date 2024/2/26 13:40
*/
@Service
public class WmsWarehouseAreaService extends MybatisBaseService<WmsWarehouseAreaMapper, WmsWarehouseArea> {
public class WarehouseAreaService extends MybatisBaseService<WarehouseAreaMapper, WarehouseArea> {
public ResultBean<PagerVo<WmsWarehouseAreaVo>> listPage(PagerQuery<WmsWarehouseAreaQuery> pq) {
public ResultBean<PagerVo<WarehouseAreaVo>> listPage(PagerQuery<WarehouseAreaQuery> pq) {
ResultBean rb = ResultBean.fireFail();
WmsWarehouseAreaQuery query = pq.getParams();
QueryWrapper<WmsWarehouseArea> qw = new QueryWrapper<>();
WarehouseAreaQuery query = pq.getParams();
QueryWrapper<WarehouseArea> qw = new QueryWrapper<>();
if(StringUtils.isNotBlank(query.getName())){
qw.like("areaName",query.getName());
}
@@ -42,30 +42,30 @@ public class WmsWarehouseAreaService extends MybatisBaseService<WmsWarehouseArea
qw.eq("c.sid",query.getAreaTypeSid());
}
qw.ne("a.isDelete","1");
IPage<WmsWarehouseArea> page = PagerUtil.queryToPage(pq);
IPage<WmsWarehouseAreaVo> pagging = baseMapper.listPage(page, qw);
PagerVo<WmsWarehouseAreaVo> p = PagerUtil.pageToVo(pagging, null);
List<WmsWarehouseAreaVo> records = pagging.getRecords();
IPage<WarehouseArea> page = PagerUtil.queryToPage(pq);
IPage<WarehouseAreaVo> pagging = baseMapper.listPage(page, qw);
PagerVo<WarehouseAreaVo> p = PagerUtil.pageToVo(pagging, null);
List<WarehouseAreaVo> records = pagging.getRecords();
return rb.success().setData(p);
}
public ResultBean<WmsWarehouseAreaVo> getAllType() {
public ResultBean<WarehouseAreaVo> getAllType() {
ResultBean rb = ResultBean.fireFail();
List<WmsWarehouseArea> pagging = baseMapper.selectList(new QueryWrapper<WmsWarehouseArea>().eq("isEnable",1)
List<WarehouseArea> pagging = baseMapper.selectList(new QueryWrapper<WarehouseArea>().eq("isEnable",1)
.ne("isDelete","1"));
return rb.success().setData(pagging);
}
public ResultBean<String> saveOrUpdate(WmsWarehouseAreaDto dto) {
public ResultBean<String> saveOrUpdate(WarehouseAreaDto dto) {
ResultBean rb = ResultBean.fireFail();
String sid = "";
if (StringUtils.isNotBlank(dto.getSid())) {
sid = dto.getSid();
WmsWarehouseArea wmsWarehouseArea = fetchBySid(dto.getSid());
WarehouseArea wmsWarehouseArea = fetchBySid(dto.getSid());
BeanUtil.copyProperties(dto, wmsWarehouseArea, "id", "sid");
wmsWarehouseArea.setModifyTime(new Date());
baseMapper.updateById(wmsWarehouseArea);
} else {
WmsWarehouseArea wmsWarehouseArea = new WmsWarehouseArea();
WarehouseArea wmsWarehouseArea = new WarehouseArea();
sid = wmsWarehouseArea.getSid();
BeanUtil.copyProperties(dto, wmsWarehouseArea, "id", "sid");
wmsWarehouseArea.setCreateTime(new DateTime());
@@ -74,16 +74,16 @@ public class WmsWarehouseAreaService extends MybatisBaseService<WmsWarehouseArea
return rb.success().setMsg("成功");
}
public ResultBean<WmsWarehouseAreaVo> initialization(String sid) {
public ResultBean<WarehouseAreaVo> initialization(String sid) {
ResultBean rb = ResultBean.fireFail();
WmsWarehouseAreaVo vo = baseMapper.initialization(sid);
WarehouseAreaVo vo = baseMapper.initialization(sid);
return rb.success().setData(vo);
}
public ResultBean delete(String sid) {
ResultBean rb = ResultBean.fireFail();
WmsWarehouseArea wmsWarehouseArea = fetchBySid(sid);
WarehouseArea wmsWarehouseArea = fetchBySid(sid);
if (null != wmsWarehouseArea) {
baseMapper.deleteById(wmsWarehouseArea.getId());
}
@@ -96,7 +96,7 @@ public class WmsWarehouseAreaService extends MybatisBaseService<WmsWarehouseArea
public ResultBean updateIsEnable(String sid,String isEnable) {
ResultBean rb = ResultBean.fireFail();
WmsWarehouseArea wmsWarehouseArea = fetchBySid(sid);
WarehouseArea wmsWarehouseArea = fetchBySid(sid);
if (null != wmsWarehouseArea) {
wmsWarehouseArea.setIsEnable(Integer.parseInt(isEnable));
baseMapper.updateById(wmsWarehouseArea);
@@ -104,7 +104,7 @@ public class WmsWarehouseAreaService extends MybatisBaseService<WmsWarehouseArea
return rb.success().setMsg("成功");
}
public List<WmsWarehouseAreaAllVo> selectAll(String ckSid) {
public List<WarehouseAreaAllVo> selectAll(String ckSid) {
return baseMapper.selectAll(ckSid);
}
}

4
src/main/java/com/yxt/warehouse/biz/wmswarehousearea/WmsWarehouseAreaVo.java → src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaVo.java
View File

@@ -1,4 +1,4 @@
package com.yxt.warehouse.biz.wmswarehousearea;
package com.yxt.warehouse.biz.warehousearea;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
@@ -11,7 +11,7 @@ import java.util.Date;
* @date 2024/2/26 13:37
*/
@Data
public class WmsWarehouseAreaVo implements Vo {
public class WarehouseAreaVo implements Vo {
private String id;
private String sid;
private String lockVersion;

4
src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaType.java → src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaType.java
View File

@@ -1,4 +1,4 @@
package com.yxt.warehouse.biz.wmswarehouseareatype;
package com.yxt.warehouse.biz.warehouseareatype;
import com.yxt.common.core.domain.BaseEntity;
import lombok.Data;
@@ -8,7 +8,7 @@ import lombok.Data;
* @date 2024/2/28 8:38
*/
@Data
public class WmsWarehouseAreaType extends BaseEntity {
public class WarehouseAreaType extends BaseEntity {
private String warehouseAreaTypeName;//库位类型名称
private String useOrgSid;//使用组织sid

4
src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeDto.java → src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeDto.java
View File

@@ -1,4 +1,4 @@
package com.yxt.warehouse.biz.wmswarehouseareatype;
package com.yxt.warehouse.biz.warehouseareatype;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.dto.Dto;
@@ -11,7 +11,7 @@ import java.util.Date;
* @date 2024/2/26 13:38
*/
@Data
public class WmsWarehouseAreaTypeDto implements Dto {
public class WarehouseAreaTypeDto implements Dto {
private String id;
private String sid;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

8
src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.java → src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeMapper.java
View File

@@ -1,4 +1,4 @@
package com.yxt.warehouse.biz.wmswarehouseareatype;
package com.yxt.warehouse.biz.warehouseareatype;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -14,8 +14,8 @@ import java.util.List;
* @date 2024/2/26 13:40
*/
@Mapper
public interface WmsWarehouseAreaTypeMapper extends BaseMapper<WmsWarehouseAreaType> {
IPage<WmsWarehouseAreaTypeVo> listPage(IPage<WmsWarehouseAreaType> page, @Param(Constants.WRAPPER) QueryWrapper<WmsWarehouseAreaType> qw);
WmsWarehouseAreaTypeVo initialization (@Param("sid") String sid);
public interface WarehouseAreaTypeMapper extends BaseMapper<WarehouseAreaType> {
IPage<WarehouseAreaTypeVo> listPage(IPage<WarehouseAreaType> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseAreaType> qw);
WarehouseAreaTypeVo initialization (@Param("sid") String sid);
int updateBySidIsDelete(List<String> list);
}

12
src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeMapper.xml → src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeMapper.xml
View File

@@ -1,25 +1,25 @@
<?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.yxt.warehouse.biz.wmswarehouseareatype.WmsWarehouseAreaTypeMapper">
<mapper namespace="com.yxt.warehouse.biz.warehouseareatype.WarehouseAreaTypeMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="listPage" resultType="com.yxt.warehouse.biz.wmswarehouseareatype.WmsWarehouseAreaTypeVo">
<select id="listPage" resultType="com.yxt.warehouse.biz.warehouseareatype.WarehouseAreaTypeVo">
select
a.*
from wms_warehouse_area_type a
from warehouse_area_type a
<where>
${ew.sqlSegment}
</where>
</select>
<select id="initialization" resultType="com.yxt.warehouse.biz.wmswarehouseareatype.WmsWarehouseAreaTypeVo">
<select id="initialization" resultType="com.yxt.warehouse.biz.warehouseareatype.WarehouseAreaTypeVo">
select
a.*
from wms_warehouse_area_type a
from warehouse_area_type a
where a.sid =#{sid}
</select>
<update id="updateBySidIsDelete">
UPDATE wms_warehouse_area_type
UPDATE warehouse_area_type
SET isDelete=1
where sid in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">

4
src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendQuery.java → src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeQuery.java
View File

@@ -1,4 +1,4 @@
package com.yxt.warehouse.biz.wmswarehouseextend;
package com.yxt.warehouse.biz.warehouseareatype;
import com.yxt.common.core.query.Query;
import lombok.Data;
@@ -8,6 +8,6 @@ import lombok.Data;
* @date 2024/2/26 13:37
*/
@Data
public class WmsWarehouseExtendQuery implements Query {
public class WarehouseAreaTypeQuery implements Query {
private String name;
}

36
src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeService.java → src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeService.java
View File

@@ -1,4 +1,4 @@
package com.yxt.warehouse.biz.wmswarehouseareatype;
package com.yxt.warehouse.biz.warehouseareatype;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateTime;
@@ -22,41 +22,41 @@ import java.util.stream.Collectors;
* @date 2024/2/26 13:40
*/
@Service
public class WmsWarehouseAreaTypeService extends MybatisBaseService<WmsWarehouseAreaTypeMapper, WmsWarehouseAreaType> {
public class WarehouseAreaTypeService extends MybatisBaseService<WarehouseAreaTypeMapper, WarehouseAreaType> {
public ResultBean<PagerVo<WmsWarehouseAreaTypeVo>> listPage(PagerQuery<WmsWarehouseAreaTypeQuery> pq) {
public ResultBean<PagerVo<WarehouseAreaTypeVo>> listPage(PagerQuery<WarehouseAreaTypeQuery> pq) {
ResultBean rb = ResultBean.fireFail();
WmsWarehouseAreaTypeQuery query = pq.getParams();
QueryWrapper<WmsWarehouseAreaType> qw = new QueryWrapper<>();
WarehouseAreaTypeQuery query = pq.getParams();
QueryWrapper<WarehouseAreaType> qw = new QueryWrapper<>();
if(StringUtils.isNotBlank(query.getName())){
qw.like("warehouseAreaTypeName",query.getName());
}
qw.ne("isDelete","1");
IPage<WmsWarehouseAreaType> page = PagerUtil.queryToPage(pq);
IPage<WmsWarehouseAreaTypeVo> pagging = baseMapper.listPage(page, qw);
PagerVo<WmsWarehouseAreaTypeVo> p = PagerUtil.pageToVo(pagging, null);
List<WmsWarehouseAreaTypeVo> records = pagging.getRecords();
IPage<WarehouseAreaType> page = PagerUtil.queryToPage(pq);
IPage<WarehouseAreaTypeVo> pagging = baseMapper.listPage(page, qw);
PagerVo<WarehouseAreaTypeVo> p = PagerUtil.pageToVo(pagging, null);
List<WarehouseAreaTypeVo> records = pagging.getRecords();
return rb.success().setData(p);
}
public ResultBean<WmsWarehouseAreaTypeVo> listAll() {
public ResultBean<WarehouseAreaTypeVo> listAll() {
ResultBean rb = ResultBean.fireFail();
List<WmsWarehouseAreaType> pagging = baseMapper.selectList(new QueryWrapper<WmsWarehouseAreaType>().eq("isEnable",1)
List<WarehouseAreaType> pagging = baseMapper.selectList(new QueryWrapper<WarehouseAreaType>().eq("isEnable",1)
.ne("isDelete","1"));
return rb.success().setData(pagging);
}
public ResultBean<String> saveOrUpdate(WmsWarehouseAreaTypeDto dto) {
public ResultBean<String> saveOrUpdate(WarehouseAreaTypeDto dto) {
ResultBean rb = ResultBean.fireFail();
String sid = "";
if (StringUtils.isNotBlank(dto.getSid())) {
sid = dto.getSid();
WmsWarehouseAreaType wmsWarehouseArea = fetchBySid(dto.getSid());
WarehouseAreaType wmsWarehouseArea = fetchBySid(dto.getSid());
BeanUtil.copyProperties(dto, wmsWarehouseArea, "id", "sid");
wmsWarehouseArea.setModifyTime(new Date());
baseMapper.updateById(wmsWarehouseArea);
} else {
WmsWarehouseAreaType wmsWarehouseArea = new WmsWarehouseAreaType();
WarehouseAreaType wmsWarehouseArea = new WarehouseAreaType();
sid = wmsWarehouseArea.getSid();
BeanUtil.copyProperties(dto, wmsWarehouseArea, "id", "sid");
wmsWarehouseArea.setCreateTime(new DateTime());
@@ -65,16 +65,16 @@ public class WmsWarehouseAreaTypeService extends MybatisBaseService<WmsWarehouse
return rb.success().setMsg("成功");
}
public ResultBean<WmsWarehouseAreaTypeVo> initialization(String sid) {
public ResultBean<WarehouseAreaTypeVo> initialization(String sid) {
ResultBean rb = ResultBean.fireFail();
WmsWarehouseAreaTypeVo vo = baseMapper.initialization(sid);
WarehouseAreaTypeVo vo = baseMapper.initialization(sid);
return rb.success().setData(vo);
}
public ResultBean delete(String sid) {
ResultBean rb = ResultBean.fireFail();
WmsWarehouseAreaType wmsWarehouseArea = fetchBySid(sid);
WarehouseAreaType wmsWarehouseArea = fetchBySid(sid);
if (null != wmsWarehouseArea) {
baseMapper.deleteById(wmsWarehouseArea.getId());
}
@@ -85,7 +85,7 @@ public class WmsWarehouseAreaTypeService extends MybatisBaseService<WmsWarehouse
}
public ResultBean updateIsEnable(String sid,String isEnable) {
ResultBean rb = ResultBean.fireFail();
WmsWarehouseAreaType wmsWarehouseArea = fetchBySid(sid);
WarehouseAreaType wmsWarehouseArea = fetchBySid(sid);
if (null != wmsWarehouseArea) {
wmsWarehouseArea.setIsEnable(Integer.parseInt(isEnable));
baseMapper.updateById(wmsWarehouseArea);

4
src/main/java/com/yxt/warehouse/biz/wmswarehouseareatype/WmsWarehouseAreaTypeVo.java → src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeVo.java
View File

@@ -1,4 +1,4 @@
package com.yxt.warehouse.biz.wmswarehouseareatype;
package com.yxt.warehouse.biz.warehouseareatype;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
@@ -11,7 +11,7 @@ import java.util.Date;
* @date 2024/2/26 13:37
*/
@Data
public class WmsWarehouseAreaTypeVo implements Vo {
public class WarehouseAreaTypeVo implements Vo {
private String id;
private String sid;
private String lockVersion;

4
src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtend.java → src/main/java/com/yxt/warehouse/biz/warehouseextend/WarehouseExtend.java
View File

@@ -1,4 +1,4 @@
package com.yxt.warehouse.biz.wmswarehouseextend;
package com.yxt.warehouse.biz.warehouseextend;
import com.yxt.common.core.domain.BaseEntity;
import lombok.Data;
@@ -8,7 +8,7 @@ import lombok.Data;
* @date 2024/2/26 13:36
*/
@Data
public class WmsWarehouseExtend extends BaseEntity {
public class WarehouseExtend extends BaseEntity {
private String warehouseSid;//仓库sid
private String markupRate1;//加价率1

4
src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendDto.java → src/main/java/com/yxt/warehouse/biz/warehouseextend/WarehouseExtendDto.java
View File

@@ -1,4 +1,4 @@
package com.yxt.warehouse.biz.wmswarehouseextend;
package com.yxt.warehouse.biz.warehouseextend;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.dto.Dto;
@@ -11,7 +11,7 @@ import java.util.Date;
* @date 2024/2/26 13:38
*/
@Data
public class WmsWarehouseExtendDto implements Dto {
public class WarehouseExtendDto implements Dto {
private String id;
private String sid;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

4
src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendMapper.java → src/main/java/com/yxt/warehouse/biz/warehouseextend/WarehouseExtendMapper.java
View File

@@ -1,4 +1,4 @@
package com.yxt.warehouse.biz.wmswarehouseextend;
package com.yxt.warehouse.biz.warehouseextend;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
@@ -8,6 +8,6 @@ import org.apache.ibatis.annotations.Mapper;
* @date 2024/2/26 13:40
*/
@Mapper
public interface WmsWarehouseExtendMapper extends BaseMapper<WmsWarehouseExtend> {
public interface WarehouseExtendMapper extends BaseMapper<WarehouseExtend> {
}

6
src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendMapper.xml → src/main/java/com/yxt/warehouse/biz/warehouseextend/WarehouseExtendMapper.xml
View File

@@ -1,13 +1,13 @@
<?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.yxt.warehouse.biz.wmswarehouseextend.WmsWarehouseExtendMapper">
<mapper namespace="com.yxt.warehouse.biz.warehouseextend.WarehouseExtendMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="listPage" resultType="com.yxt.warehouse.biz.wmswarehouseextend.WmsWarehouseExtendVo">
<select id="listPage" resultType="com.yxt.warehouse.biz.warehouseextend.WarehouseExtendVo">
select
*
from wms_warehouse_extend
from warehouse_extend
<where>
${ew.sqlSegment}
</where>

4
src/main/java/com/yxt/warehouse/biz/wmsreportlose/WmsReportLoseQuery.java → src/main/java/com/yxt/warehouse/biz/warehouseextend/WarehouseExtendQuery.java
View File

@@ -1,4 +1,4 @@
package com.yxt.warehouse.biz.wmsreportlose;
package com.yxt.warehouse.biz.warehouseextend;
import com.yxt.common.core.query.Query;
import lombok.Data;
@@ -8,6 +8,6 @@ import lombok.Data;
* @date 2024/2/26 13:37
*/
@Data
public class WmsReportLoseQuery implements Query {
public class WarehouseExtendQuery implements Query {
private String name;
}

16
src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendService.java → src/main/java/com/yxt/warehouse/biz/warehouseextend/WarehouseExtendService.java
View File

@@ -1,4 +1,4 @@
package com.yxt.warehouse.biz.wmswarehouseextend;
package com.yxt.warehouse.biz.warehouseextend;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateTime;
@@ -15,21 +15,21 @@ import java.util.Date;
* @date 2024/2/26 13:40
*/
@Service
public class WmsWarehouseExtendService extends MybatisBaseService<WmsWarehouseExtendMapper, WmsWarehouseExtend> {
public class WarehouseExtendService extends MybatisBaseService<WarehouseExtendMapper, WarehouseExtend> {
public ResultBean<String> saveOrUpdate(WmsWarehouseExtendDto dto) {
public ResultBean<String> saveOrUpdate(WarehouseExtendDto dto) {
ResultBean rb = ResultBean.fireFail();
String sid = "";
// for (WmsWarehouseExtendDto dto : dtos) {
if (StringUtils.isNotBlank(dto.getSid())) {
sid = dto.getSid();
WmsWarehouseExtend wmsWarehouse = fetchBySid(dto.getSid());
WarehouseExtend wmsWarehouse = fetchBySid(dto.getSid());
BeanUtil.copyProperties(dto, wmsWarehouse, "id", "sid");
wmsWarehouse.setModifyTime(new Date());
baseMapper.updateById(wmsWarehouse);
} else {
WmsWarehouseExtend wmsWarehouse = new WmsWarehouseExtend();
WarehouseExtend wmsWarehouse = new WarehouseExtend();
sid = wmsWarehouse.getSid();
BeanUtil.copyProperties(dto, wmsWarehouse, "id", "sid");
wmsWarehouse.setCreateTime(new DateTime());
@@ -40,10 +40,10 @@ public class WmsWarehouseExtendService extends MybatisBaseService<WmsWarehouseEx
return rb.success().setMsg("成功");
}
public ResultBean<WmsWarehouseExtendVo> initialization(String sid) {
public ResultBean<WarehouseExtendVo> initialization(String sid) {
ResultBean rb = ResultBean.fireFail();
WmsWarehouseExtendVo vo = new WmsWarehouseExtendVo();
WmsWarehouseExtend wmsWarehouse = fetchBySid(sid);
WarehouseExtendVo vo = new WarehouseExtendVo();
WarehouseExtend wmsWarehouse = fetchBySid(sid);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
if (null != wmsWarehouse) {
BeanUtil.copyProperties(wmsWarehouse, vo);

4
src/main/java/com/yxt/warehouse/biz/wmswarehouseextend/WmsWarehouseExtendVo.java → src/main/java/com/yxt/warehouse/biz/warehouseextend/WarehouseExtendVo.java
View File

@@ -1,4 +1,4 @@
package com.yxt.warehouse.biz.wmswarehouseextend;
package com.yxt.warehouse.biz.warehouseextend;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
@@ -11,7 +11,7 @@ import java.util.Date;
* @date 2024/2/26 13:37
*/
@Data
public class WmsWarehouseExtendVo implements Vo {
public class WarehouseExtendVo implements Vo {
private String id;
private String sid;
private String lockVersion;

4
src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebill/WmsInventoryAllocateBill.java → src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebill/WarehouseInventoryAllocatebill.java
View File

@@ -1,4 +1,4 @@
package com.yxt.warehouse.biz.wmsinventoryallocatebill;
package com.yxt.warehouse.biz.warehouseinventoryallocatebill;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.domain.BaseEntity;
@@ -11,7 +11,7 @@ import java.util.Date;
* @date 2024/2/28 8:38
*/
@Data
public class WmsInventoryAllocateBill extends BaseEntity {
public class WarehouseInventoryAllocatebill extends BaseEntity {
private String billNo;//单据编号
private String createDate;//制单日期

8
src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebill/WmsInventoryAllocateBillDetailsVoNew.java → src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebill/WarehouseInventoryAllocatebillDetailsVoNew.java
View File

@@ -23,12 +23,12 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.warehouse.biz.wmsinventoryallocatebill;
package com.yxt.warehouse.biz.warehouseinventoryallocatebill;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
import com.yxt.warehouse.biz.wmsinventoryallocatebilldetail.WmsInventoryAllocatebillDetailDetailsVoNew;
import com.yxt.warehouse.biz.warehouseinventoryallocatebilldetail.WarehouseInventoryAllocatebillDetailDetailsVoNew;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -52,7 +52,7 @@ import java.util.List;
*/
@Data
@ApiModel(value = "(调拨单)-调出方操作 视图数据详情", description = "(调拨单)-调出方操作 视图数据详情")
public class WmsInventoryAllocateBillDetailsVoNew implements Vo {
public class WarehouseInventoryAllocatebillDetailsVoNew implements Vo {
private String sid;
@@ -84,7 +84,7 @@ public class WmsInventoryAllocateBillDetailsVoNew implements Vo {
@ApiModelProperty("创建组织sid")
private String createOrgSid;
@ApiModelProperty("调拨单商品明细")
private List<WmsInventoryAllocatebillDetailDetailsVoNew> wmsInventoryAllocateBillDetailNewList;
private List<WarehouseInventoryAllocatebillDetailDetailsVoNew> wmsInventoryAllocateBillDetailNewList;
/*
* 页面展示

4
src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailDto.java → src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebill/WarehouseInventoryAllocatebillDto.java
View File

@@ -1,4 +1,4 @@
package com.yxt.warehouse.biz.wmsinventoryallocatebilldetail;
package com.yxt.warehouse.biz.warehouseinventoryallocatebill;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.dto.Dto;
@@ -11,7 +11,7 @@ import java.util.Date;
* @date 2024/2/26 13:38
*/
@Data
public class WmsInventoryAllocateBillDetailDto implements Dto {
public class WarehouseInventoryAllocatebillDto implements Dto {
private String id;
private String sid;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

8
src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebill/WmsInventoryAllocateBillDtoNew.java → src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebill/WarehouseInventoryAllocatebillDtoNew.java
View File

@@ -1,8 +1,8 @@
package com.yxt.warehouse.biz.wmsinventoryallocatebill;
package com.yxt.warehouse.biz.warehouseinventoryallocatebill;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.dto.Dto;
import com.yxt.warehouse.biz.wmsinventoryallocatebilldetail.WmsInventoryAllocateBillDetailDtoNew;
import com.yxt.warehouse.biz.warehouseinventoryallocatebilldetail.WarehouseInventoryAllocatebillDetailDtoNew;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -15,7 +15,7 @@ import java.util.List;
* @date 2024/2/26 13:38
*/
@Data
public class WmsInventoryAllocateBillDtoNew implements Dto {
public class WarehouseInventoryAllocatebillDtoNew implements Dto {
private String sid;
@@ -47,7 +47,7 @@ public class WmsInventoryAllocateBillDtoNew implements Dto {
@ApiModelProperty("创建组织sid")
private String createOrgSid;
@ApiModelProperty("调拨单商品明细")
private List<WmsInventoryAllocateBillDetailDtoNew> wmsInventoryAllocateBillDetailNewList;
private List<WarehouseInventoryAllocatebillDetailDtoNew> wmsInventoryAllocateBillDetailNewList;
/*
* 页面展示

20
src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebill/WarehouseInventoryAllocatebillMapper.java Normal file
View File

@@ -0,0 +1,20 @@
package com.yxt.warehouse.biz.warehouseinventoryallocatebill;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* @author wangpengfei
* @date 2024/2/26 13:40
*/
@Mapper
public interface WarehouseInventoryAllocatebillMapper extends BaseMapper<WarehouseInventoryAllocatebill> {
IPage<WarehouseInventoryAllocatebillVo> listPage(IPage<WarehouseInventoryAllocatebill> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseInventoryAllocatebill> qw);
WarehouseInventoryAllocatebillVo initialization (@Param("sid") String sid);
IPage<WarehouseInventoryAllocatebillVoNew> selectPageVo(IPage<WarehouseInventoryAllocatebill> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseInventoryAllocatebill> qw);
}

26
src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebill/WarehouseInventoryAllocatebillMapper.xml Normal file
View File

@@ -0,0 +1,26 @@
<?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.yxt.warehouse.biz.warehouseinventoryallocatebill.WarehouseInventoryAllocatebillMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="listPage" resultType="com.yxt.warehouse.biz.warehouseinventoryallocatebill.WarehouseInventoryAllocatebillVo">
select
a.*
from warehosue_inventory_allocate_bill a
<where>
${ew.sqlSegment}
</where>
</select>
<select id="initialization" resultType="com.yxt.warehouse.biz.warehouseinventoryallocatebill.WarehouseInventoryAllocatebillVo">
select
a.*
from wms_inventory_allocate_bill a
where a.sid =#{sid}
</select>
<select id="selectPageVo"
resultType="com.yxt.warehouse.biz.warehouseinventoryallocatebill.WarehouseInventoryAllocatebillVoNew">
</select>
</mapper>

4
src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailQuery.java → src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebill/WarehouseInventoryAllocatebillQuery.java
View File

@@ -1,4 +1,4 @@
package com.yxt.warehouse.biz.wmsinventoryallocatebilldetail;
package com.yxt.warehouse.biz.warehouseinventoryallocatebill;
import com.yxt.common.core.query.Query;
import lombok.Data;
@@ -8,6 +8,6 @@ import lombok.Data;
* @date 2024/2/26 13:37
*/
@Data
public class WmsInventoryAllocateBillDetailQuery implements Query {
public class WarehouseInventoryAllocatebillQuery implements Query {
private String name;
}

4
src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebill/WmsInventoryAllocateBillQueryNew.java → src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebill/WarehouseInventoryAllocatebillQueryNew.java
View File

@@ -1,4 +1,4 @@
package com.yxt.warehouse.biz.wmsinventoryallocatebill;
package com.yxt.warehouse.biz.warehouseinventoryallocatebill;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
@@ -9,7 +9,7 @@ import lombok.Data;
* @date 2024/2/26 13:37
*/
@Data
public class WmsInventoryAllocateBillQueryNew implements Query {
public class WarehouseInventoryAllocatebillQueryNew implements Query {
@ApiModelProperty("创建开始日期")
private String createStartTime;

80
src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java → src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebill/WarehouseInventoryAllocatebillService.java
View File

@@ -1,4 +1,4 @@
package com.yxt.warehouse.biz.wmsinventoryallocatebill;
package com.yxt.warehouse.biz.warehouseinventoryallocatebill;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateTime;
@@ -10,9 +10,9 @@ import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.warehouse.biz.wmsinventoryallocatebilldetail.WmsInventoryAllocateBillDetailDtoNew;
import com.yxt.warehouse.biz.wmsinventoryallocatebilldetail.WmsInventoryAllocateBillDetailService;
import com.yxt.warehouse.biz.wmsinventoryallocatebilldetail.WmsInventoryAllocatebillDetailDetailsVoNew;
import com.yxt.warehouse.biz.warehouseinventoryallocatebilldetail.WarehouseInventoryAllocatebillDetailDtoNew;
import com.yxt.warehouse.biz.warehouseinventoryallocatebilldetail.WarehouseInventoryAllocatebillDetailService;
import com.yxt.warehouse.biz.warehouseinventoryallocatebilldetail.WarehouseInventoryAllocatebillDetailDetailsVoNew;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -23,33 +23,33 @@ import java.util.List;
* @date 2024/2/26 13:40
*/
@Service
public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInventoryAllocateBillMapper, WmsInventoryAllocateBill> {
public class WarehouseInventoryAllocatebillService extends MybatisBaseService<WarehouseInventoryAllocatebillMapper, WarehouseInventoryAllocatebill> {
@Autowired
private WmsInventoryAllocateBillDetailService wmsInventoryAllocateBillDetailService;
private WarehouseInventoryAllocatebillDetailService wmsInventoryAllocateBillDetailService;
public ResultBean<PagerVo<WmsInventoryAllocateBillVo>> listPage(PagerQuery<WmsInventoryAllocateBillQuery> pq) {
public ResultBean<PagerVo<WarehouseInventoryAllocatebillVo>> listPage(PagerQuery<WarehouseInventoryAllocatebillQuery> pq) {
ResultBean rb = ResultBean.fireFail();
WmsInventoryAllocateBillQuery query = pq.getParams();
QueryWrapper<WmsInventoryAllocateBill> qw = new QueryWrapper<>();
WarehouseInventoryAllocatebillQuery query = pq.getParams();
QueryWrapper<WarehouseInventoryAllocatebill> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getName())) {
qw.like("rackName", query.getName());
}
IPage<WmsInventoryAllocateBill> page = PagerUtil.queryToPage(pq);
IPage<WmsInventoryAllocateBillVo> pagging = baseMapper.listPage(page, qw);
PagerVo<WmsInventoryAllocateBillVo> p = PagerUtil.pageToVo(pagging, null);
List<WmsInventoryAllocateBillVo> records = pagging.getRecords();
IPage<WarehouseInventoryAllocatebill> page = PagerUtil.queryToPage(pq);
IPage<WarehouseInventoryAllocatebillVo> pagging = baseMapper.listPage(page, qw);
PagerVo<WarehouseInventoryAllocatebillVo> p = PagerUtil.pageToVo(pagging, null);
List<WarehouseInventoryAllocatebillVo> records = pagging.getRecords();
return rb.success().setData(p);
}
public PagerVo<WmsInventoryAllocateBillVoNew> listPageVo(PagerQuery<WmsInventoryAllocateBillQueryNew> pq) {
WmsInventoryAllocateBillQueryNew query = pq.getParams();
QueryWrapper<WmsInventoryAllocateBill> qw = new QueryWrapper<>();
IPage<WmsInventoryAllocateBill> page = PagerUtil.queryToPage(pq);
IPage<WmsInventoryAllocateBillVoNew> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<WmsInventoryAllocateBillVoNew> p = PagerUtil.pageToVo(pagging, null);
public PagerVo<WarehouseInventoryAllocatebillVoNew> listPageVo(PagerQuery<WarehouseInventoryAllocatebillQueryNew> pq) {
WarehouseInventoryAllocatebillQueryNew query = pq.getParams();
QueryWrapper<WarehouseInventoryAllocatebill> qw = new QueryWrapper<>();
IPage<WarehouseInventoryAllocatebill> page = PagerUtil.queryToPage(pq);
IPage<WarehouseInventoryAllocatebillVoNew> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<WarehouseInventoryAllocatebillVoNew> p = PagerUtil.pageToVo(pagging, null);
return p;
}
@@ -80,9 +80,9 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
* @param dto
* @return
*/
public ResultBean<WmsInventoryAllocateBill> outWarehousing(WmsInventoryAllocateBillDto dto) {
public ResultBean<WarehouseInventoryAllocatebill> outWarehousing(WarehouseInventoryAllocatebillDto dto) {
ResultBean rb = ResultBean.fireFail();
WmsInventoryAllocateBill wmsInventory = baseMapper.selectOne(new QueryWrapper<WmsInventoryAllocateBill>().eq("goodsSid", dto.getGoodsSid()).eq("warehouseSid", dto.getWarehouseSid()));
WarehouseInventoryAllocatebill wmsInventory = baseMapper.selectOne(new QueryWrapper<WarehouseInventoryAllocatebill>().eq("goodsSid", dto.getGoodsSid()).eq("warehouseSid", dto.getWarehouseSid()));
double exisInventory = Double.valueOf(wmsInventory.getCount());
double out = Double.valueOf(dto.getCount());
if (null == wmsInventory) {
@@ -96,16 +96,16 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
return rb.success().setData(wmsInventory);
}
public ResultBean<String> saveOrUpdate(WmsInventoryAllocateBillDto dto) {
public ResultBean<String> saveOrUpdate(WarehouseInventoryAllocatebillDto dto) {
ResultBean rb = ResultBean.fireFail();
String sid = "";
if (StringUtils.isNotBlank(dto.getSid())) {
sid = dto.getSid();
WmsInventoryAllocateBill wmsWarehouseRack = fetchBySid(dto.getSid());
WarehouseInventoryAllocatebill wmsWarehouseRack = fetchBySid(dto.getSid());
BeanUtil.copyProperties(dto, wmsWarehouseRack, "id", "sid");
baseMapper.updateById(wmsWarehouseRack);
} else {
WmsInventoryAllocateBill wmsWarehouseRack = new WmsInventoryAllocateBill();
WarehouseInventoryAllocatebill wmsWarehouseRack = new WarehouseInventoryAllocatebill();
sid = wmsWarehouseRack.getSid();
BeanUtil.copyProperties(dto, wmsWarehouseRack, "id", "sid");
wmsWarehouseRack.setCreateTime(new DateTime());
@@ -114,16 +114,16 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
return rb.success().setMsg("成功");
}
public ResultBean<WmsInventoryAllocateBillVo> initialization(String sid) {
public ResultBean<WarehouseInventoryAllocatebillVo> initialization(String sid) {
ResultBean rb = ResultBean.fireFail();
WmsInventoryAllocateBillVo vo = baseMapper.initialization(sid);
WarehouseInventoryAllocatebillVo vo = baseMapper.initialization(sid);
return rb.success().setData(vo);
}
public ResultBean delete(String sid) {
ResultBean rb = ResultBean.fireFail();
WmsInventoryAllocateBill wmsWarehouseRack = fetchBySid(sid);
WarehouseInventoryAllocatebill wmsWarehouseRack = fetchBySid(sid);
if (null != wmsWarehouseRack) {
baseMapper.deleteById(wmsWarehouseRack.getId());
}
@@ -132,7 +132,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
public ResultBean updateIsEnable(String sid, String isEnable) {
ResultBean rb = ResultBean.fireFail();
WmsInventoryAllocateBill wmsWarehouseRack = fetchBySid(sid);
WarehouseInventoryAllocatebill wmsWarehouseRack = fetchBySid(sid);
if (null != wmsWarehouseRack) {
wmsWarehouseRack.setIsEnable(Integer.parseInt(isEnable));
baseMapper.updateById(wmsWarehouseRack);
@@ -140,11 +140,11 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
return rb.success().setMsg("成功");
}
public WmsInventoryAllocateBillDetailsVoNew fetchDetailsVoBySid(String sid) {
WmsInventoryAllocateBill entity = fetchBySid(sid);
WmsInventoryAllocateBillDetailsVoNew vo = new WmsInventoryAllocateBillDetailsVoNew();
public WarehouseInventoryAllocatebillDetailsVoNew fetchDetailsVoBySid(String sid) {
WarehouseInventoryAllocatebill entity = fetchBySid(sid);
WarehouseInventoryAllocatebillDetailsVoNew vo = new WarehouseInventoryAllocatebillDetailsVoNew();
BeanUtil.copyProperties(entity, vo);
List<WmsInventoryAllocatebillDetailDetailsVoNew> wmsInventoryAllocatebillDetailDetailsVoNews = wmsInventoryAllocateBillDetailService.selByMainSid(sid);
List<WarehouseInventoryAllocatebillDetailDetailsVoNew> wmsInventoryAllocatebillDetailDetailsVoNews = wmsInventoryAllocateBillDetailService.selByMainSid(sid);
vo.setWmsInventoryAllocateBillDetailNewList(wmsInventoryAllocatebillDetailDetailsVoNews);
return vo;
}
@@ -156,12 +156,12 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
}
}
public void saveOrUpdateDto(WmsInventoryAllocateBillDtoNew dto) {
public void saveOrUpdateDto(WarehouseInventoryAllocatebillDtoNew dto) {
String dtoSid = dto.getSid();
List<WmsInventoryAllocateBillDetailDtoNew> wmsInventoryAllocateBillDetailNewList = dto.getWmsInventoryAllocateBillDetailNewList();
List<WarehouseInventoryAllocatebillDetailDtoNew> wmsInventoryAllocateBillDetailNewList = dto.getWmsInventoryAllocateBillDetailNewList();
if (StringUtils.isBlank(dtoSid)) {
String sid = this.insertByDto(dto);
for (WmsInventoryAllocateBillDetailDtoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocateBillDetailNewList) {
for (WarehouseInventoryAllocatebillDetailDtoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocateBillDetailNewList) {
wmsInventoryAllocateBillDetailDtoNew.setBillSid(sid);
wmsInventoryAllocateBillDetailService.saveOrUpdateDto(wmsInventoryAllocateBillDetailDtoNew);
}
@@ -169,27 +169,27 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService<WmsInven
}
this.updateByDto(dto);
wmsInventoryAllocateBillDetailService.delByMainSid(dtoSid);
for (WmsInventoryAllocateBillDetailDtoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocateBillDetailNewList) {
for (WarehouseInventoryAllocatebillDetailDtoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocateBillDetailNewList) {
wmsInventoryAllocateBillDetailDtoNew.setBillSid(dtoSid);
wmsInventoryAllocateBillDetailService.saveOrUpdateDto(wmsInventoryAllocateBillDetailDtoNew);
}
}
public String insertByDto(WmsInventoryAllocateBillDtoNew dto) {
WmsInventoryAllocateBill entity = new WmsInventoryAllocateBill();
public String insertByDto(WarehouseInventoryAllocatebillDtoNew dto) {
WarehouseInventoryAllocatebill entity = new WarehouseInventoryAllocatebill();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
return entity.getSid();
}
public void updateByDto(WmsInventoryAllocateBillDtoNew dto) {
public void updateByDto(WarehouseInventoryAllocatebillDtoNew dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
}
public void allocation(WmsInventoryAllocateBillDtoNew dto) {
public void allocation(WarehouseInventoryAllocatebillDtoNew dto) {
}
}

4
src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebill/WmsInventoryAllocateBillVo.java → src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebill/WarehouseInventoryAllocatebillVo.java
View File

@@ -1,4 +1,4 @@
package com.yxt.warehouse.biz.wmsinventoryallocatebill;
package com.yxt.warehouse.biz.warehouseinventoryallocatebill;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
@@ -11,7 +11,7 @@ import java.util.Date;
* @date 2024/2/26 13:37
*/
@Data
public class WmsInventoryAllocateBillVo implements Vo {
public class WarehouseInventoryAllocatebillVo implements Vo {
private String id;
private String sid;
private String lockVersion;

4
src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebill/WmsInventoryAllocateBillVoNew.java → src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebill/WarehouseInventoryAllocatebillVoNew.java
View File

@@ -1,4 +1,4 @@
package com.yxt.warehouse.biz.wmsinventoryallocatebill;
package com.yxt.warehouse.biz.warehouseinventoryallocatebill;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
@@ -24,7 +24,7 @@ import java.util.Date;
*/
@Data
@ApiModel(value = "(调拨单)-调出方操作 视图数据对象", description = "(调拨单)-调出方操作 视图数据对象")
public class WmsInventoryAllocateBillVoNew implements Vo {
public class WarehouseInventoryAllocatebillVoNew implements Vo {
private String sid;

4
src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetail.java → src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebilldetail/WarehouseInventoryAllocatebillDetail.java
View File

@@ -1,4 +1,4 @@
package com.yxt.warehouse.biz.wmsinventoryallocatebilldetail;
package com.yxt.warehouse.biz.warehouseinventoryallocatebilldetail;
import com.yxt.common.core.domain.BaseEntity;
import lombok.Data;
@@ -8,7 +8,7 @@ import lombok.Data;
* @date 2024/2/28 8:38
*/
@Data
public class WmsInventoryAllocateBillDetail extends BaseEntity {
public class WarehouseInventoryAllocatebillDetail extends BaseEntity {
// private String id;
// private String sid= UUID.randomUUID().toString();
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

4
src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebilldetail/WmsInventoryAllocatebillDetailDetailsVoNew.java → src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebilldetail/WarehouseInventoryAllocatebillDetailDetailsVoNew.java
View File

@@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.warehouse.biz.wmsinventoryallocatebilldetail;
package com.yxt.warehouse.biz.warehouseinventoryallocatebilldetail;
import com.yxt.common.core.vo.Vo;
@@ -48,7 +48,7 @@ import java.math.BigDecimal;
*/
@Data
@ApiModel(value = "(调拨单-明细) 视图数据详情", description = "(调拨单-明细) 视图数据详情")
public class WmsInventoryAllocatebillDetailDetailsVoNew implements Vo {
public class WarehouseInventoryAllocatebillDetailDetailsVoNew implements Vo {
private String sid;

4
src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebill/WmsInventoryAllocateBillDto.java → src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebilldetail/WarehouseInventoryAllocatebillDetailDto.java
View File

@@ -1,4 +1,4 @@
package com.yxt.warehouse.biz.wmsinventoryallocatebill;
package com.yxt.warehouse.biz.warehouseinventoryallocatebilldetail;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.dto.Dto;
@@ -11,7 +11,7 @@ import java.util.Date;
* @date 2024/2/26 13:38
*/
@Data
public class WmsInventoryAllocateBillDto implements Dto {
public class WarehouseInventoryAllocatebillDetailDto implements Dto {
private String id;
private String sid;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

4
src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailDtoNew.java → src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebilldetail/WarehouseInventoryAllocatebillDetailDtoNew.java
View File

@@ -1,4 +1,4 @@
package com.yxt.warehouse.biz.wmsinventoryallocatebilldetail;
package com.yxt.warehouse.biz.warehouseinventoryallocatebilldetail;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
@@ -11,7 +11,7 @@ import java.math.BigDecimal;
* @date 2024/2/26 13:38
*/
@Data
public class WmsInventoryAllocateBillDetailDtoNew implements Dto {
public class WarehouseInventoryAllocatebillDetailDtoNew implements Dto {
private String sid;

10
src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailMapper.java → src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebilldetail/WarehouseInventoryAllocatebillDetailMapper.java
View File

@@ -1,4 +1,4 @@
package com.yxt.warehouse.biz.wmsinventoryallocatebilldetail;
package com.yxt.warehouse.biz.warehouseinventoryallocatebilldetail;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -15,12 +15,12 @@ import java.util.List;
* @date 2024/2/26 13:40
*/
@Mapper
public interface WmsInventoryAllocateBillDetailMapper extends BaseMapper<WmsInventoryAllocateBillDetail> {
IPage<WmsInventoryAllocateBillDetailVo> listPage(IPage<WmsInventoryAllocateBillDetail> page, @Param(Constants.WRAPPER) QueryWrapper<WmsInventoryAllocateBillDetail> qw);
WmsInventoryAllocateBillDetailVo initialization (@Param("sid") String sid);
public interface WarehouseInventoryAllocatebillDetailMapper extends BaseMapper<WarehouseInventoryAllocatebillDetail> {
IPage<WarehouseInventoryAllocatebillDetailVo> listPage(IPage<WarehouseInventoryAllocatebillDetail> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseInventoryAllocatebillDetail> qw);
WarehouseInventoryAllocatebillDetailVo initialization (@Param("sid") String sid);
@Delete("delete from wms_inventory_allocatebill_detail where billSid = #{billSid}")
void delByMainSid(String billSid);
List<WmsInventoryAllocatebillDetailDetailsVoNew> selByMainSid(String billSid);
List<WarehouseInventoryAllocatebillDetailDetailsVoNew> selByMainSid(String billSid);
}

36
src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebilldetail/WarehouseInventoryAllocatebillDetailMapper.xml Normal file
View File

@@ -0,0 +1,36 @@
<?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.yxt.warehouse.biz.warehouseinventoryallocatebilldetail.WarehouseInventoryAllocatebillDetailMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="listPage" resultType="com.yxt.warehouse.biz.warehouseinventoryallocatebilldetail.WarehouseInventoryAllocatebillDetailVo">
select
a.*
from warehouse_inventory_allocate_bill_detail a
<where>
${ew.sqlSegment}
</where>
</select>
<select id="initialization" resultType="com.yxt.warehouse.biz.warehouseinventoryallocatebilldetail.WarehouseInventoryAllocatebillDetailVo">
select
a.*
from warehouse_inventory_allocate_bill_detail a
where a.sid =#{sid}
</select>
<select id="selByMainSid"
resultType="com.yxt.warehouse.biz.warehouseinventoryallocatebilldetail.WarehouseInventoryAllocatebillDetailDetailsVoNew">
SELECT
wiad.*,
wi.goodsSpuName,
wi.goodsSkuCode,
wi.goodsSkuOwnSpec,
wi.unit
FROM
warehouse_inventory_allocatebill_detail wiad
LEFT JOIN warehouse_inventory wi
ON wiad.inventorySid = wi.`sid`
WHERE billSid = #{billSid}
</select>
</mapper>

13
src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebilldetail/WarehouseInventoryAllocatebillDetailQuery.java Normal file
View File

@@ -0,0 +1,13 @@
package com.yxt.warehouse.biz.warehouseinventoryallocatebilldetail;
import com.yxt.common.core.query.Query;
import lombok.Data;
/**
* @author wangpengfei
* @date 2024/2/26 13:37
*/
@Data
public class WarehouseInventoryAllocatebillDetailQuery implements Query {
private String name;
}

55
src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailService.java → src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebilldetail/WarehouseInventoryAllocatebillDetailService.java
View File

@@ -1,4 +1,4 @@
package com.yxt.warehouse.biz.wmsinventoryallocatebilldetail;
package com.yxt.warehouse.biz.warehouseinventoryallocatebilldetail;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateTime;
@@ -10,8 +10,7 @@ import com.yxt.common.base.utils.StringUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.warehouse.biz.wmsinventoryallocatebill.WmsInventoryAllocateBill;
import com.yxt.warehouse.biz.wmsinventoryallocatebill.WmsInventoryAllocateBillDetailsVoNew;
import com.yxt.warehouse.biz.warehouseinventoryallocatebill.WarehouseInventoryAllocatebillDetailsVoNew;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -21,21 +20,21 @@ import java.util.List;
* @date 2024/2/26 13:40
*/
@Service
public class WmsInventoryAllocateBillDetailService extends MybatisBaseService<WmsInventoryAllocateBillDetailMapper, WmsInventoryAllocateBillDetail> {
public class WarehouseInventoryAllocatebillDetailService extends MybatisBaseService<WarehouseInventoryAllocatebillDetailMapper, WarehouseInventoryAllocatebillDetail> {
public ResultBean<PagerVo<WmsInventoryAllocateBillDetailVo>> listPage(PagerQuery<WmsInventoryAllocateBillDetailQuery> pq) {
public ResultBean<PagerVo<WarehouseInventoryAllocatebillDetailVo>> listPage(PagerQuery<WarehouseInventoryAllocatebillDetailQuery> pq) {
ResultBean rb = ResultBean.fireFail();
WmsInventoryAllocateBillDetailQuery query = pq.getParams();
QueryWrapper<WmsInventoryAllocateBillDetail> qw = new QueryWrapper<>();
WarehouseInventoryAllocatebillDetailQuery query = pq.getParams();
QueryWrapper<WarehouseInventoryAllocatebillDetail> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getName())) {
qw.like("rackName", query.getName());
}
IPage<WmsInventoryAllocateBillDetail> page = PagerUtil.queryToPage(pq);
IPage<WmsInventoryAllocateBillDetailVo> pagging = baseMapper.listPage(page, qw);
PagerVo<WmsInventoryAllocateBillDetailVo> p = PagerUtil.pageToVo(pagging, null);
List<WmsInventoryAllocateBillDetailVo> records = pagging.getRecords();
IPage<WarehouseInventoryAllocatebillDetail> page = PagerUtil.queryToPage(pq);
IPage<WarehouseInventoryAllocatebillDetailVo> pagging = baseMapper.listPage(page, qw);
PagerVo<WarehouseInventoryAllocatebillDetailVo> p = PagerUtil.pageToVo(pagging, null);
List<WarehouseInventoryAllocatebillDetailVo> records = pagging.getRecords();
return rb.success().setData(p);
}
@@ -47,9 +46,9 @@ public class WmsInventoryAllocateBillDetailService extends MybatisBaseService<Wm
* @param dto
* @return
*/
public ResultBean<WmsInventoryAllocateBillDetail> outWarehousing(WmsInventoryAllocateBillDetailDto dto) {
public ResultBean<WarehouseInventoryAllocatebillDetail> outWarehousing(WarehouseInventoryAllocatebillDetailDto dto) {
ResultBean rb = ResultBean.fireFail();
WmsInventoryAllocateBillDetail wmsInventory = baseMapper.selectOne(new QueryWrapper<WmsInventoryAllocateBillDetail>().eq("goodsSid", dto.getGoodsSid()).eq("warehouseSid", dto.getWarehouseSid()));
WarehouseInventoryAllocatebillDetail wmsInventory = baseMapper.selectOne(new QueryWrapper<WarehouseInventoryAllocatebillDetail>().eq("goodsSid", dto.getGoodsSid()).eq("warehouseSid", dto.getWarehouseSid()));
double exisInventory = Double.valueOf(wmsInventory.getCount());
double out = Double.valueOf(dto.getCount());
if (null == wmsInventory) {
@@ -63,16 +62,16 @@ public class WmsInventoryAllocateBillDetailService extends MybatisBaseService<Wm
return rb.success().setData(wmsInventory);
}
public ResultBean<String> saveOrUpdate(WmsInventoryAllocateBillDetailDto dto) {
public ResultBean<String> saveOrUpdate(WarehouseInventoryAllocatebillDetailDto dto) {
ResultBean rb = ResultBean.fireFail();
String sid = "";
if (StringUtils.isNotBlank(dto.getSid())) {
sid = dto.getSid();
WmsInventoryAllocateBillDetail wmsWarehouseRack = fetchBySid(dto.getSid());
WarehouseInventoryAllocatebillDetail wmsWarehouseRack = fetchBySid(dto.getSid());
BeanUtil.copyProperties(dto, wmsWarehouseRack, "id", "sid");
baseMapper.updateById(wmsWarehouseRack);
} else {
WmsInventoryAllocateBillDetail wmsWarehouseRack = new WmsInventoryAllocateBillDetail();
WarehouseInventoryAllocatebillDetail wmsWarehouseRack = new WarehouseInventoryAllocatebillDetail();
sid = wmsWarehouseRack.getSid();
BeanUtil.copyProperties(dto, wmsWarehouseRack, "id", "sid");
wmsWarehouseRack.setCreateTime(new DateTime());
@@ -81,9 +80,9 @@ public class WmsInventoryAllocateBillDetailService extends MybatisBaseService<Wm
return rb.success().setMsg("成功");
}
public ResultBean<WmsInventoryAllocateBillDetailVo> initialization(String sid) {
public ResultBean<WarehouseInventoryAllocatebillDetailVo> initialization(String sid) {
ResultBean rb = ResultBean.fireFail();
WmsInventoryAllocateBillDetailVo vo = baseMapper.initialization(sid);
WarehouseInventoryAllocatebillDetailVo vo = baseMapper.initialization(sid);
return rb.success().setData(vo);
}
public void delAll(String[] sids) {
@@ -92,7 +91,7 @@ public class WmsInventoryAllocateBillDetailService extends MybatisBaseService<Wm
public ResultBean delete(String sid) {
ResultBean rb = ResultBean.fireFail();
WmsInventoryAllocateBillDetail wmsWarehouseRack = fetchBySid(sid);
WarehouseInventoryAllocatebillDetail wmsWarehouseRack = fetchBySid(sid);
if (null != wmsWarehouseRack) {
baseMapper.deleteById(wmsWarehouseRack.getId());
}
@@ -101,7 +100,7 @@ public class WmsInventoryAllocateBillDetailService extends MybatisBaseService<Wm
public ResultBean updateIsEnable(String sid, String isEnable) {
ResultBean rb = ResultBean.fireFail();
WmsInventoryAllocateBillDetail wmsWarehouseRack = fetchBySid(sid);
WarehouseInventoryAllocatebillDetail wmsWarehouseRack = fetchBySid(sid);
if (null != wmsWarehouseRack) {
wmsWarehouseRack.setIsEnable(Integer.parseInt(isEnable));
baseMapper.updateById(wmsWarehouseRack);
@@ -113,11 +112,11 @@ public class WmsInventoryAllocateBillDetailService extends MybatisBaseService<Wm
baseMapper.delByMainSid(billSid);
}
public List<WmsInventoryAllocatebillDetailDetailsVoNew> selByMainSid(String billSid) {
public List<WarehouseInventoryAllocatebillDetailDetailsVoNew> selByMainSid(String billSid) {
return baseMapper.selByMainSid(billSid);
}
public void saveOrUpdateDto(WmsInventoryAllocateBillDetailDtoNew dto) {
public void saveOrUpdateDto(WarehouseInventoryAllocatebillDetailDtoNew dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
@@ -126,21 +125,21 @@ public class WmsInventoryAllocateBillDetailService extends MybatisBaseService<Wm
this.updateByDto(dto);
}
public void insertByDto(WmsInventoryAllocateBillDetailDtoNew dto) {
WmsInventoryAllocateBillDetail entity = new WmsInventoryAllocateBillDetail();
public void insertByDto(WarehouseInventoryAllocatebillDetailDtoNew dto) {
WarehouseInventoryAllocatebillDetail entity = new WarehouseInventoryAllocatebillDetail();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(WmsInventoryAllocateBillDetailDtoNew dto) {
public void updateByDto(WarehouseInventoryAllocatebillDetailDtoNew dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
}
public WmsInventoryAllocateBillDetailsVoNew fetchDetailsVoBySid(String sid) {
WmsInventoryAllocateBillDetail entity = fetchBySid(sid);
WmsInventoryAllocateBillDetailsVoNew vo = new WmsInventoryAllocateBillDetailsVoNew();
public WarehouseInventoryAllocatebillDetailsVoNew fetchDetailsVoBySid(String sid) {
WarehouseInventoryAllocatebillDetail entity = fetchBySid(sid);
WarehouseInventoryAllocatebillDetailsVoNew vo = new WarehouseInventoryAllocatebillDetailsVoNew();
BeanUtil.copyProperties(entity, vo);
return vo;

4
src/main/java/com/yxt/warehouse/biz/wmsinventoryallocatebilldetail/WmsInventoryAllocateBillDetailVo.java → src/main/java/com/yxt/warehouse/biz/warehouseinventoryallocatebilldetail/WarehouseInventoryAllocatebillDetailVo.java
View File

@@ -1,4 +1,4 @@
package com.yxt.warehouse.biz.wmsinventoryallocatebilldetail;
package com.yxt.warehouse.biz.warehouseinventoryallocatebilldetail;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
@@ -11,7 +11,7 @@ import java.util.Date;
* @date 2024/2/26 13:37
*/
@Data
public class WmsInventoryAllocateBillDetailVo implements Vo {
public class WarehouseInventoryAllocatebillDetailVo implements Vo {
private String id;
private String sid;
private String lockVersion;

4
src/main/java/com/yxt/warehouse/biz/wmsinventorybatch/WmsInventoryBatch.java → src/main/java/com/yxt/warehouse/biz/warehouseinventorybatch/WarehouseInventoryBatch.java
View File

@@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.warehouse.biz.wmsinventorybatch;
package com.yxt.warehouse.biz.warehouseinventorybatch;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -50,7 +50,7 @@ import java.util.Date;
@Data
@ApiModel(value = "商品库存-批次属性", description = "商品库存-批次属性")
@TableName("wms_inventory_batch")
public class WmsInventoryBatch extends BaseEntity {
public class WarehouseInventoryBatch extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("批次号（入库日期+生产日期，如240320-240109）")

4
src/main/java/com/yxt/warehouse/biz/wmsinventorybatch/WmsInventoryBatchDetailsVo.java → src/main/java/com/yxt/warehouse/biz/warehouseinventorybatch/WarehouseInventoryBatchDetailsVo.java
View File

@@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.warehouse.biz.wmsinventorybatch;
package com.yxt.warehouse.biz.warehouseinventorybatch;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -49,7 +49,7 @@ import java.util.Date;
*/
@Data
@ApiModel(value = "商品库存-批次属性 视图数据详情", description = "商品库存-批次属性 视图数据详情")
public class WmsInventoryBatchDetailsVo implements Vo {
public class WarehouseInventoryBatchDetailsVo implements Vo {
private String sid; // sid

4
src/main/java/com/yxt/warehouse/biz/wmsinventorybatch/WmsInventoryBatchDto.java → src/main/java/com/yxt/warehouse/biz/warehouseinventorybatch/WarehouseInventoryBatchDto.java
View File

@@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.warehouse.biz.wmsinventorybatch;
package com.yxt.warehouse.biz.warehouseinventorybatch;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -49,7 +49,7 @@ import java.util.Date;
*/
@Data
@ApiModel(value = "商品库存-批次属性 数据传输对象", description = "商品库存-批次属性 数据传输对象")
public class WmsInventoryBatchDto implements Dto {
public class WarehouseInventoryBatchDto implements Dto {
private String sid; // sid

10
src/main/java/com/yxt/warehouse/biz/wmsinventorybatch/WmsInventoryBatchMapper.java → src/main/java/com/yxt/warehouse/biz/warehouseinventorybatch/WarehouseInventoryBatchMapper.java
View File

@@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.warehouse.biz.wmsinventorybatch;
package com.yxt.warehouse.biz.warehouseinventorybatch;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -49,12 +49,12 @@ import java.util.List;
* @since 1.0
*/
@Mapper
public interface WmsInventoryBatchMapper extends BaseMapper<WmsInventoryBatch> {
public interface WarehouseInventoryBatchMapper extends BaseMapper<WarehouseInventoryBatch> {
IPage<WmsInventoryBatchVo> selectPageVo(IPage<WmsInventoryBatch> page, @Param(Constants.WRAPPER) Wrapper<WmsInventoryBatch> qw);
IPage<WarehouseInventoryBatchVo> selectPageVo(IPage<WarehouseInventoryBatch> page, @Param(Constants.WRAPPER) Wrapper<WarehouseInventoryBatch> qw);
List<WmsInventoryBatchVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<WmsInventoryBatch> qw);
List<WarehouseInventoryBatchVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<WarehouseInventoryBatch> qw);
@Select("select * from wms_inventory_batch")
List<WmsInventoryBatchVo> selectListVo();
List<WarehouseInventoryBatchVo> selectListVo();
}

13
src/main/java/com/yxt/warehouse/biz/warehouseinventorybatch/WarehouseInventoryBatchMapper.xml Normal file
View File

@@ -0,0 +1,13 @@
<?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.yxt.warehouse.biz.warehouseinventorybatch.WarehouseInventoryBatchMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.warehouse.biz.warehouseinventorybatch.WarehouseInventoryBatchVo">
SELECT * FROM warehouse_inventory_batch <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.warehouse.biz.warehouseinventorybatch.WarehouseInventoryBatchVo">
SELECT * FROM warehouse_inventory_batch <where> ${ew.sqlSegment} </where>
</select>
</mapper>

4
src/main/java/com/yxt/warehouse/biz/wmsinventorybatch/WmsInventoryBatchQuery.java → src/main/java/com/yxt/warehouse/biz/warehouseinventorybatch/WarehouseInventoryBatchQuery.java
View File

@@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.warehouse.biz.wmsinventorybatch;
package com.yxt.warehouse.biz.warehouseinventorybatch;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -49,7 +49,7 @@ import java.util.Date;
*/
@Data
@ApiModel(value = "商品库存-批次属性 查询条件", description = "商品库存-批次属性 查询条件")
public class WmsInventoryBatchQuery implements Query {
public class WarehouseInventoryBatchQuery implements Query {
@ApiModelProperty("批次号（入库日期+生产日期，如240320-240109）")
private String batchNumber; // 批次号（入库日期+生产日期，如240320-240109）

32
src/main/java/com/yxt/warehouse/biz/wmsinventorybatch/WmsInventoryBatchService.java → src/main/java/com/yxt/warehouse/biz/warehouseinventorybatch/WarehouseInventoryBatchService.java
View File

@@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.warehouse.biz.wmsinventorybatch;
package com.yxt.warehouse.biz.warehouseinventorybatch;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -49,18 +49,18 @@ import org.springframework.stereotype.Service;
* @since 1.0
*/
@Service
public class WmsInventoryBatchService extends MybatisBaseService<WmsInventoryBatchMapper, WmsInventoryBatch> {
public class WarehouseInventoryBatchService extends MybatisBaseService<WarehouseInventoryBatchMapper, WarehouseInventoryBatch> {
public PagerVo<WmsInventoryBatchVo> listPageVo(PagerQuery<WmsInventoryBatchQuery> pq) {
WmsInventoryBatchQuery query = pq.getParams();
QueryWrapper<WmsInventoryBatch> qw = new QueryWrapper<>();
IPage<WmsInventoryBatch> page = PagerUtil.queryToPage(pq);
IPage<WmsInventoryBatchVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<WmsInventoryBatchVo> p = PagerUtil.pageToVo(pagging, null);
public PagerVo<WarehouseInventoryBatchVo> listPageVo(PagerQuery<WarehouseInventoryBatchQuery> pq) {
WarehouseInventoryBatchQuery query = pq.getParams();
QueryWrapper<WarehouseInventoryBatch> qw = new QueryWrapper<>();
IPage<WarehouseInventoryBatch> page = PagerUtil.queryToPage(pq);
IPage<WarehouseInventoryBatchVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<WarehouseInventoryBatchVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(WmsInventoryBatchDto dto){
public void saveOrUpdateDto(WarehouseInventoryBatchDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
@@ -69,25 +69,25 @@ public class WmsInventoryBatchService extends MybatisBaseService<WmsInventoryBat
this.updateByDto(dto);
}
public void insertByDto(WmsInventoryBatchDto dto){
WmsInventoryBatch entity = new WmsInventoryBatch();
public void insertByDto(WarehouseInventoryBatchDto dto){
WarehouseInventoryBatch entity = new WarehouseInventoryBatch();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(WmsInventoryBatchDto dto){
public void updateByDto(WarehouseInventoryBatchDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
WmsInventoryBatch entity = fetchBySid(dtoSid);
WarehouseInventoryBatch entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public WmsInventoryBatchDetailsVo fetchDetailsVoBySid(String sid){
WmsInventoryBatch entity = fetchBySid(sid);
WmsInventoryBatchDetailsVo vo = new WmsInventoryBatchDetailsVo();
public WarehouseInventoryBatchDetailsVo fetchDetailsVoBySid(String sid){
WarehouseInventoryBatch entity = fetchBySid(sid);
WarehouseInventoryBatchDetailsVo vo = new WarehouseInventoryBatchDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}

4
src/main/java/com/yxt/warehouse/biz/wmsinventorybatch/WmsInventoryBatchVo.java → src/main/java/com/yxt/warehouse/biz/warehouseinventorybatch/WarehouseInventoryBatchVo.java
View File

@@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.warehouse.biz.wmsinventorybatch;
package com.yxt.warehouse.biz.warehouseinventorybatch;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -49,7 +49,7 @@ import java.util.Date;
*/
@Data
@ApiModel(value = "商品库存-批次属性 视图数据对象", description = "商品库存-批次属性 视图数据对象")
public class WmsInventoryBatchVo implements Vo {
public class WarehouseInventoryBatchVo implements Vo {
private String sid; // sid

4
src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbill/WmsInventoryCheckbill.java → src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbill/WarehouseInventoryCheckBill.java
View File

@@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.warehouse.biz.wmsinventorycheckbill;
package com.yxt.warehouse.biz.warehouseinventorycheckbill;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
@@ -49,7 +49,7 @@ import java.math.BigDecimal;
@Data
@ApiModel(value = "库存盘点", description = "库存盘点")
@TableName("wms_inventory_checkbill")
public class WmsInventoryCheckbill extends BaseEntity {
public class WarehouseInventoryCheckBill extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("单据编号")

8
src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbill/WmsInventoryCheckbillDetailsVo.java → src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbill/WarehouseInventoryCheckBillDetailsVo.java
View File

@@ -23,11 +23,11 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.warehouse.biz.wmsinventorycheckbill;
package com.yxt.warehouse.biz.warehouseinventorycheckbill;
import com.yxt.common.core.vo.Vo;
import com.yxt.warehouse.biz.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailDetailsVo;
import com.yxt.warehouse.biz.warehouseinventorycheckbilldetail.WarehouseInventoryCheckbillDetailDetailsVo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -50,7 +50,7 @@ import java.util.List;
*/
@Data
@ApiModel(value = "库存盘点 视图数据详情", description = "库存盘点 视图数据详情")
public class WmsInventoryCheckbillDetailsVo implements Vo {
public class WarehouseInventoryCheckBillDetailsVo implements Vo {
private String sid;
@@ -79,5 +79,5 @@ public class WmsInventoryCheckbillDetailsVo implements Vo {
@ApiModelProperty("创建组织sid")
private String createOrgSid;
@ApiModelProperty("盘库明细")
private List<WmsInventoryCheckbillDetailDetailsVo> wmsInventoryCheckbillDetailList;
private List<WarehouseInventoryCheckbillDetailDetailsVo> wmsInventoryCheckbillDetailList;
}

8
src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbill/WmsInventoryCheckbillDto.java → src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbill/WarehouseInventoryCheckBillDto.java
View File

@@ -23,11 +23,11 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.warehouse.biz.wmsinventorycheckbill;
package com.yxt.warehouse.biz.warehouseinventorycheckbill;
import com.yxt.common.core.dto.Dto;
import com.yxt.warehouse.biz.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailDto;
import com.yxt.warehouse.biz.warehouseinventorycheckbilldetail.WarehouseInventoryCheckbillDetailDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -50,7 +50,7 @@ import java.util.List;
*/
@Data
@ApiModel(value = "库存盘点 数据传输对象", description = "库存盘点 数据传输对象")
public class WmsInventoryCheckbillDto implements Dto {
public class WarehouseInventoryCheckBillDto implements Dto {
private String sid;
@@ -79,5 +79,5 @@ public class WmsInventoryCheckbillDto implements Dto {
@ApiModelProperty("创建组织sid")
private String createOrgSid;
@ApiModelProperty("盘库明细")
private List<WmsInventoryCheckbillDetailDto> wmsInventoryCheckbillDetailList;
private List<WarehouseInventoryCheckbillDetailDto> wmsInventoryCheckbillDetailList;
}

10
src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbill/WmsInventoryCheckbillMapper.java → src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbill/WarehouseInventoryCheckBillMapper.java
View File

@@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.warehouse.biz.wmsinventorycheckbill;
package com.yxt.warehouse.biz.warehouseinventorycheckbill;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -49,12 +49,12 @@ import java.util.List;
* @since 1.0
*/
@Mapper
public interface WmsInventoryCheckbillMapper extends BaseMapper<WmsInventoryCheckbill> {
public interface WarehouseInventoryCheckBillMapper extends BaseMapper<WarehouseInventoryCheckBill> {
IPage<WmsInventoryCheckbillVo> selectPageVo(IPage<WmsInventoryCheckbill> page, @Param(Constants.WRAPPER) Wrapper<WmsInventoryCheckbill> qw);
IPage<WarehouseInventoryCheckBillVo> selectPageVo(IPage<WarehouseInventoryCheckBill> page, @Param(Constants.WRAPPER) Wrapper<WarehouseInventoryCheckBill> qw);
List<WmsInventoryCheckbillVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<WmsInventoryCheckbill> qw);
List<WarehouseInventoryCheckBillVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<WarehouseInventoryCheckBill> qw);
@Select("select * from wms_inventory_checkbill")
List<WmsInventoryCheckbillVo> selectListVo();
List<WarehouseInventoryCheckBillVo> selectListVo();
}

6
src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbill/WmsInventoryCheckbillMapper.xml → src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbill/WarehouseInventoryCheckBillMapper.xml
View File

@@ -1,13 +1,13 @@
<?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.yxt.warehouse.biz.wmsinventorycheckbill.WmsInventoryCheckbillMapper">
<mapper namespace="com.yxt.warehouse.biz.warehouseinventorycheckbill.WarehouseInventoryCheckBillMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.warehouse.biz.wmsinventorycheckbill.WmsInventoryCheckbillVo">
<select id="selectPageVo" resultType="com.yxt.warehouse.biz.warehouseinventorycheckbill.WarehouseInventoryCheckBillVo">
SELECT * FROM wms_inventory_checkbill <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.warehouse.biz.wmsinventorycheckbill.WmsInventoryCheckbillVo">
<select id="selectListAllVo" resultType="com.yxt.warehouse.biz.warehouseinventorycheckbill.WarehouseInventoryCheckBillVo">
SELECT * FROM wms_inventory_checkbill <where> ${ew.sqlSegment} </where>
</select>
</mapper>

4
src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbill/WmsInventoryCheckbillQuery.java → src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbill/WarehouseInventoryCheckBillQuery.java
View File

@@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.warehouse.biz.wmsinventorycheckbill;
package com.yxt.warehouse.biz.warehouseinventorycheckbill;
import com.yxt.common.core.query.Query;
@@ -46,7 +46,7 @@ import lombok.Data;
*/
@Data
@ApiModel(value = "库存盘点 查询条件", description = "库存盘点 查询条件")
public class WmsInventoryCheckbillQuery implements Query {
public class WarehouseInventoryCheckBillQuery implements Query {
@ApiModelProperty("创建开始日期")
private String createStartTime;

56
src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbill/WmsInventoryCheckbillService.java → src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbill/WarehouseInventoryCheckBillService.java
View File

@@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.warehouse.biz.wmsinventorycheckbill;
package com.yxt.warehouse.biz.warehouseinventorycheckbill;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -32,9 +32,9 @@ import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.warehouse.biz.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailDetailsVo;
import com.yxt.warehouse.biz.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailDto;
import com.yxt.warehouse.biz.wmsinventorycheckbilldetail.WmsInventoryCheckbillDetailService;
import com.yxt.warehouse.biz.warehouseinventorycheckbilldetail.WarehouseInventoryCheckbillDetailDetailsVo;
import com.yxt.warehouse.biz.warehouseinventorycheckbilldetail.WarehouseInventoryCheckbillDetailDto;
import com.yxt.warehouse.biz.warehouseinventorycheckbilldetail.WarehouseInventoryCheckbillDetailService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -55,14 +55,14 @@ import java.util.List;
* @since 1.0
*/
@Service
public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventoryCheckbillMapper, WmsInventoryCheckbill> {
public class WarehouseInventoryCheckBillService extends MybatisBaseService<WarehouseInventoryCheckBillMapper, WarehouseInventoryCheckBill> {
@Autowired
private WmsInventoryCheckbillDetailService wmsInventoryCheckbillDetailService;
private WarehouseInventoryCheckbillDetailService wmsInventoryCheckbillDetailService;
public PagerVo<WmsInventoryCheckbillVo> listPageVo(PagerQuery<WmsInventoryCheckbillQuery> pq) {
WmsInventoryCheckbillQuery query = pq.getParams();
QueryWrapper<WmsInventoryCheckbill> qw = new QueryWrapper<>();
public PagerVo<WarehouseInventoryCheckBillVo> listPageVo(PagerQuery<WarehouseInventoryCheckBillQuery> pq) {
WarehouseInventoryCheckBillQuery query = pq.getParams();
QueryWrapper<WarehouseInventoryCheckBill> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getOtherQuery())){
qw.and(wrapper -> wrapper.like("pb.billNo", query.getOtherQuery()));
}
@@ -71,9 +71,9 @@ public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventor
qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (pb.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotEmpty(createEndTime), "date_format (pb.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
IPage<WmsInventoryCheckbill> page = PagerUtil.queryToPage(pq);
IPage<WmsInventoryCheckbillVo> pagging = baseMapper.selectPageVo(page, qw);
for (WmsInventoryCheckbillVo record : pagging.getRecords()) {
IPage<WarehouseInventoryCheckBill> page = PagerUtil.queryToPage(pq);
IPage<WarehouseInventoryCheckBillVo> pagging = baseMapper.selectPageVo(page, qw);
for (WarehouseInventoryCheckBillVo record : pagging.getRecords()) {
Integer checkState = record.getCheckState();
if (checkState == 1){
record.setCheckStateName("盘点中");
@@ -81,16 +81,16 @@ public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventor
record.setCheckStateName("盘点完成");
}
}
PagerVo<WmsInventoryCheckbillVo> p = PagerUtil.pageToVo(pagging, null);
PagerVo<WarehouseInventoryCheckBillVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(WmsInventoryCheckbillDto dto){
public void saveOrUpdateDto(WarehouseInventoryCheckBillDto dto){
String dtoSid = dto.getSid();
List<WmsInventoryCheckbillDetailDto> wmsInventoryCheckbillDetailList = dto.getWmsInventoryCheckbillDetailList();
List<WarehouseInventoryCheckbillDetailDto> wmsInventoryCheckbillDetailList = dto.getWmsInventoryCheckbillDetailList();
if (StringUtils.isBlank(dtoSid)) {
String sid = this.insertByDto(dto);
for (WmsInventoryCheckbillDetailDto wmsInventoryCheckbillDetailDto : wmsInventoryCheckbillDetailList) {
for (WarehouseInventoryCheckbillDetailDto wmsInventoryCheckbillDetailDto : wmsInventoryCheckbillDetailList) {
wmsInventoryCheckbillDetailDto.setBillSid(sid);
wmsInventoryCheckbillDetailService.saveOrUpdateDto(wmsInventoryCheckbillDetailDto);
}
@@ -98,42 +98,42 @@ public class WmsInventoryCheckbillService extends MybatisBaseService<WmsInventor
}
this.updateByDto(dto);
wmsInventoryCheckbillDetailService.delByMainSid(dtoSid);
for (WmsInventoryCheckbillDetailDto wmsInventoryCheckbillDetailDto : wmsInventoryCheckbillDetailList) {
for (WarehouseInventoryCheckbillDetailDto wmsInventoryCheckbillDetailDto : wmsInventoryCheckbillDetailList) {
wmsInventoryCheckbillDetailDto.setBillSid(dtoSid);
wmsInventoryCheckbillDetailService.saveOrUpdateDto(wmsInventoryCheckbillDetailDto);
}
}
public String insertByDto(WmsInventoryCheckbillDto dto){
WmsInventoryCheckbill entity = new WmsInventoryCheckbill();
public String insertByDto(WarehouseInventoryCheckBillDto dto){
WarehouseInventoryCheckBill entity = new WarehouseInventoryCheckBill();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
return entity.getSid();
}
public void updateByDto(WmsInventoryCheckbillDto dto){
public void updateByDto(WarehouseInventoryCheckBillDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
WmsInventoryCheckbill entity = fetchBySid(dtoSid);
WarehouseInventoryCheckBill entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public WmsInventoryCheckbillDetailsVo fetchDetailsVoBySid(String sid){
WmsInventoryCheckbill entity = fetchBySid(sid);
WmsInventoryCheckbillDetailsVo vo = new WmsInventoryCheckbillDetailsVo();
public WarehouseInventoryCheckBillDetailsVo fetchDetailsVoBySid(String sid){
WarehouseInventoryCheckBill entity = fetchBySid(sid);
WarehouseInventoryCheckBillDetailsVo vo = new WarehouseInventoryCheckBillDetailsVo();
BeanUtil.copyProperties(entity, vo);
List<WmsInventoryCheckbillDetailDetailsVo> wmsInventoryCheckbillDetailDetailsVos = wmsInventoryCheckbillDetailService.selByMainSid(sid);
List<WarehouseInventoryCheckbillDetailDetailsVo> wmsInventoryCheckbillDetailDetailsVos = wmsInventoryCheckbillDetailService.selByMainSid(sid);
vo.setWmsInventoryCheckbillDetailList(wmsInventoryCheckbillDetailDetailsVos);
return vo;
}
public void inven(WmsInventoryCheckbillDto dto) {
public void inven(WarehouseInventoryCheckBillDto dto) {
saveOrUpdateDto(dto);
List<WmsInventoryCheckbillDetailDto> wmsInventoryCheckbillDetailList = dto.getWmsInventoryCheckbillDetailList();
for (WmsInventoryCheckbillDetailDto wmsInventoryCheckbillDetailDto : wmsInventoryCheckbillDetailList) {
List<WarehouseInventoryCheckbillDetailDto> wmsInventoryCheckbillDetailList = dto.getWmsInventoryCheckbillDetailList();
for (WarehouseInventoryCheckbillDetailDto wmsInventoryCheckbillDetailDto : wmsInventoryCheckbillDetailList) {
}
}

4
src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbill/WmsInventoryCheckbillVo.java → src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbill/WarehouseInventoryCheckBillVo.java
View File

@@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.warehouse.biz.wmsinventorycheckbill;
package com.yxt.warehouse.biz.warehouseinventorycheckbill;
import com.yxt.common.core.vo.Vo;
@@ -48,7 +48,7 @@ import java.math.BigDecimal;
*/
@Data
@ApiModel(value = "库存盘点 视图数据对象", description = "库存盘点 视图数据对象")
public class WmsInventoryCheckbillVo implements Vo {
public class WarehouseInventoryCheckBillVo implements Vo {
private String sid;

4
src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetail.java → src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetail.java
View File

@@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.warehouse.biz.wmsinventorycheckbilldetail;
package com.yxt.warehouse.biz.warehouseinventorycheckbilldetail;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
@@ -49,7 +49,7 @@ import java.math.BigDecimal;
@Data
@ApiModel(value = "库存盘点-明细", description = "库存盘点-明细")
@TableName("wms_inventory_checkbill_detail")
public class WmsInventoryCheckbillDetail extends BaseEntity {
public class WarehouseInventoryCheckbillDetail extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("盘点单sid")

4
src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDetailsVo.java → src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailDetailsVo.java
View File

@@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.warehouse.biz.wmsinventorycheckbilldetail;
package com.yxt.warehouse.biz.warehouseinventorycheckbilldetail;
import com.yxt.common.core.vo.Vo;
@@ -50,7 +50,7 @@ import java.util.List;
*/
@Data
@ApiModel(value = "库存盘点-明细 视图数据详情", description = "库存盘点-明细 视图数据详情")
public class WmsInventoryCheckbillDetailDetailsVo implements Vo {
public class WarehouseInventoryCheckbillDetailDetailsVo implements Vo {
private String sid;

4
src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailDto.java → src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailDto.java
View File

@@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.warehouse.biz.wmsinventorycheckbilldetail;
package com.yxt.warehouse.biz.warehouseinventorycheckbilldetail;
import com.yxt.common.core.dto.Dto;
@@ -50,7 +50,7 @@ import java.util.List;
*/
@Data
@ApiModel(value = "库存盘点-明细 数据传输对象", description = "库存盘点-明细 数据传输对象")
public class WmsInventoryCheckbillDetailDto implements Dto {
public class WarehouseInventoryCheckbillDetailDto implements Dto {
private String sid;

12
src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailMapper.java → src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailMapper.java
View File

@@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.warehouse.biz.wmsinventorycheckbilldetail;
package com.yxt.warehouse.biz.warehouseinventorycheckbilldetail;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -50,17 +50,17 @@ import java.util.List;
* @since 1.0
*/
@Mapper
public interface WmsInventoryCheckbillDetailMapper extends BaseMapper<WmsInventoryCheckbillDetail> {
public interface WarehouseInventoryCheckbillDetailMapper extends BaseMapper<WarehouseInventoryCheckbillDetail> {
IPage<WmsInventoryCheckbillDetailVo> selectPageVo(IPage<WmsInventoryCheckbillDetail> page, @Param(Constants.WRAPPER) Wrapper<WmsInventoryCheckbillDetail> qw);
IPage<WarehouseInventoryCheckbillDetailVo> selectPageVo(IPage<WarehouseInventoryCheckbillDetail> page, @Param(Constants.WRAPPER) Wrapper<WarehouseInventoryCheckbillDetail> qw);
List<WmsInventoryCheckbillDetailVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<WmsInventoryCheckbillDetail> qw);
List<WarehouseInventoryCheckbillDetailVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<WarehouseInventoryCheckbillDetail> qw);
@Select("select * from wms_inventory_checkbill_detail")
List<WmsInventoryCheckbillDetailVo> selectListVo();
List<WarehouseInventoryCheckbillDetailVo> selectListVo();
@Delete("delete from wms_inventory_checkbill_detail where billSid = #{dtoSid}")
void delByMainSid(String dtoSid);
List<WmsInventoryCheckbillDetailDetailsVo> selByMainSid(String billSid);
List<WarehouseInventoryCheckbillDetailDetailsVo> selByMainSid(String billSid);
}

28
src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailMapper.xml Normal file
View File

@@ -0,0 +1,28 @@
<?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.yxt.warehouse.biz.warehouseinventorycheckbilldetail.WarehouseInventoryCheckbillDetailMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.warehouse.biz.warehouseinventorycheckbilldetail.WarehouseInventoryCheckbillDetailVo">
SELECT * FROM warehouse_inventory_checkbill_detail <where> ${ew.sqlSegment} </where>
</select>
<select id="selectListAllVo" resultType="com.yxt.warehouse.biz.warehouseinventorycheckbilldetail.WarehouseInventoryCheckbillDetailVo">
SELECT * FROM warehouse_inventory_checkbill_detail <where> ${ew.sqlSegment} </where>
</select>
<select id="selByMainSid"
resultType="com.yxt.warehouse.biz.warehouseinventorycheckbilldetail.WarehouseInventoryCheckbillDetailDetailsVo">
SELECT
wicd.*,
wi.goodsSpuName,
wi.goodsSkuCode,
wi.goodsSkuOwnSpec,
wi.unit
FROM
warehouse_inventory_checkbill_detail wicd
LEFT JOIN warehouse_inventory wi
ON wicd.inventorySid = wi.`sid`
WHERE billSid = #{billSid}
</select>
</mapper>

4
src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailQuery.java → src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailQuery.java
View File

@@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.warehouse.biz.wmsinventorycheckbilldetail;
package com.yxt.warehouse.biz.warehouseinventorycheckbilldetail;
import com.yxt.common.core.query.Query;
@@ -45,6 +45,6 @@ import lombok.Data;
*/
@Data
@ApiModel(value = "库存盘点-明细 查询条件", description = "库存盘点-明细 查询条件")
public class WmsInventoryCheckbillDetailQuery implements Query {
public class WarehouseInventoryCheckbillDetailQuery implements Query {
}

34
src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailService.java → src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailService.java
View File

@@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.warehouse.biz.wmsinventorycheckbilldetail;
package com.yxt.warehouse.biz.warehouseinventorycheckbilldetail;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -51,18 +51,18 @@ import java.util.List;
* @since 1.0
*/
@Service
public class WmsInventoryCheckbillDetailService extends MybatisBaseService<WmsInventoryCheckbillDetailMapper, WmsInventoryCheckbillDetail> {
public class WarehouseInventoryCheckbillDetailService extends MybatisBaseService<WarehouseInventoryCheckbillDetailMapper, WarehouseInventoryCheckbillDetail> {
public PagerVo<WmsInventoryCheckbillDetailVo> listPageVo(PagerQuery<WmsInventoryCheckbillDetailQuery> pq) {
WmsInventoryCheckbillDetailQuery query = pq.getParams();
QueryWrapper<WmsInventoryCheckbillDetail> qw = new QueryWrapper<>();
IPage<WmsInventoryCheckbillDetail> page = PagerUtil.queryToPage(pq);
IPage<WmsInventoryCheckbillDetailVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<WmsInventoryCheckbillDetailVo> p = PagerUtil.pageToVo(pagging, null);
public PagerVo<WarehouseInventoryCheckbillDetailVo> listPageVo(PagerQuery<WarehouseInventoryCheckbillDetailQuery> pq) {
WarehouseInventoryCheckbillDetailQuery query = pq.getParams();
QueryWrapper<WarehouseInventoryCheckbillDetail> qw = new QueryWrapper<>();
IPage<WarehouseInventoryCheckbillDetail> page = PagerUtil.queryToPage(pq);
IPage<WarehouseInventoryCheckbillDetailVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<WarehouseInventoryCheckbillDetailVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(WmsInventoryCheckbillDetailDto dto){
public void saveOrUpdateDto(WarehouseInventoryCheckbillDetailDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
@@ -71,25 +71,25 @@ public class WmsInventoryCheckbillDetailService extends MybatisBaseService<WmsIn
this.updateByDto(dto);
}
public void insertByDto(WmsInventoryCheckbillDetailDto dto){
WmsInventoryCheckbillDetail entity = new WmsInventoryCheckbillDetail();
public void insertByDto(WarehouseInventoryCheckbillDetailDto dto){
WarehouseInventoryCheckbillDetail entity = new WarehouseInventoryCheckbillDetail();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(WmsInventoryCheckbillDetailDto dto){
public void updateByDto(WarehouseInventoryCheckbillDetailDto dto){
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
WmsInventoryCheckbillDetail entity = fetchBySid(dtoSid);
WarehouseInventoryCheckbillDetail entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public WmsInventoryCheckbillDetailDetailsVo fetchDetailsVoBySid(String sid){
WmsInventoryCheckbillDetail entity = fetchBySid(sid);
WmsInventoryCheckbillDetailDetailsVo vo = new WmsInventoryCheckbillDetailDetailsVo();
public WarehouseInventoryCheckbillDetailDetailsVo fetchDetailsVoBySid(String sid){
WarehouseInventoryCheckbillDetail entity = fetchBySid(sid);
WarehouseInventoryCheckbillDetailDetailsVo vo = new WarehouseInventoryCheckbillDetailDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
@@ -98,7 +98,7 @@ public class WmsInventoryCheckbillDetailService extends MybatisBaseService<WmsIn
baseMapper.delByMainSid(dtoSid);
}
public List<WmsInventoryCheckbillDetailDetailsVo> selByMainSid(String billSid) {
public List<WarehouseInventoryCheckbillDetailDetailsVo> selByMainSid(String billSid) {
return baseMapper.selByMainSid(billSid);
}
}

4
src/main/java/com/yxt/warehouse/biz/wmsinventorycheckbilldetail/WmsInventoryCheckbillDetailVo.java → src/main/java/com/yxt/warehouse/biz/warehouseinventorycheckbilldetail/WarehouseInventoryCheckbillDetailVo.java
View File

@@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.warehouse.biz.wmsinventorycheckbilldetail;
package com.yxt.warehouse.biz.warehouseinventorycheckbilldetail;
import com.yxt.common.core.vo.Vo;
@@ -45,6 +45,6 @@ import lombok.Data;
*/
@Data
@ApiModel(value = "库存盘点-明细 视图数据对象", description = "库存盘点-明细 视图数据对象")
public class WmsInventoryCheckbillDetailVo implements Vo {
public class WarehouseInventoryCheckbillDetailVo implements Vo {
}

4
src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebill/WmsInventorySettleRecordQuery.java → src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebill/WarehouseInventorySettleRecordQuery.java
View File

@@ -1,4 +1,4 @@
package com.yxt.warehouse.biz.wmsinventorysettlebill;
package com.yxt.warehouse.biz.warehouseinventorysettlebill;
import com.yxt.common.core.query.Query;
import lombok.Data;
@@ -9,7 +9,7 @@ import lombok.Data;
* @date 2024/4/1 16:20
*/
@Data
public class WmsInventorySettleRecordQuery implements Query {
public class WarehouseInventorySettleRecordQuery implements Query {
private String startDate;
private String endDate;

4
src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebill/WmsInventorySettleRecordVo.java → src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebill/WarehouseInventorySettleRecordVo.java
View File

@@ -1,4 +1,4 @@
package com.yxt.warehouse.biz.wmsinventorysettlebill;
package com.yxt.warehouse.biz.warehouseinventorysettlebill;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
@@ -12,7 +12,7 @@ import java.util.Date;
* @date 2024/4/1 16:19
*/
@Data
public class WmsInventorySettleRecordVo implements Vo {
public class WarehouseInventorySettleRecordVo implements Vo {
private String sid;
private String createByName;

4
src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebill/WmsInventorySettlebill.java → src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebill/WarehouseInventorySettlebill.java
View File

@@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.warehouse.biz.wmsinventorysettlebill;
package com.yxt.warehouse.biz.warehouseinventorysettlebill;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -50,7 +50,7 @@ import java.util.Date;
@Data
@ApiModel(value = "库存结算单", description = "库存结算单")
@TableName("wms_inventory_settlebill")
public class WmsInventorySettlebill extends BaseEntity {
public class WarehouseInventorySettlebill extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("结算单编号")

4
src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebill/WmsInventorySettlebillDetailsVo.java → src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebill/WarehouseInventorySettlebillDetailsVo.java
View File

@@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.warehouse.biz.wmsinventorysettlebill;
package com.yxt.warehouse.biz.warehouseinventorysettlebill;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -49,7 +49,7 @@ import java.util.Date;
*/
@Data
@ApiModel(value = "库存结算单 视图数据详情", description = "库存结算单 视图数据详情")
public class WmsInventorySettlebillDetailsVo implements Vo {
public class WarehouseInventorySettlebillDetailsVo implements Vo {
private String sid; // sid

4
src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebill/WmsInventorySettlebillDto.java → src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebill/WarehouseInventorySettlebillDto.java
View File

@@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.warehouse.biz.wmsinventorysettlebill;
package com.yxt.warehouse.biz.warehouseinventorysettlebill;
import com.yxt.common.core.dto.Dto;
@@ -46,7 +46,7 @@ import lombok.Data;
*/
@Data
@ApiModel(value = "库存结算单 数据传输对象", description = "库存结算单 数据传输对象")
public class WmsInventorySettlebillDto implements Dto {
public class WarehouseInventorySettlebillDto implements Dto {
private String sid;
@ApiModelProperty("制单日期")

12
src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebill/WmsInventorySettlebillMapper.java → src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebill/WarehouseInventorySettlebillMapper.java
View File

@@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.warehouse.biz.wmsinventorysettlebill;
package com.yxt.warehouse.biz.warehouseinventorysettlebill;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -51,21 +51,21 @@ import java.util.List;
* @since 1.0
*/
@Mapper
public interface WmsInventorySettlebillMapper extends BaseMapper<WmsInventorySettlebill> {
public interface WarehouseInventorySettlebillMapper extends BaseMapper<WarehouseInventorySettlebill> {
//@Update("update wms_inventory_settlebill set name=#{msg} where id=#{id}")
//IPage<WmsInventorySettlebillVo> voPage(IPage<WmsInventorySettlebill> page, @Param(Constants.WRAPPER) QueryWrapper<WmsInventorySettlebill> qw);
IPage<WmsInventorySettlebillVo> selectPageVo(IPage<WmsInventorySettlebill> page, @Param(Constants.WRAPPER) Wrapper<WmsInventorySettlebill> qw);
IPage<WarehouseInventorySettlebillVo> selectPageVo(IPage<WarehouseInventorySettlebill> page, @Param(Constants.WRAPPER) Wrapper<WarehouseInventorySettlebill> qw);
List<WmsInventorySettlebillVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<WmsInventorySettlebill> qw);
List<WarehouseInventorySettlebillVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<WarehouseInventorySettlebill> qw);
@Select("select * from wms_inventory_settlebill")
List<WmsInventorySettlebillVo> selectListVo();
List<WarehouseInventorySettlebillVo> selectListVo();
List<WarehouseInventory> selInventoryForStettleBill(@Param("useOrgSid") String useOrgSid);
String selLastNum(@Param("inventorySid") String inventorySid);
IPage<WmsInventorySettleRecordVo> carryForwardList(IPage<WmsInventorySettlebill> page,@Param(Constants.WRAPPER) QueryWrapper<WmsInventorySettlebill> qw);
IPage<WarehouseInventorySettleRecordVo> carryForwardList(IPage<WarehouseInventorySettlebill> page, @Param(Constants.WRAPPER) QueryWrapper<WarehouseInventorySettlebill> qw);
}

20
src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebill/WmsInventorySettlebillMapper.xml → src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebill/WarehouseInventorySettlebillMapper.xml
View File

@@ -1,19 +1,19 @@
<?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.yxt.warehouse.biz.wmsinventorysettlebill.WmsInventorySettlebillMapper">
<mapper namespace="com.yxt.warehouse.biz.warehouseinventorysettlebill.WarehouseInventorySettlebillMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.warehouse.biz.wmsinventorysettlebill.WmsInventorySettlebillVo">
SELECT * FROM wms_inventory_settlebill
<select id="selectPageVo" resultType="com.yxt.warehouse.biz.warehouseinventorysettlebill.WarehouseInventorySettlebillVo">
SELECT * FROM warehouse_inventory_settlebill
<where>${ew.sqlSegment}</where>
</select>
<select id="selectListAllVo" resultType="com.yxt.warehouse.biz.wmsinventorysettlebill.WmsInventorySettlebillVo">
SELECT * FROM wms_inventory_settlebill
<select id="selectListAllVo" resultType="com.yxt.warehouse.biz.warehouseinventorysettlebill.WarehouseInventorySettlebillVo">
SELECT * FROM warehouse_inventory_settlebill
<where>${ew.sqlSegment}</where>
</select>
<select id="selInventoryForStettleBill" resultType="com.yxt.warehouse.biz.warehouseinventory.WarehouseInventory">
SELECT * FROM wms_inventory
SELECT * FROM warehouse_inventory
<where>
<!-- test：判断表达式（OGNL）
遇见特殊符号应该去写转义字符：&&、''等字符
@@ -27,8 +27,8 @@
SELECT
d.currentBalance
FROM
wms_inventory_settlebill_detail AS d
LEFT JOIN wms_inventory_settlebill AS s ON d.billSid = s.sid
warehouse_inventory_settlebill_detail AS d
LEFT JOIN warehouse_inventory_settlebill AS s ON d.billSid = s.sid
WHERE
d.inventorySid = #{inventorySid}
ORDER BY
@@ -36,8 +36,8 @@
LIMIT 1
</select>
<select id="carryForwardList"
resultType="com.yxt.warehouse.biz.wmsinventorysettlebill.WmsInventorySettleRecordVo">
SELECT * FROM wms_inventory_settlebill
resultType="com.yxt.warehouse.biz.warehouseinventorysettlebill.WarehouseInventorySettleRecordVo">
SELECT * FROM warehouse_inventory_settlebill
<where>${ew.sqlSegment}</where>
</select>
</mapper>

4
src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebill/WmsInventorySettlebillQuery.java → src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebill/WarehouseInventorySettlebillQuery.java
View File

@@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.warehouse.biz.wmsinventorysettlebill;
package com.yxt.warehouse.biz.warehouseinventorysettlebill;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -49,7 +49,7 @@ import java.util.Date;
*/
@Data
@ApiModel(value = "库存结算单 查询条件", description = "库存结算单 查询条件")
public class WmsInventorySettlebillQuery implements Query {
public class WarehouseInventorySettlebillQuery implements Query {
@ApiModelProperty("结算单编号")
private String billNo; // 结算单编号

61
src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebill/WmsInventorySettlebillService.java → src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebill/WarehouseInventorySettlebillService.java
View File

@@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.warehouse.biz.wmsinventorysettlebill;
package com.yxt.warehouse.biz.warehouseinventorysettlebill;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -31,11 +31,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.warehouse.biz.warehouseinventory.WarehouseInventory;
import com.yxt.warehouse.biz.wmsinventorysettlebilldetail.WmsInventorySettlebillDetail;
import com.yxt.warehouse.biz.wmsinventorysettlebilldetail.WmsInventorySettlebillDetailService;
import com.yxt.warehouse.biz.warehouseinventorysettlebilldetail.WarehouseInventorySettlebillDetail;
import com.yxt.warehouse.biz.warehouseinventorysettlebilldetail.WarehouseInventorySettlebillDetailService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -57,28 +56,28 @@ import java.util.List;
* @since 1.0
*/
@Service
public class WmsInventorySettlebillService extends MybatisBaseService<WmsInventorySettlebillMapper, WmsInventorySettlebill> {
public class WarehouseInventorySettlebillService extends MybatisBaseService<WarehouseInventorySettlebillMapper, WarehouseInventorySettlebill> {
@Autowired
private WmsInventorySettlebillDetailService wmsInventorySettlebillDetailService;
private WarehouseInventorySettlebillDetailService wmsInventorySettlebillDetailService;
private QueryWrapper<WmsInventorySettlebill> createQueryWrapper(WmsInventorySettlebillQuery query) {
private QueryWrapper<WarehouseInventorySettlebill> createQueryWrapper(WarehouseInventorySettlebillQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<WmsInventorySettlebill> qw = new QueryWrapper<>();
QueryWrapper<WarehouseInventorySettlebill> qw = new QueryWrapper<>();
return qw;
}
public PagerVo<WmsInventorySettlebillVo> listPageVo(PagerQuery<WmsInventorySettlebillQuery> pq) {
WmsInventorySettlebillQuery query = pq.getParams();
QueryWrapper<WmsInventorySettlebill> qw = createQueryWrapper(query);
IPage<WmsInventorySettlebill> page = PagerUtil.queryToPage(pq);
IPage<WmsInventorySettlebillVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<WmsInventorySettlebillVo> p = PagerUtil.pageToVo(pagging, null);
public PagerVo<WarehouseInventorySettlebillVo> listPageVo(PagerQuery<WarehouseInventorySettlebillQuery> pq) {
WarehouseInventorySettlebillQuery query = pq.getParams();
QueryWrapper<WarehouseInventorySettlebill> qw = createQueryWrapper(query);
IPage<WarehouseInventorySettlebill> page = PagerUtil.queryToPage(pq);
IPage<WarehouseInventorySettlebillVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<WarehouseInventorySettlebillVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public void saveOrUpdateDto(WmsInventorySettlebillDto dto) {
public void saveOrUpdateDto(WarehouseInventorySettlebillDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
this.insertByDto(dto);
@@ -87,38 +86,38 @@ public class WmsInventorySettlebillService extends MybatisBaseService<WmsInvento
this.updateByDto(dto);
}
public void insertByDto(WmsInventorySettlebillDto dto) {
WmsInventorySettlebill entity = new WmsInventorySettlebill();
public void insertByDto(WarehouseInventorySettlebillDto dto) {
WarehouseInventorySettlebill entity = new WarehouseInventorySettlebill();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
}
public void updateByDto(WmsInventorySettlebillDto dto) {
public void updateByDto(WarehouseInventorySettlebillDto dto) {
String dtoSid = dto.getSid();
if (StringUtils.isBlank(dtoSid)) {
return;
}
WmsInventorySettlebill entity = fetchBySid(dtoSid);
WarehouseInventorySettlebill entity = fetchBySid(dtoSid);
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.updateById(entity);
}
public WmsInventorySettlebillDetailsVo fetchDetailsVoBySid(String sid) {
WmsInventorySettlebill entity = fetchBySid(sid);
WmsInventorySettlebillDetailsVo vo = new WmsInventorySettlebillDetailsVo();
public WarehouseInventorySettlebillDetailsVo fetchDetailsVoBySid(String sid) {
WarehouseInventorySettlebill entity = fetchBySid(sid);
WarehouseInventorySettlebillDetailsVo vo = new WarehouseInventorySettlebillDetailsVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public void saveSettlebill(WmsInventorySettlebillDto dto) {
WmsInventorySettlebill entity = new WmsInventorySettlebill();
public void saveSettlebill(WarehouseInventorySettlebillDto dto) {
WarehouseInventorySettlebill entity = new WarehouseInventorySettlebill();
BeanUtil.copyProperties(dto, entity, "id", "sid");
baseMapper.insert(entity);
String mainSid = entity.getSid();
List<WarehouseInventory> wmsInventories = baseMapper.selInventoryForStettleBill(dto.getUseOrgSid());
if (!wmsInventories.isEmpty()) {
for (WarehouseInventory w : wmsInventories) {
WmsInventorySettlebillDetail d = new WmsInventorySettlebillDetail();
WarehouseInventorySettlebillDetail d = new WarehouseInventorySettlebillDetail();
BeanUtil.copyProperties(w, d, "id", "sid");
d.setBillSid(mainSid);
if (StringUtils.isNotBlank(dto.getSettleState())) {
@@ -138,9 +137,9 @@ public class WmsInventorySettlebillService extends MybatisBaseService<WmsInvento
}
}
public PagerVo<WmsInventorySettleRecordVo> carryForwardList(PagerQuery<WmsInventorySettleRecordQuery> pq) {
WmsInventorySettleRecordQuery query = pq.getParams();
QueryWrapper<WmsInventorySettlebill> qw = new QueryWrapper<>();
public PagerVo<WarehouseInventorySettleRecordVo> carryForwardList(PagerQuery<WarehouseInventorySettleRecordQuery> pq) {
WarehouseInventorySettleRecordQuery query = pq.getParams();
QueryWrapper<WarehouseInventorySettlebill> qw = new QueryWrapper<>();
// if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getOrgPath())) {
// String orgPath = query.getOrgPath();
// ResultBean<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(orgPath);
@@ -156,9 +155,9 @@ public class WmsInventorySettlebillService extends MybatisBaseService<WmsInvento
apply(com.yxt.common.base.utils.StringUtils.isNotBlank(query.getEndDate()), "date_format (createTime,'%Y-%m-%d') <= date_format('" + query.getEndDate() + "','%Y-%m-%d')"
);
qw.orderByDesc("createTime");
IPage<WmsInventorySettlebill> page = PagerUtil.queryToPage(pq);
IPage<WmsInventorySettleRecordVo> pagging = baseMapper.carryForwardList(page, qw);
PagerVo<WmsInventorySettleRecordVo> p = PagerUtil.pageToVo(pagging, null);
IPage<WarehouseInventorySettlebill> page = PagerUtil.queryToPage(pq);
IPage<WarehouseInventorySettleRecordVo> pagging = baseMapper.carryForwardList(page, qw);
PagerVo<WarehouseInventorySettleRecordVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
}

4
src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebill/WmsInventorySettlebillVo.java → src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebill/WarehouseInventorySettlebillVo.java
View File

@@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.warehouse.biz.wmsinventorysettlebill;
package com.yxt.warehouse.biz.warehouseinventorysettlebill;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -49,7 +49,7 @@ import java.util.Date;
*/
@Data
@ApiModel(value = "库存结算单 视图数据对象", description = "库存结算单 视图数据对象")
public class WmsInventorySettlebillVo implements Vo {
public class WarehouseInventorySettlebillVo implements Vo {
private String sid; // sid

4
src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebilldetail/WmsInventorySettlebillDetail.java → src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebilldetail/WarehouseInventorySettlebillDetail.java
View File

@@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.warehouse.biz.wmsinventorysettlebilldetail;
package com.yxt.warehouse.biz.warehouseinventorysettlebilldetail;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yxt.common.core.domain.BaseEntity;
@@ -49,7 +49,7 @@ import java.math.BigDecimal;
@Data
@ApiModel(value = "库存结算明细", description = "库存结算明细")
@TableName("wms_inventory_settlebill_detail")
public class WmsInventorySettlebillDetail extends BaseEntity {
public class WarehouseInventorySettlebillDetail extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("结算单sid")

4
src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebilldetail/WmsInventorySettlebillDetailDetailsVo.java → src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebilldetail/WarehouseInventorySettlebillDetailDetailsVo.java
View File

@@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.warehouse.biz.wmsinventorysettlebilldetail;
package com.yxt.warehouse.biz.warehouseinventorysettlebilldetail;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -50,7 +50,7 @@ import java.util.Date;
*/
@Data
@ApiModel(value = "库存结算明细 视图数据详情", description = "库存结算明细 视图数据详情")
public class WmsInventorySettlebillDetailDetailsVo implements Vo {
public class WarehouseInventorySettlebillDetailDetailsVo implements Vo {
private String sid; // sid

4
src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebilldetail/WmsInventorySettlebillDetailDto.java → src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebilldetail/WarehouseInventorySettlebillDetailDto.java
View File

@@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.warehouse.biz.wmsinventorysettlebilldetail;
package com.yxt.warehouse.biz.warehouseinventorysettlebilldetail;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -50,7 +50,7 @@ import java.util.Date;
*/
@Data
@ApiModel(value = "库存结算明细 数据传输对象", description = "库存结算明细 数据传输对象")
public class WmsInventorySettlebillDetailDto implements Dto {
public class WarehouseInventorySettlebillDetailDto implements Dto {
private String sid; // sid

12
src/main/java/com/yxt/warehouse/biz/wmsinventorysettlebilldetail/WmsInventorySettlebillDetailMapper.java → src/main/java/com/yxt/warehouse/biz/warehouseinventorysettlebilldetail/WarehouseInventorySettlebillDetailMapper.java
View File

@@ -23,7 +23,7 @@
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.warehouse.biz.wmsinventorysettlebilldetail;
package com.yxt.warehouse.biz.warehouseinventorysettlebilldetail;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -51,20 +51,20 @@ import java.util.List;
* @since 1.0
*/
@Mapper
public interface WmsInventorySettlebillDetailMapper extends BaseMapper<WmsInventorySettlebillDetail> {
public interface WarehouseInventorySettlebillDetailMapper extends BaseMapper<WarehouseInventorySettlebillDetail> {
//@Update("update wms_inventory_settlebill_detail set name=#{msg} where id=#{id}")
//IPage<WmsInventorySettlebillDetailVo> voPage(IPage<WmsInventorySettlebillDetail> page, @Param(Constants.WRAPPER) QueryWrapper<WmsInventorySettlebillDetail> qw);
IPage<WmsInventorySettlebillDetailVo> selectPageVo(IPage<WmsInventorySettlebillDetail> page, @Param(Constants.WRAPPER) Wrapper<WmsInventorySettlebillDetail> qw);
IPage<WarehouseInventorySettlebillDetailVo> selectPageVo(IPage<WarehouseInventorySettlebillDetail> page, @Param(Constants.WRAPPER) Wrapper<WarehouseInventorySettlebillDetail> qw);
List<WmsInventorySettlebillDetailVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<WmsInventorySettlebillDetail> qw);
List<WarehouseInventorySettlebillDetailVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<WarehouseInventorySettlebillDetail> qw);
@Select("select * from wms_inventory_settlebill_detail")
List<WmsInventorySettlebillDetailVo> selectListVo();
List<WarehouseInventorySettlebillDetailVo> selectListVo();
@Delete("delete from wms_inventory_settlebill_detail where billSid = #{sid}")
void delByMainSid(String sid);
List<WmsInventorySettlebillExportVo> listExcel(@Param(Constants.WRAPPER) QueryWrapper<WmsInventorySettlebillDetail> qw);
List<WarehouseInventorySettlebillExportVo> listExcel(@Param(Constants.WRAPPER) QueryWrapper<WarehouseInventorySettlebillDetail> qw);
}

Some files were not shown because too many files have changed in this diff Show More