新增模型计算任务相关的接口 #11
+1
-1
@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
|
|||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@Api(tags = "结构树查询")
|
@Api(tags = "cost-结构树查询")
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("//bomTree")
|
@RequestMapping("//bomTree")
|
||||||
@Slf4j
|
@Slf4j
|
||||||
|
|||||||
+1
-1
@@ -43,7 +43,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|||||||
* @Date: 2024-06-11
|
* @Date: 2024-06-11
|
||||||
* @Version: V1.0
|
* @Version: V1.0
|
||||||
*/
|
*/
|
||||||
@Api(tags="预算价格")
|
@Api(tags="cost-预算价格")
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("//budgetPrice")
|
@RequestMapping("//budgetPrice")
|
||||||
@Slf4j
|
@Slf4j
|
||||||
|
|||||||
+1
-1
@@ -45,7 +45,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|||||||
* @Date: 2024-06-06
|
* @Date: 2024-06-06
|
||||||
* @Version: V1.0
|
* @Version: V1.0
|
||||||
*/
|
*/
|
||||||
@Api(tags="7525单价")
|
@Api(tags="cost-7525单价")
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("//c7525cost")
|
@RequestMapping("//c7525cost")
|
||||||
@Slf4j
|
@Slf4j
|
||||||
|
|||||||
+1
-1
@@ -45,7 +45,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|||||||
* @Date: 2024-06-11
|
* @Date: 2024-06-11
|
||||||
* @Version: V1.0
|
* @Version: V1.0
|
||||||
*/
|
*/
|
||||||
@Api(tags="成本中心")
|
@Api(tags="cost-成本中心")
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/com.zzsmart.qomo.kn.cost.manage/costCenter")
|
@RequestMapping("/com.zzsmart.qomo.kn.cost.manage/costCenter")
|
||||||
@Slf4j
|
@Slf4j
|
||||||
|
|||||||
+54
-4
@@ -1,20 +1,70 @@
|
|||||||
package com.zzsmart.qomo.kn.cost.manage.controller;
|
package com.zzsmart.qomo.kn.cost.manage.controller;
|
||||||
|
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
|
import com.zzsmart.qomo.kn.cost.manage.entity.CostMaterialBom;
|
||||||
|
import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardVersion;
|
||||||
|
import com.zzsmart.qomo.kn.cost.manage.service.CostMaterialBomService;
|
||||||
|
import io.swagger.annotations.Api;
|
||||||
|
import io.swagger.annotations.ApiOperation;
|
||||||
|
import org.jeecg.common.api.vo.Result;
|
||||||
|
import org.jeecg.common.system.query.QueryGenerator;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
|
|
||||||
|
import org.springframework.web.bind.annotation.RequestParam;
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
|
import javax.servlet.http.HttpServletRequest;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <p>
|
* <p>
|
||||||
* 物料bom 前端控制器
|
* 物料bom 前端控制器
|
||||||
* </p>
|
* </p>
|
||||||
*
|
*
|
||||||
* @author
|
* @author
|
||||||
* @since 2024-06-19
|
* @since 2024-06-21
|
||||||
*/
|
*/
|
||||||
|
@RequestMapping("//cost-material-bom")
|
||||||
|
@Api(tags="cost-标准成本-bom信息")
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/cost-material-bom")
|
|
||||||
public class CostMaterialBomController {
|
public class CostMaterialBomController {
|
||||||
|
@Autowired
|
||||||
|
CostMaterialBomService costMaterialBomService;
|
||||||
|
/**
|
||||||
|
* 分页列表查询
|
||||||
|
*
|
||||||
|
* @param costMaterialBom
|
||||||
|
* @param pageNo
|
||||||
|
* @param pageSize
|
||||||
|
* @param req
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
//@AutoLog(value = "cost_standard_version-分页列表查询")
|
||||||
|
@ApiOperation(value="物料bom分页列表查询", notes="物料bom分页列表查询")
|
||||||
|
@GetMapping(value = "/pageList")
|
||||||
|
public Result<IPage<CostMaterialBom>> queryPageList(CostMaterialBom costMaterialBom,
|
||||||
|
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||||
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||||
|
HttpServletRequest req) {
|
||||||
|
QueryWrapper<CostMaterialBom> queryWrapper = QueryGenerator.initQueryWrapper(costMaterialBom, req.getParameterMap());
|
||||||
|
Page<CostMaterialBom> page = new Page<CostMaterialBom>(pageNo, pageSize);
|
||||||
|
IPage<CostMaterialBom> pageList = costMaterialBomService.page(page, queryWrapper);
|
||||||
|
return Result.OK(pageList);
|
||||||
|
}
|
||||||
|
/**
|
||||||
|
* 列表查询
|
||||||
|
*
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@ApiOperation(value="物料bom列表查询", notes="物料bom列表查询")
|
||||||
|
@GetMapping(value = "/list")
|
||||||
|
public Result< List<CostMaterialBom>> queryList(@RequestParam(name = "materialNumber",required = false) String materialNumber) {
|
||||||
|
List<CostMaterialBom> list = costMaterialBomService.queryListResult(materialNumber);
|
||||||
|
return Result.OK(list);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -44,7 +44,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|||||||
* @Date: 2024-06-13
|
* @Date: 2024-06-13
|
||||||
* @Version: V1.0
|
* @Version: V1.0
|
||||||
*/
|
*/
|
||||||
@Api(tags="标准成本-部件缺失信息")
|
@Api(tags="cost-标准成本-部件缺失信息")
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("//costPartMissingInfo")
|
@RequestMapping("//costPartMissingInfo")
|
||||||
@Slf4j
|
@Slf4j
|
||||||
|
|||||||
+1
-1
@@ -29,7 +29,7 @@ import java.util.Arrays;
|
|||||||
* @Date: 2024-06-13
|
* @Date: 2024-06-13
|
||||||
* @Version: V1.0
|
* @Version: V1.0
|
||||||
*/
|
*/
|
||||||
@Api(tags="标准成本计算")
|
@Api(tags="cost-标准成本计算")
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("//costStandard")
|
@RequestMapping("//costStandard")
|
||||||
@Slf4j
|
@Slf4j
|
||||||
|
|||||||
+1
-1
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRequest;
|
|||||||
* @author cost_purchase_price
|
* @author cost_purchase_price
|
||||||
* @since 2024-06-19
|
* @since 2024-06-19
|
||||||
*/
|
*/
|
||||||
@Api(tags = "标准成本单行查询")
|
@Api(tags = "cost-标准成本单行查询")
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("//costStandardDetail")
|
@RequestMapping("//costStandardDetail")
|
||||||
@Slf4j
|
@Slf4j
|
||||||
|
|||||||
+14
-3
@@ -10,6 +10,7 @@ import java.net.URLDecoder;
|
|||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
|
||||||
|
import com.zzsmart.qomo.kn.cost.manage.entity.CostMaterialBom;
|
||||||
import com.zzsmart.qomo.kn.cost.manage.entity.CostStandard;
|
import com.zzsmart.qomo.kn.cost.manage.entity.CostStandard;
|
||||||
import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardVersion;
|
import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardVersion;
|
||||||
import com.zzsmart.qomo.kn.cost.manage.service.ICostStandardVersionService;
|
import com.zzsmart.qomo.kn.cost.manage.service.ICostStandardVersionService;
|
||||||
@@ -46,7 +47,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|||||||
* @Date: 2024-06-13
|
* @Date: 2024-06-13
|
||||||
* @Version: V1.0
|
* @Version: V1.0
|
||||||
*/
|
*/
|
||||||
@Api(tags="标准成本-版本号")
|
@Api(tags="cost-标准成本-版本号")
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("//costStandardVersion")
|
@RequestMapping("//costStandardVersion")
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@@ -65,7 +66,7 @@ public class CostStandardVersionController extends JeecgController<CostStandardV
|
|||||||
*/
|
*/
|
||||||
//@AutoLog(value = "cost_standard_version-分页列表查询")
|
//@AutoLog(value = "cost_standard_version-分页列表查询")
|
||||||
@ApiOperation(value="cost_standard_version-分页列表查询", notes="cost_standard_version-分页列表查询")
|
@ApiOperation(value="cost_standard_version-分页列表查询", notes="cost_standard_version-分页列表查询")
|
||||||
@GetMapping(value = "/list")
|
@GetMapping(value = "/pageList")
|
||||||
public Result<IPage<CostStandardVersion>> queryPageList(CostStandardVersion costStandardVersion,
|
public Result<IPage<CostStandardVersion>> queryPageList(CostStandardVersion costStandardVersion,
|
||||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
||||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||||
@@ -75,7 +76,17 @@ public class CostStandardVersionController extends JeecgController<CostStandardV
|
|||||||
IPage<CostStandardVersion> pageList = costStandardVersionService.page(page, queryWrapper);
|
IPage<CostStandardVersion> pageList = costStandardVersionService.page(page, queryWrapper);
|
||||||
return Result.OK(pageList);
|
return Result.OK(pageList);
|
||||||
}
|
}
|
||||||
|
/**
|
||||||
|
* 列表查询
|
||||||
|
*
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@ApiOperation(value="版本号列表查询", notes="版本号列表查询")
|
||||||
|
@GetMapping(value = "/list")
|
||||||
|
public Result< List<CostStandardVersion>> queryList(@RequestParam(name = "versionNumber",required = false) String versionNumber) {
|
||||||
|
List<CostStandardVersion> list = costStandardVersionService.queryListResult(versionNumber);
|
||||||
|
return Result.OK(list);
|
||||||
|
}
|
||||||
/**
|
/**
|
||||||
* 添加
|
* 添加
|
||||||
*
|
*
|
||||||
|
|||||||
+1
-1
@@ -27,7 +27,7 @@ import java.util.Arrays;
|
|||||||
* @Date: 2024-06-06
|
* @Date: 2024-06-06
|
||||||
* @Version: V1.0
|
* @Version: V1.0
|
||||||
*/
|
*/
|
||||||
@Api(tags="小时费率")
|
@Api(tags="cost-小时费率")
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("//hourRate")
|
@RequestMapping("//hourRate")
|
||||||
@Slf4j
|
@Slf4j
|
||||||
|
|||||||
+1
-1
@@ -45,7 +45,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|||||||
* @Date: 2024-06-11
|
* @Date: 2024-06-11
|
||||||
* @Version: V1.0
|
* @Version: V1.0
|
||||||
*/
|
*/
|
||||||
@Api(tags="最新采购价")
|
@Api(tags="cost-最新采购价")
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("//latestPurchasePrice")
|
@RequestMapping("//latestPurchasePrice")
|
||||||
@Slf4j
|
@Slf4j
|
||||||
|
|||||||
+1
-1
@@ -46,7 +46,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|||||||
* @Date: 2024-06-11
|
* @Date: 2024-06-11
|
||||||
* @Version: V1.0
|
* @Version: V1.0
|
||||||
*/
|
*/
|
||||||
@Api(tags="生产批量设置")
|
@Api(tags="cost-生产批量设置")
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("//produceBatch")
|
@RequestMapping("//produceBatch")
|
||||||
@Slf4j
|
@Slf4j
|
||||||
|
|||||||
+1
-1
@@ -43,7 +43,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
|
|||||||
* @Date: 2024-06-11
|
* @Date: 2024-06-11
|
||||||
* @Version: V1.0
|
* @Version: V1.0
|
||||||
*/
|
*/
|
||||||
@Api(tags="工厂信息")
|
@Api(tags="cost-工厂信息")
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/com.zzsmart.qomo.kn.cost.manage/sapSubfactory")
|
@RequestMapping("/com.zzsmart.qomo.kn.cost.manage/sapSubfactory")
|
||||||
@Slf4j
|
@Slf4j
|
||||||
|
|||||||
+5
-47
@@ -4,14 +4,9 @@ import com.baomidou.mybatisplus.annotation.IdType;
|
|||||||
import com.baomidou.mybatisplus.annotation.TableField;
|
import com.baomidou.mybatisplus.annotation.TableField;
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
import io.swagger.annotations.ApiModel;
|
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
|
||||||
import lombok.EqualsAndHashCode;
|
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import lombok.Setter;
|
import lombok.Setter;
|
||||||
import lombok.experimental.Accessors;
|
import lombok.experimental.Accessors;
|
||||||
@@ -21,14 +16,13 @@ import lombok.experimental.Accessors;
|
|||||||
* 物料bom
|
* 物料bom
|
||||||
* </p>
|
* </p>
|
||||||
*
|
*
|
||||||
* @author
|
* @author
|
||||||
* @since 2024-06-19
|
* @since 2024-06-21
|
||||||
*/
|
*/
|
||||||
@Getter
|
@Getter
|
||||||
@Setter
|
@Setter
|
||||||
@Accessors(chain = true)
|
@Accessors(chain = true)
|
||||||
@TableName("cost_material_bom")
|
@TableName("cost_material_bom")
|
||||||
@ApiModel(value = "cost_material_bom对象", description = "cost_material_bom")
|
|
||||||
public class CostMaterialBom implements Serializable {
|
public class CostMaterialBom implements Serializable {
|
||||||
|
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
@@ -36,233 +30,198 @@ public class CostMaterialBom implements Serializable {
|
|||||||
/**
|
/**
|
||||||
* id
|
* id
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "id")
|
|
||||||
@TableId(value = "id", type = IdType.AUTO)
|
@TableId(value = "id", type = IdType.AUTO)
|
||||||
private String id;
|
private String id;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 物料编码
|
* 物料编码
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "物料编码")
|
|
||||||
@TableField("material_code")
|
@TableField("material_code")
|
||||||
private String materialCode;
|
private String materialCode;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 物料名称
|
* 物料名称
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "物料名称")
|
|
||||||
@TableField("material_name")
|
@TableField("material_name")
|
||||||
private String materialName;
|
private String materialName;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 父级物料编码
|
* 父级物料编码
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "父级物料编码")
|
|
||||||
@TableField("parent_material_code")
|
@TableField("parent_material_code")
|
||||||
private String parentMaterialCode;
|
private String parentMaterialCode;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 级别
|
* 级别
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "级别")
|
|
||||||
@TableField("level")
|
@TableField("level")
|
||||||
private String level;
|
private String level;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 排序
|
* 排序
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "排序")
|
|
||||||
@TableField("sort")
|
@TableField("sort")
|
||||||
private Integer sort;
|
private Integer sort;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 计量单位
|
* 计量单位
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "计量单位")
|
|
||||||
@TableField("unit")
|
@TableField("unit")
|
||||||
private String unit;
|
private String unit;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 数量
|
* 数量
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "id")
|
@TableField("number")
|
||||||
@TableField("数量")
|
|
||||||
private Integer number;
|
private Integer number;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 人工工时(分钟)
|
* 人工工时(分钟)
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "人工工时(分钟)")
|
|
||||||
@TableField("labor_hours")
|
@TableField("labor_hours")
|
||||||
private BigDecimal laborHours;
|
private BigDecimal laborHours;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 设备工时
|
* 设备工时
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "设备工时")
|
|
||||||
@TableField("device_hours")
|
@TableField("device_hours")
|
||||||
private BigDecimal deviceHours;
|
private BigDecimal deviceHours;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 借用物料编码
|
* 借用物料编码
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "借用物料编码")
|
|
||||||
@TableField("borrow_material_code")
|
@TableField("borrow_material_code")
|
||||||
private String borrowMaterialCode;
|
private String borrowMaterialCode;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 参考物料编码
|
* 参考物料编码
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "参考物料编码")
|
|
||||||
@TableField("refer_material_code")
|
@TableField("refer_material_code")
|
||||||
private String referMaterialCode;
|
private String referMaterialCode;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 采购类型
|
* 采购类型
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@ApiModelProperty(value = "采购类型")
|
|
||||||
@TableField("purchase_type")
|
@TableField("purchase_type")
|
||||||
private String purchaseType;
|
private String purchaseType;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 特殊采购类型
|
* 特殊采购类型
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@ApiModelProperty(value = "特殊采购类型")
|
|
||||||
@TableField("special_purchase_type")
|
@TableField("special_purchase_type")
|
||||||
private String specialPurchaseType;
|
private String specialPurchaseType;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 说明
|
* 说明
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "说明")
|
|
||||||
@TableField("explanation")
|
@TableField("explanation")
|
||||||
private String explanation;
|
private String explanation;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 单位数量
|
* 单位数量
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "单位数量")
|
|
||||||
@TableField("quantity")
|
@TableField("quantity")
|
||||||
private BigDecimal quantity;
|
private BigDecimal quantity;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 重量(g)
|
* 重量(g)
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "重量(g)")
|
|
||||||
@TableField("weight")
|
@TableField("weight")
|
||||||
private String weight;
|
private String weight;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 材料/牌号
|
* 材料/牌号
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "材料/牌号")
|
|
||||||
@TableField("material_and_brand")
|
@TableField("material_and_brand")
|
||||||
private String materialAndBrand;
|
private String materialAndBrand;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 表面处理,材料
|
* 表面处理,材料
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "表面处理,材料")
|
|
||||||
@TableField("surface_material")
|
@TableField("surface_material")
|
||||||
private String surfaceMaterial;
|
private String surfaceMaterial;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 厚度(mm)
|
* 厚度(mm)
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "厚度(mm)")
|
|
||||||
@TableField("surface_thickness")
|
@TableField("surface_thickness")
|
||||||
private String surfaceThickness;
|
private String surfaceThickness;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 表面积(mm²)
|
* 表面积(mm²)
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "表面积(mm²)")
|
|
||||||
@TableField("surface_area")
|
@TableField("surface_area")
|
||||||
private String surfaceArea;
|
private String surfaceArea;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 长(mm)
|
* 长(mm)
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "长(mm)")
|
|
||||||
@TableField("length")
|
@TableField("length")
|
||||||
private String length;
|
private String length;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 宽(mm)
|
* 宽(mm)
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "宽(mm)")
|
|
||||||
@TableField("width")
|
@TableField("width")
|
||||||
private String width;
|
private String width;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 高(mm)
|
* 高(mm)
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "高(mm)")
|
|
||||||
@TableField("height")
|
@TableField("height")
|
||||||
private String height;
|
private String height;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 图示/图档/文档 文件ID
|
* 图示/图档/文档 文件ID
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "图示/图档/文档 文件ID")
|
|
||||||
@TableField("figure_file_id")
|
@TableField("figure_file_id")
|
||||||
private Long figureFileId;
|
private Long figureFileId;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 是否新模具(0否 1是)
|
* 是否新摸具(0否 1是)
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "是否新模具(0否 1是)")
|
|
||||||
@TableField("new_tooling")
|
@TableField("new_tooling")
|
||||||
private Boolean newTooling;
|
private Boolean newTooling;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 成型方式(枚举)
|
* 成型方式(枚举)
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "成型方式(枚举)")
|
|
||||||
@TableField("shaping_method")
|
@TableField("shaping_method")
|
||||||
private String shapingMethod;
|
private String shapingMethod;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 作业内容
|
* 作业内容
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "作业内容")
|
|
||||||
@TableField("work_content")
|
@TableField("work_content")
|
||||||
private String workContent;
|
private String workContent;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 加工地点
|
* 加工地点
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "加工地点")
|
|
||||||
@TableField("process_location")
|
@TableField("process_location")
|
||||||
private String processLocation;
|
private String processLocation;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 成本中心
|
* 成本中心
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "成本中心")
|
|
||||||
@TableField("cost_center")
|
@TableField("cost_center")
|
||||||
private String costCenter;
|
private String costCenter;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 单价(未税)
|
* 单价(未税)
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "单价(未税)")
|
|
||||||
@TableField("unit_price")
|
@TableField("unit_price")
|
||||||
private BigDecimal unitPrice;
|
private BigDecimal unitPrice;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 总价(未税)
|
* 总价(未税)
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "总价(未税)")
|
|
||||||
@TableField("total_price")
|
@TableField("total_price")
|
||||||
private BigDecimal totalPrice;
|
private BigDecimal totalPrice;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 模具费(未税)
|
* 摸具费(未税)
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "模具费(未税)")
|
|
||||||
@TableField("mould_price")
|
@TableField("mould_price")
|
||||||
private BigDecimal mouldPrice;
|
private BigDecimal mouldPrice;
|
||||||
|
|
||||||
@@ -293,7 +252,6 @@ public class CostMaterialBom implements Serializable {
|
|||||||
/**
|
/**
|
||||||
* 备注(特殊技术信息)
|
* 备注(特殊技术信息)
|
||||||
*/
|
*/
|
||||||
@ApiModelProperty(value = "备注(特殊技术信息)")
|
|
||||||
@TableField("remark")
|
@TableField("remark")
|
||||||
private String remark;
|
private String remark;
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
|
|||||||
* </p>
|
* </p>
|
||||||
*
|
*
|
||||||
* @author
|
* @author
|
||||||
* @since 2024-06-19
|
* @since 2024-06-21
|
||||||
*/
|
*/
|
||||||
@Mapper
|
@Mapper
|
||||||
public interface CostMaterialBomMapper extends BaseMapper<CostMaterialBom> {
|
public interface CostMaterialBomMapper extends BaseMapper<CostMaterialBom> {
|
||||||
|
|||||||
+10
-3
@@ -3,14 +3,21 @@ package com.zzsmart.qomo.kn.cost.manage.service;
|
|||||||
import com.zzsmart.qomo.kn.cost.manage.entity.CostMaterialBom;
|
import com.zzsmart.qomo.kn.cost.manage.entity.CostMaterialBom;
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <p>
|
* <p>
|
||||||
* 物料bom 服务类
|
* 物料bom 服务类
|
||||||
* </p>
|
* </p>
|
||||||
*
|
*
|
||||||
* @author
|
* @author
|
||||||
* @since 2024-06-19
|
* @since 2024-06-21
|
||||||
*/
|
*/
|
||||||
public interface CostMaterialBomService extends IService<CostMaterialBom> {
|
public interface CostMaterialBomService extends IService<CostMaterialBom> {
|
||||||
|
/**
|
||||||
|
* 分页查询
|
||||||
|
* @param
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
List<CostMaterialBom> queryListResult(String materialNumber);
|
||||||
}
|
}
|
||||||
|
|||||||
+8
-1
@@ -2,11 +2,13 @@ package com.zzsmart.qomo.kn.cost.manage.service;
|
|||||||
|
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
|
import com.zzsmart.qomo.kn.cost.manage.entity.CostMaterialBom;
|
||||||
import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardVersion;
|
import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardVersion;
|
||||||
import org.jeecg.common.api.vo.Result;
|
import org.jeecg.common.api.vo.Result;
|
||||||
|
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -24,5 +26,10 @@ public interface ICostStandardVersionService extends IService<CostStandardVersio
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
Result<?> importExcel(HttpServletRequest request, HttpServletResponse response, Class<CostStandardVersion> costStandardVersionClass);
|
Result<?> importExcel(HttpServletRequest request, HttpServletResponse response, Class<CostStandardVersion> costStandardVersionClass);
|
||||||
|
/**
|
||||||
|
* 分页查询
|
||||||
|
* @param
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
List<CostStandardVersion> queryListResult(String versionNumber);
|
||||||
}
|
}
|
||||||
|
|||||||
+25
-2
@@ -1,20 +1,43 @@
|
|||||||
package com.zzsmart.qomo.kn.cost.manage.service.impl;
|
package com.zzsmart.qomo.kn.cost.manage.service.impl;
|
||||||
|
|
||||||
|
import cn.hutool.core.util.StrUtil;
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
import com.zzsmart.qomo.kn.cost.manage.entity.CostMaterialBom;
|
import com.zzsmart.qomo.kn.cost.manage.entity.CostMaterialBom;
|
||||||
import com.zzsmart.qomo.kn.cost.manage.mapper.CostMaterialBomMapper;
|
import com.zzsmart.qomo.kn.cost.manage.mapper.CostMaterialBomMapper;
|
||||||
import com.zzsmart.qomo.kn.cost.manage.service.CostMaterialBomService;
|
import com.zzsmart.qomo.kn.cost.manage.service.CostMaterialBomService;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <p>
|
* <p>
|
||||||
* 物料bom 服务实现类
|
* 物料bom 服务实现类
|
||||||
* </p>
|
* </p>
|
||||||
*
|
*
|
||||||
* @author
|
* @author
|
||||||
* @since 2024-06-19
|
* @since 2024-06-21
|
||||||
*/
|
*/
|
||||||
@Service
|
@Service
|
||||||
public class CostMaterialBomServiceImpl extends ServiceImpl<CostMaterialBomMapper, CostMaterialBom> implements CostMaterialBomService {
|
public class CostMaterialBomServiceImpl extends ServiceImpl<CostMaterialBomMapper, CostMaterialBom> implements CostMaterialBomService {
|
||||||
|
@Autowired
|
||||||
|
CostMaterialBomMapper costMaterialBomMapper;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 分页查询
|
||||||
|
*
|
||||||
|
* @param materialNumber
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public List<CostMaterialBom> queryListResult(String materialNumber) {
|
||||||
|
QueryWrapper queryWrapper = new QueryWrapper();
|
||||||
|
if (StrUtil.isNotEmpty(materialNumber)) {
|
||||||
|
// 物料号
|
||||||
|
queryWrapper.like("material_code", materialNumber);
|
||||||
|
}
|
||||||
|
List list = costMaterialBomMapper.selectList(queryWrapper);
|
||||||
|
return list;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+18
-1
@@ -3,6 +3,7 @@ package com.zzsmart.qomo.kn.cost.manage.service.impl;
|
|||||||
|
|
||||||
import cn.hutool.core.collection.CollectionUtil;
|
import cn.hutool.core.collection.CollectionUtil;
|
||||||
import cn.hutool.core.util.StrUtil;
|
import cn.hutool.core.util.StrUtil;
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
import com.zzsmart.qomo.kn.cost.manage.constants.Constants;
|
import com.zzsmart.qomo.kn.cost.manage.constants.Constants;
|
||||||
import com.zzsmart.qomo.kn.cost.manage.entity.CostStandard;
|
import com.zzsmart.qomo.kn.cost.manage.entity.CostStandard;
|
||||||
import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardVersion;
|
import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardVersion;
|
||||||
@@ -48,7 +49,7 @@ import java.util.Map;
|
|||||||
@Service
|
@Service
|
||||||
public class CostStandardVersionServiceImpl extends ServiceImpl<CostStandardVersionMapper, CostStandardVersion> implements ICostStandardVersionService {
|
public class CostStandardVersionServiceImpl extends ServiceImpl<CostStandardVersionMapper, CostStandardVersion> implements ICostStandardVersionService {
|
||||||
@Autowired
|
@Autowired
|
||||||
private CostStandardMapper costStandardMapper;
|
private CostStandardVersionMapper costStandardVersionMapper;
|
||||||
private static final Logger log = LoggerFactory.getLogger(CostStandardVersionServiceImpl.class);
|
private static final Logger log = LoggerFactory.getLogger(CostStandardVersionServiceImpl.class);
|
||||||
|
|
||||||
@Transactional(rollbackFor = Exception.class)
|
@Transactional(rollbackFor = Exception.class)
|
||||||
@@ -209,4 +210,20 @@ public class CostStandardVersionServiceImpl extends ServiceImpl<CostStandardVers
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 分页查询
|
||||||
|
*
|
||||||
|
* @param versionNumber@return
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public List<CostStandardVersion> queryListResult(String versionNumber) {
|
||||||
|
QueryWrapper queryWrapper = new QueryWrapper();
|
||||||
|
if (StrUtil.isNotEmpty(versionNumber)) {
|
||||||
|
// 物料号
|
||||||
|
queryWrapper.like("version_number", versionNumber);
|
||||||
|
}
|
||||||
|
List list = costStandardVersionMapper.selectList(queryWrapper);
|
||||||
|
return list;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+6
-6
@@ -42,7 +42,7 @@ public class ApplicationTests {
|
|||||||
.pathInfo(Collections.singletonMap(OutputFile.mapperXml,System.getProperty("user.dir")+"/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml"));
|
.pathInfo(Collections.singletonMap(OutputFile.mapperXml,System.getProperty("user.dir")+"/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml"));
|
||||||
})
|
})
|
||||||
.strategyConfig(builder -> {
|
.strategyConfig(builder -> {
|
||||||
builder.addInclude("cost_standard_detail")// todo 设置需要生成的表名
|
builder.addInclude("cost_material_bom")// todo 设置需要生成的表名
|
||||||
//.addTablePrefix("sys_")//设置表前缀过滤
|
//.addTablePrefix("sys_")//设置表前缀过滤
|
||||||
.entityBuilder()
|
.entityBuilder()
|
||||||
.enableLombok()
|
.enableLombok()
|
||||||
@@ -66,11 +66,11 @@ public class ApplicationTests {
|
|||||||
.enableRestStyle();
|
.enableRestStyle();
|
||||||
})
|
})
|
||||||
// 使用Freemarker引擎模板,默认的是Velocity引擎模板
|
// 使用Freemarker引擎模板,默认的是Velocity引擎模板
|
||||||
.templateConfig(builder -> {
|
// .templateConfig(builder -> {
|
||||||
builder.disable(TemplateType.CONTROLLER)
|
// builder.disable(TemplateType.CONTROLLER)
|
||||||
.disable(TemplateType.SERVICE)
|
// .disable(TemplateType.SERVICE)
|
||||||
.disable(TemplateType.SERVICEIMPL);
|
// .disable(TemplateType.SERVICEIMPL);
|
||||||
})
|
// })
|
||||||
.templateEngine(new FreemarkerTemplateEngine())
|
.templateEngine(new FreemarkerTemplateEngine())
|
||||||
.execute();
|
.execute();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user