From 68ce50ae515f4772d371cf811b7e286a53720d6a Mon Sep 17 00:00:00 2001 From: fkf <1475794025@qq.com> Date: Thu, 25 May 2023 16:18:13 +0800 Subject: [PATCH 01/11] =?UTF-8?q?5-25=20=E5=95=86=E5=93=81=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cyf/api/producttype/ProductType.java | 24 +++++ .../cyf/api/producttype/ProductTypeDto.java | 27 +++++ .../cyf/api/producttype/ProductTypeQuery.java | 25 +++++ .../cyf/api/producttype/ProductTypeVo.java | 29 +++++ .../biz/producttype/ProductTypeMapper.java | 28 +++++ .../cyf/biz/producttype/ProductTypeMapper.xml | 23 ++++ .../cyf/biz/producttype/ProductTypeRest.java | 58 ++++++++++ .../biz/producttype/ProductTypeService.java | 101 ++++++++++++++++++ 8 files changed, 315 insertions(+) create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/producttype/ProductType.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/producttype/ProductTypeDto.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/producttype/ProductTypeQuery.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/producttype/ProductTypeVo.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/producttype/ProductTypeMapper.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/producttype/ProductTypeMapper.xml create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/producttype/ProductTypeRest.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/producttype/ProductTypeService.java diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/producttype/ProductType.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/producttype/ProductType.java new file mode 100644 index 00000000..d5aeaa87 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/producttype/ProductType.java @@ -0,0 +1,24 @@ +package com.yxt.supervise.cyf.api.producttype; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author feikefei + * @create 2023-05-22-15:48 + */ +@Data +@ApiModel(value = "商品类型信息", description = "商品类型信息") +@TableName("product_type") +public class ProductType extends BaseEntity { + //商品类型名称 + private String name; + //商品类型编号 + private String number; + //上级sid + private String pSid; + //产品sid + private String prodSid; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/producttype/ProductTypeDto.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/producttype/ProductTypeDto.java new file mode 100644 index 00000000..66a3c32c --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/producttype/ProductTypeDto.java @@ -0,0 +1,27 @@ +package com.yxt.supervise.cyf.api.producttype; + +import io.swagger.annotations.ApiModel; +import lombok.Data; + +import java.util.List; + +/** + * @author feikefei + * @create 2023-05-22-15:53 + */ +@Data +@ApiModel(value = "产品类型信息 数据传输对象", description = "产品类型信息 数据传输对象") +public class ProductTypeDto { + private String id; + private String sid; + + //商品类型名称 + private String name; + //商品类型编号 + private String number; + //上级sid + private String pSid; + //产品sid + private String prodSid; + private List typeList; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/producttype/ProductTypeQuery.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/producttype/ProductTypeQuery.java new file mode 100644 index 00000000..ebd267d5 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/producttype/ProductTypeQuery.java @@ -0,0 +1,25 @@ +package com.yxt.supervise.cyf.api.producttype; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author feikefei + * @create 2023-05-23-9:21 + */ +@Data +@ApiModel(value = "商品类型信息 分页传输对象数据", description = "商品类型信息 分页传输对象数据") +public class ProductTypeQuery implements Query { + private String id; + private String sid; + + //商品类型名称 + private String name; + //商品类型编号 + private String number; + //上级sid + private String pSid; + //产品sid + private String prodSid; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/producttype/ProductTypeVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/producttype/ProductTypeVo.java new file mode 100644 index 00000000..7fcb96c7 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/producttype/ProductTypeVo.java @@ -0,0 +1,29 @@ +package com.yxt.supervise.cyf.api.producttype; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author feikefei + * @create 2023-05-23-9:23 + */ +@Data +@ApiModel(value = "商品类型信息 视图返回字段", description = "商品类型信息 视图返回字段") +public class ProductTypeVo implements Vo { + private String id; + private String sid; + //商品类型名称 + private String name; + //商品类型编号 + private String number; + //上级sid + private String pSid; + //产品sid + private String prodSid; + + //品牌名称 + private String informationName; + //品牌编号 + private String informationNumber; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/producttype/ProductTypeMapper.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/producttype/ProductTypeMapper.java new file mode 100644 index 00000000..5796d1d6 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/producttype/ProductTypeMapper.java @@ -0,0 +1,28 @@ +package com.yxt.supervise.cyf.biz.producttype; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.supervise.cyf.api.producttype.ProductType; +import com.yxt.supervise.cyf.api.producttype.ProductTypeVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @author feikefei + * @create 2023-05-23-9:04 + */ +@Mapper +public interface ProductTypeMapper extends BaseMapper { + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectProductType(@Param("sid") String sid); + + Integer selectProductTypeByName(@Param("name") String name); + + Integer selectProductTypeByNumber(@Param("number") String number); +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/producttype/ProductTypeMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/producttype/ProductTypeMapper.xml new file mode 100644 index 00000000..f74f57c9 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/producttype/ProductTypeMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/producttype/ProductTypeRest.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/producttype/ProductTypeRest.java new file mode 100644 index 00000000..f236197f --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/producttype/ProductTypeRest.java @@ -0,0 +1,58 @@ +package com.yxt.supervise.cyf.biz.producttype; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.cyf.api.producttype.ProductTypeDto; +import com.yxt.supervise.cyf.api.producttype.ProductTypeQuery; +import com.yxt.supervise.cyf.api.producttype.ProductTypeVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +/** + * @author feikefei + * @create 2023-05-23-9:03 + */ +@Api(tags = "商品类型信息") +@RestController +@RequestMapping("cyf/productType") +public class ProductTypeRest { + + @Autowired + private ProductTypeService productTypeService; + + @ApiOperation("增加") + @PostMapping("/save") + public ResultBean save(@RequestBody ProductTypeDto dto){ + return productTypeService.save(dto); + } + + @ApiOperation("删除") + @DeleteMapping("/delete/{sid}") + public ResultBean del(@PathVariable String sid){ + return productTypeService.del(sid); + } + + @ApiOperation("修改") + @PostMapping("/update") + public ResultBean update(@RequestBody ProductTypeDto dto){ + return productTypeService.update(dto); + } + + @ApiOperation("商品类型信息分页查询") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo vo = productTypeService.listPage(pq); + return rb.success().setData(vo); + } + + @ApiOperation("查询当前商品类别") + @GetMapping("/selectProductType/{sid}") + public ResultBean selectProductType(@PathVariable String sid){ + return productTypeService.selectProductType(sid); + } +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/producttype/ProductTypeService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/producttype/ProductTypeService.java new file mode 100644 index 00000000..5f86b2d9 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/producttype/ProductTypeService.java @@ -0,0 +1,101 @@ +package com.yxt.supervise.cyf.biz.producttype; + +import cn.hutool.core.bean.BeanUtil; +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.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.cyf.api.producttype.ProductType; +import com.yxt.supervise.cyf.api.producttype.ProductTypeDto; +import com.yxt.supervise.cyf.api.producttype.ProductTypeQuery; +import com.yxt.supervise.cyf.api.producttype.ProductTypeVo; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author feikefei + * @create 2023-05-23-9:04 + */ +@Service +public class ProductTypeService extends MybatisBaseService { + + public ResultBean save(ProductTypeDto dto){ + ResultBean rb = ResultBean.fireFail(); + //拿到该品牌商品下的类别 + List typeList = dto.getTypeList(); + if (dto.getSid() != null){ + for (ProductTypeDto productTypeDto : typeList){ + Integer integer = baseMapper.selectProductTypeByName(productTypeDto.getName()); + if (integer != 0) { + return rb.success().setMsg("该品牌商品已有此类型名称"); + } + Integer integer1 = baseMapper.selectProductTypeByNumber(productTypeDto.getNumber()); + if (integer1 != 0){ + return rb.success().setMsg("该编码已有品牌商品类型占用"); + } + ProductType type1 = new ProductType(); + BeanUtil.copyProperties(productTypeDto,type1,"id","sid"); + type1.setPSid(dto.getSid()); + baseMapper.insert(type1); + } + return rb.success().setMsg("添加成功"); + }else { + Integer integer = baseMapper.selectProductTypeByName(dto.getName()); + if (integer != 0) { + return rb.success().setMsg("该品牌已有该商品"); + } + Integer integer1 = baseMapper.selectProductTypeByNumber(dto.getNumber()); + if (integer1 != 0){ + return rb.success().setMsg("该编码已有品牌商品占用"); + } + ProductType type = new ProductType(); + BeanUtil.copyProperties(dto,type,"id","sid","typeList"); + baseMapper.insert(type); + for (ProductTypeDto productTypeDto : typeList) { + ProductType type1 = new ProductType(); + BeanUtil.copyProperties(productTypeDto,type1,"id","sid"); + type1.setPSid(type.getSid()); + baseMapper.insert(type1); + } + return rb.success().setMsg("添加成功"); + } + } + + public ResultBean del(String sid){ + ResultBean rb = ResultBean.fireFail(); + baseMapper.delete(new QueryWrapper().eq("sid",sid)); + return rb.success().setMsg("删除成功"); + } + + public ResultBean update(ProductTypeDto dto){ + ResultBean rb = ResultBean.fireFail(); + ProductType productType = fetchBySid(dto.getSid()); + BeanUtil.copyProperties(dto,productType,"id","sid"); + baseMapper.updateById(productType); + return rb.success().setMsg("修改成功"); + } + + public PagerVo listPage(PagerQuery pq){ + ProductTypeQuery params = pq.getParams(); + QueryWrapper wq = new QueryWrapper<>(); + if (params != null){ + if (!params.getName().equals("")){ + wq.eq("p.name",params.getName()); + } + } + IPage page = PagerUtil.queryToPage(pq); + IPage pageVo = baseMapper.selectPageVo(page, wq); + PagerVo vo = PagerUtil.pageToVo(pageVo, null); + return vo; + } + + public ResultBean selectProductType(String sid){ + ResultBean rb = ResultBean.fireFail(); + List productTypes = baseMapper.selectProductType(sid); + return rb.success().setData(productTypes); + } +} From 1c41fac5b42cd9584eefa7ddcfb67ec5f519eab7 Mon Sep 17 00:00:00 2001 From: fengdong777 <1478994744@qq.com> Date: Thu, 25 May 2023 18:01:54 +0800 Subject: [PATCH 02/11] 5.25 --- .../src/api/baseInfo/commodityBrand/index.js | 24 + .../yxt-supervise-cyf-ui/src/router/index.js | 2 +- .../views/baseInfo/commodityBrand/index.vue | 6 +- .../baseInfo/commodityFily/commodity.vue | 419 ++++++++++-------- .../views/baseInfo/commodityFily/index.vue | 239 +++++++++- 5 files changed, 495 insertions(+), 195 deletions(-) diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/baseInfo/commodityBrand/index.js b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/baseInfo/commodityBrand/index.js index 67b9369b..508ded26 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/baseInfo/commodityBrand/index.js +++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/baseInfo/commodityBrand/index.js @@ -69,6 +69,30 @@ export default { } }) }, + // 添加类别 + saveList: function(params) { + return request({ + url: '/cyf/productType/save ', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json', + 'token': tokens + } + }) + }, + // 修改商品名称 + updateShop: function(params) { + return request({ + url: '/cyf/productType/update ', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json', + 'token': tokens + } + }) + }, } diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/router/index.js b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/router/index.js index b3067087..c198922a 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/router/index.js +++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/router/index.js @@ -137,7 +137,7 @@ export const constantRoutes = [{ import('@/views/baseInfo/commodityFily/index.vue'), name: 'index', meta: { - title: '商品档案' + title: '商品类别' } }, ] diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityBrand/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityBrand/index.vue index c3617fa1..04fb9a3d 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityBrand/index.vue +++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityBrand/index.vue @@ -7,7 +7,7 @@ {{ searchxianshitit }}
- + @@ -38,8 +38,8 @@ - - + +
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/commodity.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/commodity.vue index 89efcb68..1d1f7ad9 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/commodity.vue +++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/commodity.vue @@ -1,200 +1,257 @@ - - - - \ No newline at end of file + + } + diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/index.vue index 8baf8682..ead0c43c 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/index.vue +++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/baseInfo/commodityFily/index.vue @@ -36,12 +36,30 @@ > 查看 + + 添加 + - + + + +
@@ -53,22 +71,127 @@
- - - + + + + + + + + + + + + + + + + + + + + + + + + +
品牌名称 + +
商品名称 + +
类别名称 + +
类别编码 + +
+
+ 保存 +
+ + + + + + + + + + + + + + + + + + + +
品牌名称 + +
品牌编码 + +
商品名称 + +
名称编号 + +
+
+ 修改 +
+ - + + + + + + + + + + +
类别名称 + +
类别编码 + +
+
+ 修改 +
+ @@ -94,6 +217,9 @@ listLoading: false, btndisabled: false, editDialog: false, + categorys: false, + entry: false, + modify: false, form: { name:'', number:'', @@ -127,7 +253,28 @@ total: 0 }, viewState: 1, - datalist:[] + datalist:[], + forms: { + prodSid:'', + typeList:[] + }, + shopName:'', + shopsName:'', + shopNum:'', + arry: { + name:'', + number:'' + }, + modifythe:{ + sid:'', + name:'', + number:'' + }, + modifyArray:{ + sid:'', + name:'', + number:'' + } } }, mounted() { @@ -212,6 +359,78 @@ this.datalist=res.data }) }, + addshop(row) { + this.entry = true; + this.shopName=row.informationName + this.shopsName=row.name + this.forms.sid=row.sid + }, + modifyThe(row) { + this.modify = true; + this.modifythe.sid=row.sid + this.shopName=row.informationName + this.shopNum=row.informationNumber + this.modifythe.name=row.name + this.modifythe.number=row.number + }, + category(row) { + this.categorys = true; + this.editDialog = false; + this.modifyArray.sid=row.sid + this.modifyArray = Object.assign({}, row); + }, + modifyCategory(){ + req.updateShop(this.modifyArray).then((res)=>{ + if (res.success) { + this.$message({ + showClose: true, + type: 'success', + message: res.msg + }) + this.categorys = false; + this.getList() + } else { + // 根据resp.code进行异常情况处理 + } + }) + .catch(() => {}) + }, + modifyList(){ + req.updateShop(this.modifythe).then((res)=>{ + if (res.success) { + this.$message({ + showClose: true, + type: 'success', + message: res.msg + }) + this.modify = false; + this.getList() + } else { + // 根据resp.code进行异常情况处理 + } + }) + .catch(() => {}) + }, + addShop(){ + this.forms.typeList.push(this.arry) + + req.saveList(this.forms) + .then(resp => { + if (resp.success) { + this.$message({ + showClose: true, + type: 'success', + message: resp.msg + }) + this.entry = false; + } else { + // 根据resp.code进行异常情况处理 + } + }) + .catch(() => {}) + + this.arry={name:'',number:''} + }, save() { req.update(this.form) .then(resp => { From 4fc0b0e21f4e4e0d33dbf6b57185d1dc971a2fee Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Thu, 25 May 2023 18:02:12 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PackagingInventoryRecord.java | 6 +++--- .../PackagingInventoryRecordDto.java | 2 +- .../PackagingInventoryRecordMapper.xml | 2 +- .../PackagingInventoryRecordService.java | 11 +++++++++++ .../packagingoutbound/PackagingOutboundService.java | 2 +- .../biz/packagingstorage/PackagingStorageService.java | 2 +- 6 files changed, 18 insertions(+), 7 deletions(-) diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventoryrecord/PackagingInventoryRecord.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventoryrecord/PackagingInventoryRecord.java index dda78887..2c6f3256 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventoryrecord/PackagingInventoryRecord.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventoryrecord/PackagingInventoryRecord.java @@ -11,14 +11,14 @@ import lombok.Data; */ @Data @ApiModel(value = "包装物盘库记录信息", description = "包装物盘库记录信息") -@TableName("material_inventory_record") +@TableName("packaging_inventory_record") public class PackagingInventoryRecord extends BaseEntity { //盘库日期 private String inventoryDate; //盘库库存 private double inventory; - //包装物类型 - private String typeSid; + //包装物库存sid + private String inventorySid; //价值 private double value; } diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventoryrecord/PackagingInventoryRecordDto.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventoryrecord/PackagingInventoryRecordDto.java index d89f70d8..6f71e6a3 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventoryrecord/PackagingInventoryRecordDto.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/packaginginventoryrecord/PackagingInventoryRecordDto.java @@ -19,7 +19,7 @@ public class PackagingInventoryRecordDto implements Dto { //盘库库存 private double inventory; //包装物类型 - private String typeSid; + private String inventorySid; //价值 private double value; } diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventoryrecord/PackagingInventoryRecordMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventoryrecord/PackagingInventoryRecordMapper.xml index 36d61b59..04177564 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventoryrecord/PackagingInventoryRecordMapper.xml +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/packaginginventoryrecord/PackagingInventoryRecordMapper.xml @@ -5,7 +5,7 @@ - SELECT - * - FROM - product_information + select i.*,r.inventoryQuantity,p.amount + from product_information i + left join finis_prod_inven_record r on i.sid = r.prodSid + left join finish_product_inventory p on i.sid = p.prodSid ${ew.sqlSegment} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/productinformation/ProductInformationService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/productinformation/ProductInformationService.java index be383193..a427e68e 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/productinformation/ProductInformationService.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/productinformation/ProductInformationService.java @@ -58,7 +58,7 @@ public class ProductInformationService extends MybatisBaseService qw = new QueryWrapper<>(); if (params.getName() != null && !params.getName().equals("")){ - qw.eq("name",params.getName()); + qw.eq("i.name",params.getName()); } IPage page = PagerUtil.queryToPage(pq); IPage vo = baseMapper.selectPageVo(page, qw); diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/producttype/ProductTypeMapper.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/producttype/ProductTypeMapper.java index 5796d1d6..52e64e47 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/producttype/ProductTypeMapper.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/producttype/ProductTypeMapper.java @@ -22,7 +22,7 @@ public interface ProductTypeMapper extends BaseMapper { List selectProductType(@Param("sid") String sid); - Integer selectProductTypeByName(@Param("name") String name); + Integer selectProductTypeByName(@Param("name") String name,@Param("prodSid") String prodSid); - Integer selectProductTypeByNumber(@Param("number") String number); + Integer selectProductTypeByNumber(@Param("number") String number,@Param("prodSid") String prodSid); } diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/producttype/ProductTypeMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/producttype/ProductTypeMapper.xml index f74f57c9..de48d203 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/producttype/ProductTypeMapper.xml +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/producttype/ProductTypeMapper.xml @@ -14,10 +14,10 @@ \ No newline at end of file diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/producttype/ProductTypeService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/producttype/ProductTypeService.java index 5f86b2d9..e20f7ae2 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/producttype/ProductTypeService.java +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/producttype/ProductTypeService.java @@ -29,13 +29,13 @@ public class ProductTypeService extends MybatisBaseService typeList = dto.getTypeList(); if (dto.getSid() != null){ for (ProductTypeDto productTypeDto : typeList){ - Integer integer = baseMapper.selectProductTypeByName(productTypeDto.getName()); + Integer integer = baseMapper.selectProductTypeByName(productTypeDto.getName(),dto.getProdSid()); if (integer != 0) { - return rb.success().setMsg("该品牌商品已有此类型名称"); + return rb.setMsg("该品牌商品已有此类型名称"); } - Integer integer1 = baseMapper.selectProductTypeByNumber(productTypeDto.getNumber()); + Integer integer1 = baseMapper.selectProductTypeByNumber(productTypeDto.getNumber(),dto.getProdSid()); if (integer1 != 0){ - return rb.success().setMsg("该编码已有品牌商品类型占用"); + return rb.setMsg("该编码已有品牌商品类型占用"); } ProductType type1 = new ProductType(); BeanUtil.copyProperties(productTypeDto,type1,"id","sid"); @@ -44,13 +44,13 @@ public class ProductTypeService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pageVo = baseMapper.selectPageVo(page, wq); PagerVo vo = PagerUtil.pageToVo(pageVo, null); From 77a40cdd948ee27060ec5705a433014acd904388 Mon Sep 17 00:00:00 2001 From: fkf <1475794025@qq.com> Date: Fri, 26 May 2023 16:13:17 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E6=88=90=E5=93=81=E6=B2=B9=20=E5=BA=93?= =?UTF-8?q?=E5=AD=985-26?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinishProductInventory.java | 24 +++++++ .../FinishProductInventoryDto.java | 25 ++++++++ .../FinishProductInventoryQuery.java | 26 ++++++++ .../FinishProductInventoryVo.java | 29 +++++++++ .../FinishProductInventoryMapper.java | 26 ++++++++ .../FinishProductInventoryMapper.xml | 16 +++++ .../FinishProductInventoryRest.java | 51 +++++++++++++++ .../FinishProductInventoryService.java | 63 +++++++++++++++++++ 8 files changed, 260 insertions(+) create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/finishproductinventory/FinishProductInventory.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/finishproductinventory/FinishProductInventoryDto.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/finishproductinventory/FinishProductInventoryQuery.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/finishproductinventory/FinishProductInventoryVo.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/finishproductinventory/FinishProductInventoryMapper.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/finishproductinventory/FinishProductInventoryMapper.xml create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/finishproductinventory/FinishProductInventoryRest.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/finishproductinventory/FinishProductInventoryService.java diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/finishproductinventory/FinishProductInventory.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/finishproductinventory/FinishProductInventory.java new file mode 100644 index 00000000..23abe57b --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/finishproductinventory/FinishProductInventory.java @@ -0,0 +1,24 @@ +package com.yxt.supervise.cyf.api.finishproductinventory; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author feikefei + * @create 2023-05-22-16:07 + */ +@Data +@ApiModel(value = "成品油 库存信息", description = "成品油 库存信息") +@TableName("finish_product_inventory") +public class FinishProductInventory extends BaseEntity { + //数量 + private Double amount; + //产品sid + private String prodSid; + //编号 + private String number; + //单价 + private Double price; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/finishproductinventory/FinishProductInventoryDto.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/finishproductinventory/FinishProductInventoryDto.java new file mode 100644 index 00000000..0e28890b --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/finishproductinventory/FinishProductInventoryDto.java @@ -0,0 +1,25 @@ +package com.yxt.supervise.cyf.api.finishproductinventory; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author feikefei + * @create 2023-05-22-16:12 + */ +@Data +@ApiModel(value = "成品油 库存信息 传输对象数据", description = "成品油 库存信息 传输对象数据") +public class FinishProductInventoryDto implements Dto{ + private String id; + private String sid; + + //数量 + private Double amount; + //产品sid + private String prodSid; + //编号 + private String number; + //单价 + private Double price; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/finishproductinventory/FinishProductInventoryQuery.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/finishproductinventory/FinishProductInventoryQuery.java new file mode 100644 index 00000000..5f04ab58 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/finishproductinventory/FinishProductInventoryQuery.java @@ -0,0 +1,26 @@ +package com.yxt.supervise.cyf.api.finishproductinventory; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author feikefei + * @create 2023-05-23-9:36 + */ +@Data +@ApiModel(value = "成品油 库存信息 分页传输对象", description = "成品油 库存信息 分页传输对象") +public class FinishProductInventoryQuery implements Query { + private String id; + private String sid; + //数量 + private Double amount; + //产品sid + private String prodSid; + //编号 + private String number; + //单价 + private Double price; + + private String InformationNumber; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/finishproductinventory/FinishProductInventoryVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/finishproductinventory/FinishProductInventoryVo.java new file mode 100644 index 00000000..7c1cc406 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/finishproductinventory/FinishProductInventoryVo.java @@ -0,0 +1,29 @@ +package com.yxt.supervise.cyf.api.finishproductinventory; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author feikefei + * @create 2023-05-23-9:36 + */ +@Data +@ApiModel(value = "成品油 库存信息 返回视图对象字段", description = "成品油 库存信息 返回视图对象字段") +public class FinishProductInventoryVo implements Vo { + private String id; + private String sid; + //数量 + private Double amount; + //产品sid + private String prodSid; + //编号 + private String number; + //单价 + private Double price; + + //品牌名称 + private String name; + //品牌编号 + private String InformationNumber; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/finishproductinventory/FinishProductInventoryMapper.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/finishproductinventory/FinishProductInventoryMapper.java new file mode 100644 index 00000000..836eeabd --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/finishproductinventory/FinishProductInventoryMapper.java @@ -0,0 +1,26 @@ +package com.yxt.supervise.cyf.biz.finishproductinventory; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.supervise.cyf.api.finishproductinventory.FinishProductInventory; +import com.yxt.supervise.cyf.api.finishproductinventory.FinishProductInventoryVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +/** + * @author feikefei + * @create 2023-05-23-10:45 + */ +@Mapper +public interface FinishProductInventoryMapper extends BaseMapper { + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + FinishProductInventory selectPriceByProdSid(@Param("prodSid") String prodSid); + + @Select("select count(*) from finish_product_inventory where prodSid = #{prodSid)") + Integer selectByProdSid(@Param("prodSid") String prodSid); +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/finishproductinventory/FinishProductInventoryMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/finishproductinventory/FinishProductInventoryMapper.xml new file mode 100644 index 00000000..e411aa3c --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/finishproductinventory/FinishProductInventoryMapper.xml @@ -0,0 +1,16 @@ + + + + + + + \ No newline at end of file diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/finishproductinventory/FinishProductInventoryRest.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/finishproductinventory/FinishProductInventoryRest.java new file mode 100644 index 00000000..69549f84 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/finishproductinventory/FinishProductInventoryRest.java @@ -0,0 +1,51 @@ +package com.yxt.supervise.cyf.biz.finishproductinventory; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.cyf.api.finishproductinventory.FinishProductInventoryDto; +import com.yxt.supervise.cyf.api.finishproductinventory.FinishProductInventoryQuery; +import com.yxt.supervise.cyf.api.finishproductinventory.FinishProductInventoryVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @author feikefei + * @create 2023-05-23-10:42 + */ +@Api(tags = "成品油 库存信息") +@RestController +@RequestMapping("cyf/inventory") +public class FinishProductInventoryRest { + + @Autowired + private FinishProductInventoryService finishProductInventoryService; + + @ApiOperation("增加") + @PostMapping("/save") + public ResultBean save(@RequestBody FinishProductInventoryDto dto){ + return finishProductInventoryService.save(dto); + } + + @ApiOperation("删除") + @GetMapping("/delete/{sid}") + public ResultBean delete(@PathVariable String sid){ + return finishProductInventoryService.delete(sid); + } + + @ApiOperation("修改") + @PostMapping("/update") + public ResultBean update(@RequestBody FinishProductInventoryDto dto){ + return finishProductInventoryService.update(dto); + } + + @ApiOperation("成品库记录 分页查询") + @PostMapping("/listPage") + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo listPage = finishProductInventoryService.listPage(pq); + return rb.success().setData(listPage); + } +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/finishproductinventory/FinishProductInventoryService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/finishproductinventory/FinishProductInventoryService.java new file mode 100644 index 00000000..af231a1b --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/finishproductinventory/FinishProductInventoryService.java @@ -0,0 +1,63 @@ +package com.yxt.supervise.cyf.biz.finishproductinventory; + +import cn.hutool.core.bean.BeanUtil; +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.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.cyf.api.finishproductinventory.FinishProductInventory; +import com.yxt.supervise.cyf.api.finishproductinventory.FinishProductInventoryDto; +import com.yxt.supervise.cyf.api.finishproductinventory.FinishProductInventoryQuery; +import com.yxt.supervise.cyf.api.finishproductinventory.FinishProductInventoryVo; +import org.springframework.stereotype.Service; + +/** + * @author feikefei + * @create 2023-05-23-10:45 + */ +@Service +public class FinishProductInventoryService extends MybatisBaseService { + + public ResultBean save(FinishProductInventoryDto dto){ + ResultBean rb = ResultBean.fireFail(); + Integer integer = baseMapper.selectByProdSid(dto.getProdSid()); + if (integer != 0){ + return rb.success().setMsg("该品牌已存在库存"); + } + FinishProductInventory record = new FinishProductInventory(); + BeanUtil.copyProperties(dto,record,"id","sid"); + baseMapper.insert(record); + return rb.success().setMsg("添加成功"); + } + + public ResultBean delete(String sid){ + ResultBean rb = ResultBean.fireFail(); + baseMapper.delete(new QueryWrapper().eq("sid",sid)); + return rb.success().setMsg("删除成功"); + } + + public ResultBean update(FinishProductInventoryDto dto){ + ResultBean rb = ResultBean.fireFail(); + FinishProductInventory finishProductInventory = fetchBySid(dto.getSid()); + BeanUtil.copyProperties(dto,finishProductInventory,"id","sid"); + baseMapper.updateById(finishProductInventory); + return rb.success().setMsg("修改成功"); + } + + public PagerVo listPage(PagerQuery pq){ + FinishProductInventoryQuery params = pq.getParams(); + QueryWrapper wq = new QueryWrapper<>(); + if (params != null){ + if (!params.getInformationNumber().equals("")){ + wq.eq("i.number",params.getInformationNumber()); + } + } + IPage page = PagerUtil.queryToPage(pq); + IPage pageVo = baseMapper.selectPageVo(page, wq); + PagerVo pageToVo = PagerUtil.pageToVo(pageVo, null); + return pageToVo; + } +} From ba5f0de6c9749490c6140ce16d57639cb4108f3f Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Fri, 26 May 2023 16:17:09 +0800 Subject: [PATCH 07/11] 2023-5-26 --- .../yxt-supervise-cyf-ui/.env.development | 6 +- .../packagInAndOutBound.js | 94 ++ .../src/layout/components/Sidebar/index.vue | 910 +++++++++--------- .../yxt-supervise-cyf-ui/src/router/index.js | 68 +- .../src/views/inventory/oilTankInfo/index.vue | 4 +- .../inventory/packagInBoundList/index.vue | 389 ++++++++ .../inventory/packagInventoryList/index.vue | 384 ++++++++ .../inventory/packagOutBoundList/index.vue | 382 ++++++++ .../views/supervise/oilTypeInBound/index.vue | 4 +- .../views/supervise/oilTypeOutBound/index.vue | 4 +- .../views/supervise/packagInBound/index.vue | 322 +++++++ .../views/supervise/packagInventory/index.vue | 282 ++++++ .../views/supervise/packagOutBound/index.vue | 275 ++++++ 13 files changed, 2680 insertions(+), 444 deletions(-) create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/packagInAndOutBound/packagInAndOutBound.js create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/packagInBoundList/index.vue create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/packagInventoryList/index.vue create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/packagOutBoundList/index.vue create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/packagInBound/index.vue create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/packagInventory/index.vue create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/supervise/packagOutBound/index.vue diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/.env.development b/yxt-supervise-cyf/yxt-supervise-cyf-ui/.env.development index cde457b7..b3b405d6 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/.env.development +++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/.env.development @@ -5,9 +5,9 @@ ENV = 'development' VUE_APP_BASE_API = '/api' ## 配置测试和本地开发时的 接口地址 -# VUE_APP_URL = "http://5wchzg.natappfree.cc" -VUE_APP_URL = "http://192.168.1.177:7101" + VUE_APP_URL = "http://cg9jzr.natappfree.cc" +## VUE_APP_URL = "http://192.168.1.177:7101" -# VUE_APP_URL = "http://192.168.1.193:7101" +## VUE_APP_URL = "http://192.168.1.193:7101" ##VUE_APP_URL = "http://8.130.39.13:8112" diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/packagInAndOutBound/packagInAndOutBound.js b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/packagInAndOutBound/packagInAndOutBound.js new file mode 100644 index 00000000..b6d719d1 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/api/packagInAndOutBound/packagInAndOutBound.js @@ -0,0 +1,94 @@ +import request from '@/utils/request' +let tokens = window.sessionStorage.getItem('tokenValue') +export default { + + // 获取包装物类型 + typeList: function(params) { + return request({ + url: '/cyf/packtype/typeList', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json', + 'token': tokens + } + }) + }, + + // 获取包装物信息 by 类型sid + PackagList: function(sid) { + return request({ + url: '/cyf/packinventory/getInventory/' + sid + }) + }, + + + + // 入库 + logPagerList: function(params) { + return request({ + url: '/cyf/packstorage/listPage', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json', + 'token': tokens + } + }) + }, + + intAddInfo: function(data) { + return request({ + url: '/cyf/packstorage/save', + method: 'post', + data: data + }); + }, + + + // 出库 + // 查询分页列表 + in112PagerList: function(params) { + return request({ + url: '/cyf/packoutbound/listPage', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json', + 'token': tokens + } + }) + }, + + outAddInfo: function(data) { + return request({ + url: '/cyf/packoutbound/save', + method: 'post', + data: data + }); + }, + + + // 盘库 + inventoryPagerList: function(params) { + return request({ + url: '/cyf/packrecord/listPage', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json', + 'token': tokens + } + }) + }, + + inventoryAddInfo: function(data) { + return request({ + url: '/cyf/packrecord/save', + method: 'post', + data: data + }); + }, + + +} \ No newline at end of file diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/layout/components/Sidebar/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/layout/components/Sidebar/index.vue index d5ee36b3..ef880c95 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/layout/components/Sidebar/index.vue +++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/layout/components/Sidebar/index.vue @@ -2,470 +2,520 @@
- - + +
diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/router/index.js b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/router/index.js index c198922a..9875b5d4 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/router/index.js +++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/router/index.js @@ -68,7 +68,7 @@ export const constantRoutes = [{ meta: { title: '原料信息' } - },{ + }, { path: '/baseInfo/packagType', component: () => import('@/views/baseInfo/packagType/index.vue'), @@ -175,6 +175,33 @@ export const constantRoutes = [{ title: '原油出库登记' } }, + { + path: '/supervise/packagInBound', + component: () => + import('@/views/supervise/packagInBound/index.vue'), + name: 'index', + meta: { + title: '包装物入库登记' + } + }, + { + path: '/supervise/packagOutBound', + component: () => + import('@/views/supervise/packagOutBound/index.vue'), + name: 'index', + meta: { + title: '包装物出库登记' + } + }, + { + path: '/supervise/packagInventory', + component: () => + import('@/views/supervise/packagInventory/index.vue'), + name: 'index', + meta: { + title: '包装物盘库登记' + } + }, { path: '/supervise/EnterRegister', component: () => @@ -203,14 +230,22 @@ export const constantRoutes = [{ }, children: [ { + path: '/inventory/oilTankInfo', + component: () => + import('@/views/inventory/oilTankInfo/index.vue'), + name: 'index', + meta: { + title: '油罐库存信息' + } + },{ path: '/inventory/oilTankList', component: () => import('@/views/inventory/oilTankList/index.vue'), name: 'index', meta: { - title: '油罐库存记录' + title: '油罐登记库存记录' } - },{ + }, { path: '/inventory/oilTypeInBoundList', component: () => import('@/views/inventory/oilTypeInBoundList/index.vue'), @@ -228,13 +263,32 @@ export const constantRoutes = [{ title: '原油出库记录' } }, + { - path: '/inventory/oilTankInfo', + path: '/supervise/packagInBound', component: () => - import('@/views/inventory/oilTankInfo/index.vue'), + import('@/views/supervise/packagInBound/index.vue'), + name: 'index', + meta: { + title: '包装物入库登记' + } + }, + { + path: '/supervise/packagOutBound', + component: () => + import('@/views/supervise/packagOutBound/index.vue'), + name: 'index', + meta: { + title: '包装物出库登记' + } + }, + { + path: '/supervise/packagInventory', + component: () => + import('@/views/supervise/packagInventory/index.vue'), name: 'index', meta: { - title: '库存信息' + title: '包装物盘库登记' } }, { @@ -387,4 +441,4 @@ export function resetRouter() { router.matcher = newRouter.matcher // reset router } -export default router +export default router \ No newline at end of file diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilTankInfo/index.vue b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilTankInfo/index.vue index 8328640a..2b8e91e2 100644 --- a/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilTankInfo/index.vue +++ b/yxt-supervise-cyf/yxt-supervise-cyf-ui/src/views/inventory/oilTankInfo/index.vue @@ -1,10 +1,10 @@