diff --git a/hw-auth/src/main/java/com/hw/auth/controller/TokenController.java b/hw-auth/src/main/java/com/hw/auth/controller/TokenController.java index b884363b..008fcb28 100644 --- a/hw-auth/src/main/java/com/hw/auth/controller/TokenController.java +++ b/hw-auth/src/main/java/com/hw/auth/controller/TokenController.java @@ -19,7 +19,7 @@ import com.hw.system.api.model.LoginUser; /** * token 控制 - * + * * @author ruoyi */ @RestController @@ -75,4 +75,14 @@ public class TokenController sysLoginService.register(registerBody.getUsername(), registerBody.getPassword()); return R.ok(); } + + + @PostMapping("pdaLogin") + public R pdaLogin(@RequestBody LoginBody form) + { + // 用户登录 + LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword()); + // 获取登录token + return R.ok(tokenService.createToken(userInfo)); + } } diff --git a/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/MesConstants.java b/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/MesConstants.java new file mode 100644 index 00000000..356ab1a4 --- /dev/null +++ b/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/MesConstants.java @@ -0,0 +1,18 @@ +package com.hw.common.core.constant; + +/** + * @Description:生产部分常量定义 + * @ProjectName:HwMes + * @Author:xins + * @Date:2024-01-26 11:02 + * @Version:1.0 + */ +public class MesConstants { + + /*条码类型*/ + public static final String MES_BARCODE_TYPE_RAW = "1";//原材料 + public static final String MES_BARCODE_TYPE_SEMI = "2";//半成品 + public static final String MES_BARCODE_TYPE_PRODUCT = "3";//成品 + public static final String MES_BARCODE_TYPE_BACKPLATE = "4";//背板 + +} diff --git a/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/QmsConstants.java b/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/QmsConstants.java new file mode 100644 index 00000000..99334d32 --- /dev/null +++ b/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/QmsConstants.java @@ -0,0 +1,21 @@ +package com.hw.common.core.constant; + +/** + * @Description:生产部分常量定义 + * @ProjectName:HwMes + * @Author:xins + * @Date:2024-01-26 11:02 + * @Version:1.0 + */ +public class QmsConstants { + + /*检验规则明细目标类型*/ + public static final String QMS_CHECK_RULE_DETAIL_TARGET_TYPE_MATERIAL = "1";//物料 + + + /*检验项目项目属性*/ + public static final String QMS_CHECK_PROJECT_PROPERTY_QUALITATIVE = "1";//定性 + + /*检验方式*/ + public static final String QMS_CHECK_MODE = "1";//全检 +} diff --git a/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/WmsConstants.java b/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/WmsConstants.java index d0e374f3..933ccd86 100644 --- a/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/WmsConstants.java +++ b/hw-common/hw-common-core/src/main/java/com/hw/common/core/constant/WmsConstants.java @@ -16,7 +16,6 @@ public class WmsConstants { public static final String WMS_WAREHOUSE_ACTIVE_FLAG_YES = "1"; - /*操作类型,适合原材料和成品的出入库、原材料的退库以及转库*/ public static final String WMS_OPERATION_TYPE_AUTO = "0";//agv自动 public static final String WMS_OPERATION_TYPE_MANUAL = "1";//人工 @@ -30,7 +29,6 @@ public class WmsConstants { public static final String RAW_INSTOCK_INSTOCK_TYPE_OTHER = "9";//其他入库 - /*原材料入库记录明细入库方式*/ public static final String RWA_INSTOCK_DETAIL_INSTOCK_WAY_MOBILE = "1";//人工入库 public static final String RWA_INSTOCK_DETAIL_INSTOCK_WAY_AGV = "2";//AGV入库 @@ -51,8 +49,6 @@ public class WmsConstants { public static final String RAW_OUTSTOCK_AUDIT_STATUS_FAIL = "2";//审核不通过 - - /*出入库退库记录明细方式*/ public static final String WMS_STOCK_WAY_MANUAL = "1";//人工 public static final String WMS_STOCK_WAY_AGV = "2";//AGV @@ -75,7 +71,6 @@ public class WmsConstants { public static final String RAW_RETURN_RETURN_WAY_AGV = "2";//AGV - /*出入库退库记录(明细)执行状态*/ public static final String WMS_EXECUTE_STATUS_TOEXECUTE = "0";//待执行 public static final String WMS_EXECUTE_STATUS_EXECUTING = "1";//执行中 @@ -84,7 +79,6 @@ public class WmsConstants { public static final String WMS_EXECUTE_STATUS_NOT_FINISH = "notFinish";//未完成执行 - /*成品入库记录明细入库方式*/ public static final String PRODUCT_INSTOCK_DETAIL_INSTOCK_WAY_MANUAL = "1";//人工入库 public static final String PRODUCT_INSTOCK_DETAIL_INSTOCK_WAY_AGV = "2";//AGV入库 @@ -95,14 +89,12 @@ public class WmsConstants { public static final String PRODUCT_INSTOCK_STOCK_TYPE_PRODUCT = "3";//成品 - /*成品入库记录入库类型*/ public static final String PRODUCT_INSTOCK_INSTOCK_TYPE_PRODUCT = "1";//生产入库 public static final String PRODUCT_INSTOCK_INSTOCK_TYPE_OUT_SEMI = "2";//出半成品库 public static final String PRODUCT_INSTOCK_INSTOCK_TYPE_OTHER = "9";//其他入库 - /*成品库存库存类型*/ public static final String PRODUCT_STOCK_STOCK_TYPE_SEMI = "2";//半成品 public static final String PRODUCT_STOCK_STOCK_TYPE_PRODUCT = "3";//成品 @@ -113,7 +105,6 @@ public class WmsConstants { public static final String PRODUCT_INSTOCK_INSTOCK_WAY_AGV = "2";//AGV - /*仓库存放类型*/ public static final String WMS_WAREHOUSE_INSTOCK_TYPE_RAW = "1";//原材料 public static final String WMS_WAREHOUSE_INSTOCK_TYPE_SEMI = "2";//半成品 @@ -129,6 +120,7 @@ public class WmsConstants { public static final String WMS_WAREHOUSE_TYPE_WORKBIN_AGV = "3";//料箱AGV仓库 public static final Map OPERATION_TYPE_MAP = new HashMap(); + static { OPERATION_TYPE_MAP.put(WMS_WAREHOUSE_TYPE_NORMAL, WMS_OPERATION_TYPE_MANUAL); OPERATION_TYPE_MAP.put(WMS_WAREHOUSE_TYPE_AGV, WMS_OPERATION_TYPE_AUTO); @@ -136,16 +128,17 @@ public class WmsConstants { } public static final Map OUTSTOCK_WAY_MAP = new HashMap(); + static { - OPERATION_TYPE_MAP.put(WMS_WAREHOUSE_TYPE_NORMAL, WMS_STOCK_WAY_MANUAL); - OPERATION_TYPE_MAP.put(WMS_WAREHOUSE_TYPE_AGV, WMS_STOCK_WAY_AGV); - OPERATION_TYPE_MAP.put(WMS_WAREHOUSE_TYPE_WORKBIN_AGV, WMS_STOCK_WAY_MANUAL); + OUTSTOCK_WAY_MAP.put(WMS_WAREHOUSE_TYPE_NORMAL, WMS_STOCK_WAY_MANUAL); + OUTSTOCK_WAY_MAP.put(WMS_WAREHOUSE_TYPE_AGV, WMS_STOCK_WAY_AGV); + OUTSTOCK_WAY_MAP.put(WMS_WAREHOUSE_TYPE_WORKBIN_AGV, WMS_STOCK_WAY_MANUAL); } /** * 库位状态 - * */ + */ public static final String WMS_BASE_LOCATION_STATUS_NORMAL = "1";//正常 public static final String WMS_BASE_LOCATION_STATUS_AUTO_LOCK = "2";//自动锁定 public static final String WMS_BASE_LOCATION_STATUS_MANUAL_LOCK = "3";//人工锁定 @@ -154,13 +147,13 @@ public class WmsConstants { /** * 入库过度库位标识 - * */ + */ public static final String WMS_BASE_LOCATION_INSTOCK_FLAG_YES = "1";//是 public static final String WMS_BASE_LOCATION_INSTOCK_FLAG_NO = "0";//否 /** * 出库过度库位标识 - * */ + */ public static final String WMS_BASE_LOCATION_OUTSTOCK_FLAG_YES = "1";//是 public static final String WMS_BASE_LOCATION_OUTSTOCK_FLAG_NO = "0";//否 @@ -183,8 +176,6 @@ public class WmsConstants { public static final String WMS_WAREHOUSE_MATERIAL_STORAGE_TYPE_MATERIAL = "1"; - - /*转库类型*/ public static final String WMS_TRANSFER_TYPE_OUT_TO_PRODUCT_STOCK = "1";//出半成品库入成品库 @@ -194,11 +185,16 @@ public class WmsConstants { public static final String WMS_TRANSFER_DETAIL_TYPE_INSTOCK = "2";//入库 - /*成品出库记录成品类型*/ public static final String WMS_PRODUCT_OUTSTOCK_PRODUCT_TYPE_SEMI = "2";//半成品 public static final String WMS_PRODUCT_OUTSTOCK_PRODUCT_TYPE_PRODUCT = "3";//成品 /*成品出库记录出库类型*/ public static final String WMS_PRODUCT_OUTSTOCK_TYPE_SALE = "1";//销售出库 + + + /*检验规则明细目标类型*/ + public static final String QMS_CHECK_RULE_DETAIL_TARGET_TYPE_MARTERIAL = "1";//物料 + + } diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesApiController.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesApiController.java new file mode 100644 index 00000000..8d7d8559 --- /dev/null +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesApiController.java @@ -0,0 +1,38 @@ +package com.hw.mes.controller; + +import com.hw.common.core.web.controller.BaseController; +import com.hw.common.core.web.domain.AjaxResult; +import com.hw.common.security.annotation.RequiresPermissions; +import com.hw.mes.domain.MesMaterialBom; +import com.hw.mes.service.IMesMaterialBomService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 物料BOM信息Controller + * + * @author Yinq + * @date 2024-01-30 + */ +@RestController +@RequestMapping("/api") +public class MesApiController extends BaseController +{ + @Autowired + private IMesMaterialBomService mesMaterialBomService; + + /** + * 查询物料BOM信息列表 + */ +// @RequiresPermissions("mes:materialBom:list") + @GetMapping("/getMaterialBoms") + public AjaxResult getMaterialBoms(MesMaterialBom mesMaterialBom) + { + List list = mesMaterialBomService.selectMesMaterialBomJoinList(mesMaterialBom); + return success(list); + } + + +} diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesMaterialBom.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesMaterialBom.java index 177555a3..d55e29e1 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesMaterialBom.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/domain/MesMaterialBom.java @@ -63,6 +63,12 @@ public class MesMaterialBom extends TreeEntity { @Excel(name = "激活标识") private String activeFlag; + /** + * 物料编号 + */ + @Excel(name = "物料编号") + private String materialCode; + public void setMaterialBomId(Long materialBomId) { this.materialBomId = materialBomId; } @@ -127,6 +133,14 @@ public class MesMaterialBom extends TreeEntity { return activeFlag; } + public String getMaterialCode() { + return materialCode; + } + + public void setMaterialCode(String materialCode) { + this.materialCode = materialCode; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesMaterialBomMapper.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesMaterialBomMapper.java index 77fcfc9e..fdfe1bac 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesMaterialBomMapper.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/mapper/MesMaterialBomMapper.java @@ -5,15 +5,15 @@ import com.hw.mes.domain.MesMaterialBom; /** * 物料BOM信息Mapper接口 - * + * * @author Yinq * @date 2024-01-30 */ -public interface MesMaterialBomMapper +public interface MesMaterialBomMapper { /** * 查询物料BOM信息 - * + * * @param materialBomId 物料BOM信息主键 * @return 物料BOM信息 */ @@ -21,7 +21,7 @@ public interface MesMaterialBomMapper /** * 查询物料BOM信息列表 - * + * * @param mesMaterialBom 物料BOM信息 * @return 物料BOM信息集合 */ @@ -29,7 +29,7 @@ public interface MesMaterialBomMapper /** * 新增物料BOM信息 - * + * * @param mesMaterialBom 物料BOM信息 * @return 结果 */ @@ -37,7 +37,7 @@ public interface MesMaterialBomMapper /** * 修改物料BOM信息 - * + * * @param mesMaterialBom 物料BOM信息 * @return 结果 */ @@ -45,7 +45,7 @@ public interface MesMaterialBomMapper /** * 删除物料BOM信息 - * + * * @param materialBomId 物料BOM信息主键 * @return 结果 */ @@ -53,9 +53,19 @@ public interface MesMaterialBomMapper /** * 批量删除物料BOM信息 - * + * * @param materialBomIds 需要删除的数据主键集合 * @return 结果 */ public int deleteMesMaterialBomByMaterialBomIds(Long[] materialBomIds); + + + + /** + * 查询物料BOM信息列表,Join material + * + * @param mesMaterialBom 物料BOM信息 + * @return 物料BOM信息集合 + */ + public List selectMesMaterialBomJoinList(MesMaterialBom mesMaterialBom); } diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesMaterialBomService.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesMaterialBomService.java index 28280146..787f6403 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesMaterialBomService.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesMaterialBomService.java @@ -5,15 +5,15 @@ import com.hw.mes.domain.MesMaterialBom; /** * 物料BOM信息Service接口 - * + * * @author Yinq * @date 2024-01-30 */ -public interface IMesMaterialBomService +public interface IMesMaterialBomService { /** * 查询物料BOM信息 - * + * * @param materialBomId 物料BOM信息主键 * @return 物料BOM信息 */ @@ -21,7 +21,7 @@ public interface IMesMaterialBomService /** * 查询物料BOM信息列表 - * + * * @param mesMaterialBom 物料BOM信息 * @return 物料BOM信息集合 */ @@ -29,7 +29,7 @@ public interface IMesMaterialBomService /** * 新增物料BOM信息 - * + * * @param mesMaterialBom 物料BOM信息 * @return 结果 */ @@ -37,7 +37,7 @@ public interface IMesMaterialBomService /** * 修改物料BOM信息 - * + * * @param mesMaterialBom 物料BOM信息 * @return 结果 */ @@ -45,7 +45,7 @@ public interface IMesMaterialBomService /** * 批量删除物料BOM信息 - * + * * @param materialBomIds 需要删除的物料BOM信息主键集合 * @return 结果 */ @@ -53,9 +53,18 @@ public interface IMesMaterialBomService /** * 删除物料BOM信息信息 - * + * * @param materialBomId 物料BOM信息主键 * @return 结果 */ public int deleteMesMaterialBomByMaterialBomId(Long materialBomId); + + + /** + * 查询物料BOM信息列表,Join material + * + * @param mesMaterialBom 物料BOM信息 + * @return 物料BOM信息 + */ + public List selectMesMaterialBomJoinList(MesMaterialBom mesMaterialBom); } diff --git a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesMaterialBomServiceImpl.java b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesMaterialBomServiceImpl.java index a2a81721..b4f0f95e 100644 --- a/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesMaterialBomServiceImpl.java +++ b/hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesMaterialBomServiceImpl.java @@ -10,19 +10,19 @@ import com.hw.mes.service.IMesMaterialBomService; /** * 物料BOM信息Service业务层处理 - * + * * @author Yinq * @date 2024-01-30 */ @Service -public class MesMaterialBomServiceImpl implements IMesMaterialBomService +public class MesMaterialBomServiceImpl implements IMesMaterialBomService { @Autowired private MesMaterialBomMapper mesMaterialBomMapper; /** * 查询物料BOM信息 - * + * * @param materialBomId 物料BOM信息主键 * @return 物料BOM信息 */ @@ -34,7 +34,7 @@ public class MesMaterialBomServiceImpl implements IMesMaterialBomService /** * 查询物料BOM信息列表 - * + * * @param mesMaterialBom 物料BOM信息 * @return 物料BOM信息 */ @@ -46,7 +46,7 @@ public class MesMaterialBomServiceImpl implements IMesMaterialBomService /** * 新增物料BOM信息 - * + * * @param mesMaterialBom 物料BOM信息 * @return 结果 */ @@ -59,7 +59,7 @@ public class MesMaterialBomServiceImpl implements IMesMaterialBomService /** * 修改物料BOM信息 - * + * * @param mesMaterialBom 物料BOM信息 * @return 结果 */ @@ -72,7 +72,7 @@ public class MesMaterialBomServiceImpl implements IMesMaterialBomService /** * 批量删除物料BOM信息 - * + * * @param materialBomIds 需要删除的物料BOM信息主键 * @return 结果 */ @@ -84,7 +84,7 @@ public class MesMaterialBomServiceImpl implements IMesMaterialBomService /** * 删除物料BOM信息信息 - * + * * @param materialBomId 物料BOM信息主键 * @return 结果 */ @@ -93,4 +93,20 @@ public class MesMaterialBomServiceImpl implements IMesMaterialBomService { return mesMaterialBomMapper.deleteMesMaterialBomByMaterialBomId(materialBomId); } + + + + + /** + * 查询物料BOM信息列表,Join material + * + * @param mesMaterialBom 物料BOM信息 + * @return 物料BOM信息 + */ + @Override + public List selectMesMaterialBomJoinList(MesMaterialBom mesMaterialBom) + { + return mesMaterialBomMapper.selectMesMaterialBomJoinList(mesMaterialBom); + } + } diff --git a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesMaterialBomMapper.xml b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesMaterialBomMapper.xml index 022a77b1..1a601f59 100644 --- a/hw-modules/hw-mes/src/main/resources/mapper/mes/MesMaterialBomMapper.xml +++ b/hw-modules/hw-mes/src/main/resources/mapper/mes/MesMaterialBomMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -20,6 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -28,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + insert into mes_material_bom @@ -108,9 +109,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from mes_material_bom where material_bom_id in + delete from mes_material_bom where material_bom_id in #{materialBomId} - \ No newline at end of file + + + + + + + + + diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/controller/QmsCheckProjectController.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/controller/QmsCheckProjectController.java new file mode 100644 index 00000000..6a1768c8 --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/controller/QmsCheckProjectController.java @@ -0,0 +1,105 @@ +package com.hw.qms.controller; + +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.hw.common.log.annotation.Log; +import com.hw.common.log.enums.BusinessType; +import com.hw.common.security.annotation.RequiresPermissions; +import com.hw.qms.domain.QmsCheckProject; +import com.hw.qms.service.IQmsCheckProjectService; +import com.hw.common.core.web.controller.BaseController; +import com.hw.common.core.web.domain.AjaxResult; +import com.hw.common.core.utils.poi.ExcelUtil; +import com.hw.common.core.web.page.TableDataInfo; + +/** + * 检验项目Controller + * + * @author xins + * @date 2024-01-23 + */ +@RestController +@RequestMapping("/checkproject") +public class QmsCheckProjectController extends BaseController +{ + @Autowired + private IQmsCheckProjectService qmsCheckProjectService; + + /** + * 查询检验项目列表 + */ + @RequiresPermissions("qms:checkproject:list") + @GetMapping("/list") + public TableDataInfo list(QmsCheckProject qmsCheckProject) + { + startPage(); + List list = qmsCheckProjectService.selectQmsCheckProjectList(qmsCheckProject); + return getDataTable(list); + } + + /** + * 导出检验项目列表 + */ + @RequiresPermissions("qms:checkproject:export") + @Log(title = "检验项目", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, QmsCheckProject qmsCheckProject) + { + List list = qmsCheckProjectService.selectQmsCheckProjectList(qmsCheckProject); + ExcelUtil util = new ExcelUtil(QmsCheckProject.class); + util.exportExcel(response, list, "检验项目数据"); + } + + /** + * 获取检验项目详细信息 + */ + @RequiresPermissions("qms:checkproject:query") + @GetMapping(value = "/{checkProjectId}") + public AjaxResult getInfo(@PathVariable("checkProjectId") Long checkProjectId) + { + return success(qmsCheckProjectService.selectQmsCheckProjectByCheckProjectId(checkProjectId)); + } + + /** + * 新增检验项目 + */ + @RequiresPermissions("qms:checkproject:add") + @Log(title = "检验项目", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody QmsCheckProject qmsCheckProject) + { + return toAjax(qmsCheckProjectService.insertQmsCheckProject(qmsCheckProject)); + } + + /** + * 修改检验项目 + */ + @RequiresPermissions("qms:checkproject:edit") + @Log(title = "检验项目", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody QmsCheckProject qmsCheckProject) + { + return toAjax(qmsCheckProjectService.updateQmsCheckProject(qmsCheckProject)); + } + + /** + * 删除检验项目 + */ + @RequiresPermissions("qms:checkproject:remove") + @Log(title = "检验项目", businessType = BusinessType.DELETE) + @DeleteMapping("/{checkProjectIds}") + public AjaxResult remove(@PathVariable Long[] checkProjectIds) + { + return toAjax(qmsCheckProjectService.deleteQmsCheckProjectByCheckProjectIds(checkProjectIds)); + } +} diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/controller/QmsCheckResultController.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/controller/QmsCheckResultController.java new file mode 100644 index 00000000..b563f409 --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/controller/QmsCheckResultController.java @@ -0,0 +1,105 @@ +package com.hw.qms.controller; + +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.hw.common.log.annotation.Log; +import com.hw.common.log.enums.BusinessType; +import com.hw.common.security.annotation.RequiresPermissions; +import com.hw.qms.domain.QmsCheckResult; +import com.hw.qms.service.IQmsCheckResultService; +import com.hw.common.core.web.controller.BaseController; +import com.hw.common.core.web.domain.AjaxResult; +import com.hw.common.core.utils.poi.ExcelUtil; +import com.hw.common.core.web.page.TableDataInfo; + +/** + * 质检结果Controller + * + * @author xins + * @date 2024-01-23 + */ +@RestController +@RequestMapping("/checkresult") +public class QmsCheckResultController extends BaseController +{ + @Autowired + private IQmsCheckResultService qmsCheckResultService; + + /** + * 查询质检结果列表 + */ + @RequiresPermissions("qms:checkresult:list") + @GetMapping("/list") + public TableDataInfo list(QmsCheckResult qmsCheckResult) + { + startPage(); + List list = qmsCheckResultService.selectQmsCheckResultList(qmsCheckResult); + return getDataTable(list); + } + + /** + * 导出质检结果列表 + */ + @RequiresPermissions("qms:checkresult:export") + @Log(title = "质检结果", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, QmsCheckResult qmsCheckResult) + { + List list = qmsCheckResultService.selectQmsCheckResultList(qmsCheckResult); + ExcelUtil util = new ExcelUtil(QmsCheckResult.class); + util.exportExcel(response, list, "质检结果数据"); + } + + /** + * 获取质检结果详细信息 + */ + @RequiresPermissions("qms:checkresult:query") + @GetMapping(value = "/{checkResultId}") + public AjaxResult getInfo(@PathVariable("checkResultId") Long checkResultId) + { + return success(qmsCheckResultService.selectQmsCheckResultByCheckResultId(checkResultId)); + } + + /** + * 新增质检结果 + */ + @RequiresPermissions("qms:checkresult:add") + @Log(title = "质检结果", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody QmsCheckResult qmsCheckResult) + { + return toAjax(qmsCheckResultService.insertQmsCheckResult(qmsCheckResult)); + } + + /** + * 修改质检结果 + */ + @RequiresPermissions("qms:checkresult:edit") + @Log(title = "质检结果", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody QmsCheckResult qmsCheckResult) + { + return toAjax(qmsCheckResultService.updateQmsCheckResult(qmsCheckResult)); + } + + /** + * 删除质检结果 + */ + @RequiresPermissions("qms:checkresult:remove") + @Log(title = "质检结果", businessType = BusinessType.DELETE) + @DeleteMapping("/{checkResultIds}") + public AjaxResult remove(@PathVariable Long[] checkResultIds) + { + return toAjax(qmsCheckResultService.deleteQmsCheckResultByCheckResultIds(checkResultIds)); + } +} diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/controller/QmsCheckResultDetailController.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/controller/QmsCheckResultDetailController.java new file mode 100644 index 00000000..bf36c74c --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/controller/QmsCheckResultDetailController.java @@ -0,0 +1,105 @@ +package com.hw.qms.controller; + +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.hw.common.log.annotation.Log; +import com.hw.common.log.enums.BusinessType; +import com.hw.common.security.annotation.RequiresPermissions; +import com.hw.qms.domain.QmsCheckResultDetail; +import com.hw.qms.service.IQmsCheckResultDetailService; +import com.hw.common.core.web.controller.BaseController; +import com.hw.common.core.web.domain.AjaxResult; +import com.hw.common.core.utils.poi.ExcelUtil; +import com.hw.common.core.web.page.TableDataInfo; + +/** + * 质检结果详情Controller + * + * @author xins + * @date 2024-01-23 + */ +@RestController +@RequestMapping("/checkresultdetail") +public class QmsCheckResultDetailController extends BaseController +{ + @Autowired + private IQmsCheckResultDetailService qmsCheckResultDetailService; + + /** + * 查询质检结果详情列表 + */ + @RequiresPermissions("qms:checkresultdetail:list") + @GetMapping("/list") + public TableDataInfo list(QmsCheckResultDetail qmsCheckResultDetail) + { + startPage(); + List list = qmsCheckResultDetailService.selectQmsCheckResultDetailList(qmsCheckResultDetail); + return getDataTable(list); + } + + /** + * 导出质检结果详情列表 + */ + @RequiresPermissions("qms:checkresultdetail:export") + @Log(title = "质检结果详情", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, QmsCheckResultDetail qmsCheckResultDetail) + { + List list = qmsCheckResultDetailService.selectQmsCheckResultDetailList(qmsCheckResultDetail); + ExcelUtil util = new ExcelUtil(QmsCheckResultDetail.class); + util.exportExcel(response, list, "质检结果详情数据"); + } + + /** + * 获取质检结果详情详细信息 + */ + @RequiresPermissions("qms:checkresultdetail:query") + @GetMapping(value = "/{checkResultDetailId}") + public AjaxResult getInfo(@PathVariable("checkResultDetailId") Long checkResultDetailId) + { + return success(qmsCheckResultDetailService.selectQmsCheckResultDetailByCheckResultDetailId(checkResultDetailId)); + } + + /** + * 新增质检结果详情 + */ + @RequiresPermissions("qms:checkresultdetail:add") + @Log(title = "质检结果详情", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody QmsCheckResultDetail qmsCheckResultDetail) + { + return toAjax(qmsCheckResultDetailService.insertQmsCheckResultDetail(qmsCheckResultDetail)); + } + + /** + * 修改质检结果详情 + */ + @RequiresPermissions("qms:checkresultdetail:edit") + @Log(title = "质检结果详情", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody QmsCheckResultDetail qmsCheckResultDetail) + { + return toAjax(qmsCheckResultDetailService.updateQmsCheckResultDetail(qmsCheckResultDetail)); + } + + /** + * 删除质检结果详情 + */ + @RequiresPermissions("qms:checkresultdetail:remove") + @Log(title = "质检结果详情", businessType = BusinessType.DELETE) + @DeleteMapping("/{checkResultDetailIds}") + public AjaxResult remove(@PathVariable Long[] checkResultDetailIds) + { + return toAjax(qmsCheckResultDetailService.deleteQmsCheckResultDetailByCheckResultDetailIds(checkResultDetailIds)); + } +} diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/controller/QmsCheckRuleController.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/controller/QmsCheckRuleController.java new file mode 100644 index 00000000..068a1480 --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/controller/QmsCheckRuleController.java @@ -0,0 +1,239 @@ +package com.hw.qms.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.hw.qms.domain.MesBaseMaterialInfo; +import com.hw.qms.domain.QmsCheckProject; +import com.hw.qms.domain.QmsCheckRuleDetail; +import com.hw.qms.domain.QmsCheckRuleProject; +import com.hw.qms.service.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.hw.common.log.annotation.Log; +import com.hw.common.log.enums.BusinessType; +import com.hw.common.security.annotation.RequiresPermissions; +import com.hw.qms.domain.QmsCheckRule; +import com.hw.common.core.web.controller.BaseController; +import com.hw.common.core.web.domain.AjaxResult; +import com.hw.common.core.utils.poi.ExcelUtil; +import com.hw.common.core.web.page.TableDataInfo; + +/** + * 检验规则维护Controller + * + * @author xins + * @date 2024-01-26 + */ +@RestController +@RequestMapping("/checkrule") +public class QmsCheckRuleController extends BaseController +{ + @Autowired + private IQmsCheckRuleService qmsCheckRuleService; + + @Autowired + private IQmsCheckRuleDetailService qmsCheckRuleDetailService; + + @Autowired + private IQmsCheckProjectService qmsCheckProjectService; + + @Autowired + private IMesBaseMaterialInfoService mesBaseMaterialInfoService; + + /** + * 查询检验规则维护列表 + */ + @RequiresPermissions("qms:checkrule:list") + @GetMapping("/list") + public TableDataInfo list(QmsCheckRule qmsCheckRule) + { + startPage(); + List list = qmsCheckRuleService.selectQmsCheckRuleList(qmsCheckRule); + return getDataTable(list); + } + + /** + * 导出检验规则维护列表 + */ + @RequiresPermissions("qms:checkrule:export") + @Log(title = "检验规则维护", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, QmsCheckRule qmsCheckRule) + { + List list = qmsCheckRuleService.selectQmsCheckRuleList(qmsCheckRule); + ExcelUtil util = new ExcelUtil(QmsCheckRule.class); + util.exportExcel(response, list, "检验规则维护数据"); + } + + /** + * 获取检验规则维护详细信息 + */ + @RequiresPermissions("qms:checkrule:query") + @GetMapping(value = "/{checkRuleId}") + public AjaxResult getInfo(@PathVariable("checkRuleId") Long checkRuleId) + { + return success(qmsCheckRuleService.selectQmsCheckRuleByCheckRuleId(checkRuleId)); + } + + /** + * 新增检验规则维护 + */ + @RequiresPermissions("qms:checkrule:add") + @Log(title = "检验规则维护", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody QmsCheckRule qmsCheckRule) + { + return toAjax(qmsCheckRuleService.insertQmsCheckRule(qmsCheckRule)); + } + + /** + * 修改检验规则维护 + */ + @RequiresPermissions("qms:checkrule:edit") + @Log(title = "检验规则维护", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody QmsCheckRule qmsCheckRule) + { + return toAjax(qmsCheckRuleService.updateQmsCheckRule(qmsCheckRule)); + } + + /** + * 删除检验规则维护 + */ + @RequiresPermissions("qms:checkrule:remove") + @Log(title = "检验规则维护", businessType = BusinessType.DELETE) + @DeleteMapping("/{checkRuleIds}") + public AjaxResult remove(@PathVariable Long[] checkRuleIds) + { + return toAjax(qmsCheckRuleService.deleteQmsCheckRuleByCheckRuleIds(checkRuleIds)); + } + + + + + + + /** + * 查询已选择规则明细(物料) + */ + @RequiresPermissions("qms:checkrule:add") + @GetMapping("/getCheckProjects") + public AjaxResult getCheckProjects(QmsCheckProject checkProject) + { + startPage(); + List checkProjects = qmsCheckProjectService.selectQmsCheckProjectList(checkProject); + return success(checkProjects); + } + + + + + /** + * 查询检验规则未配置物料信息列表 + */ + @RequiresPermissions("qms:checkrule:checkRuleDetail") + @GetMapping("/selectMaterialInfos4AllocateCheckRule") + public TableDataInfo selectMaterialInfos4AllocateCheckRule(MesBaseMaterialInfo mesBaseMaterialInfo) + { + startPage(); + List list = mesBaseMaterialInfoService.selectMaterialInfos4AllocateCheckRule(mesBaseMaterialInfo); + return getDataTable(list); + } + + + /** + * 查询已选择规则明细(物料) + */ + @RequiresPermissions("qms:checkrule:checkRuleDetail") + @GetMapping("/selectCheckRuleDetailList") + public TableDataInfo selectCheckRuleDetailList(QmsCheckRuleDetail qmsCheckRuleDetail) + { + startPage(); + List checkRuleDetails = qmsCheckRuleDetailService.selectQmsCheckRuleDetailJoinList(qmsCheckRuleDetail); + return getDataTable(checkRuleDetails); + } + + /** + * 配置检验规则明细（物料） + */ + @RequiresPermissions("qms:checkrule:checkRuleDetail") + @Log(title = "检验规则维护", businessType = BusinessType.ALLOCATE) + @PutMapping("/allocateCheckRuleDetails") + public AjaxResult allocateCheckRuleDetails(@RequestBody List checkRuleDetailList) + { + return toAjax(qmsCheckRuleService.batchInsertCheckRuleDetail(checkRuleDetailList)); + } + + + /** + * 删除检验规则配置的物料信息 + */ + @RequiresPermissions("qms:checkrule:checkRuleDetail") + @Log(title = "检验规则维护", businessType = BusinessType.UNALLOCATE) + @PostMapping("/unallocateCheckRuleDetails") + public AjaxResult unallocateCheckRuleDetails(@RequestBody List checkRuleDetailList) + { + return toAjax(qmsCheckRuleDetailService.deleteQmsCheckRuleDetails(checkRuleDetailList)); + } + + + + + /** + * 查询检验规则未配置项目列表 + */ + @RequiresPermissions("qms:checkrule:checkRuleProject") + @GetMapping("/selectProjects4AllocateCheckRule") + public TableDataInfo selectProjects4AllocateCheckRule(QmsCheckProject qmsCheckProject) + { + startPage(); + List list = qmsCheckProjectService.selectQmsCheckProjects4AllocateCheckRule(qmsCheckProject); + return getDataTable(list); + } + + + +// /** +// * 查询检验规则已分配项目 +// */ +// @RequiresPermissions("qms:checkrule:checkRuleProject") +// @GetMapping("/selectCheckRuleProjects") +// public TableDataInfo selectCheckRuleProjects(QmsCheckRuleProject qmsCheckRuleProject) +// { +// startPage(); +// List checkRuleProjects = qmsCheckRuleProjectService.selectQmsCheckRuleProjectJoinList(qmsCheckRuleProject); +// return getDataTable(checkRuleProjects); +// } +// +// /** +// * 配置检验规则项目 +// */ +// @RequiresPermissions("qms:checkrule:checkRuleProject") +// @Log(title = "检验规则维护", businessType = BusinessType.ALLOCATE) +// @PutMapping("/allocateCheckRuleProjects") +// public AjaxResult allocateCheckRuleProjects(List qmsCheckRuleProjects) +// { +// return toAjax(qmsCheckRuleService.batchInsertCheckRuleProject(qmsCheckRuleProjects)); +// } +// +// +// /** +// * 删除检验规则配置的项目信息 +// */ +// @RequiresPermissions("qms:checkrule:checkRuleProject") +// @Log(title = "检验规则维护", businessType = BusinessType.UNALLOCATE) +// @PostMapping("/unallocateCheckRuleProjects") +// public AjaxResult unallocateCheckRuleProjects(List checkRuleProjects) +// { +// return toAjax(qmsCheckRuleProjectService.deleteQmsCheckRuleProjects(checkRuleProjects)); +// } + +} diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/controller/QmsCheckRuleProjectController.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/controller/QmsCheckRuleProjectController.java new file mode 100644 index 00000000..e71ad4a7 --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/controller/QmsCheckRuleProjectController.java @@ -0,0 +1,105 @@ +package com.hw.qms.controller; + +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.hw.common.log.annotation.Log; +import com.hw.common.log.enums.BusinessType; +import com.hw.common.security.annotation.RequiresPermissions; +import com.hw.qms.domain.QmsCheckRuleProject; +import com.hw.qms.service.IQmsCheckRuleProjectService; +import com.hw.common.core.web.controller.BaseController; +import com.hw.common.core.web.domain.AjaxResult; +import com.hw.common.core.utils.poi.ExcelUtil; +import com.hw.common.core.web.page.TableDataInfo; + +/** + * 检验规则项目Controller + * + * @author xins + * @date 2024-01-23 + */ +@RestController +@RequestMapping("/checkruleproject") +public class QmsCheckRuleProjectController extends BaseController +{ + @Autowired + private IQmsCheckRuleProjectService qmsCheckRuleProjectService; + + /** + * 查询检验规则项目列表 + */ + @RequiresPermissions("qms:checkruleproject:list") + @GetMapping("/list") + public TableDataInfo list(QmsCheckRuleProject qmsCheckRuleProject) + { + startPage(); + List list = qmsCheckRuleProjectService.selectQmsCheckRuleProjectList(qmsCheckRuleProject); + return getDataTable(list); + } + + /** + * 导出检验规则项目列表 + */ + @RequiresPermissions("qms:checkruleproject:export") + @Log(title = "检验规则项目", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, QmsCheckRuleProject qmsCheckRuleProject) + { + List list = qmsCheckRuleProjectService.selectQmsCheckRuleProjectList(qmsCheckRuleProject); + ExcelUtil util = new ExcelUtil(QmsCheckRuleProject.class); + util.exportExcel(response, list, "检验规则项目数据"); + } + + /** + * 获取检验规则项目详细信息 + */ + @RequiresPermissions("qms:checkruleproject:query") + @GetMapping(value = "/{checkRuleId}") + public AjaxResult getInfo(@PathVariable("checkRuleId") Long checkRuleId) + { + return success(qmsCheckRuleProjectService.selectQmsCheckRuleProjectByCheckRuleId(checkRuleId)); + } + + /** + * 新增检验规则项目 + */ + @RequiresPermissions("qms:checkruleproject:add") + @Log(title = "检验规则项目", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody QmsCheckRuleProject qmsCheckRuleProject) + { + return toAjax(qmsCheckRuleProjectService.insertQmsCheckRuleProject(qmsCheckRuleProject)); + } + + /** + * 修改检验规则项目 + */ + @RequiresPermissions("qms:checkruleproject:edit") + @Log(title = "检验规则项目", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody QmsCheckRuleProject qmsCheckRuleProject) + { + return toAjax(qmsCheckRuleProjectService.updateQmsCheckRuleProject(qmsCheckRuleProject)); + } + + /** + * 删除检验规则项目 + */ + @RequiresPermissions("qms:checkruleproject:remove") + @Log(title = "检验规则项目", businessType = BusinessType.DELETE) + @DeleteMapping("/{checkRuleIds}") + public AjaxResult remove(@PathVariable Long[] checkRuleIds) + { + return toAjax(qmsCheckRuleProjectService.deleteQmsCheckRuleProjectByCheckRuleIds(checkRuleIds)); + } +} diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/controller/QmsMobileController.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/controller/QmsMobileController.java new file mode 100644 index 00000000..dfe4d0b6 --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/controller/QmsMobileController.java @@ -0,0 +1,56 @@ +package com.hw.qms.controller; + +import com.hw.common.core.exception.ServiceException; +import com.hw.common.core.web.domain.AjaxResult; +import com.hw.common.core.web.page.TableDataInfo; +import com.hw.common.security.annotation.RequiresPermissions; +import com.hw.qms.domain.MesBaseBarcodeInfo; +import com.hw.qms.domain.QmsCheckRule; +import com.hw.qms.domain.QmsCheckRuleProject; +import com.hw.qms.domain.vo.QmsMaterialCheckVo; +import com.hw.qms.service.IMesBaseBarcodeInfoService; +import com.hw.qms.service.IQmsCheckRuleProjectService; +import com.hw.qms.service.IQmsCheckRuleService; +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.RestController; + +import java.util.List; + +/** + * @Description:PDA接口 + * @ProjectName:HwMes + * @Author:xins + * @Date:2024-01-26 10:18 + * @Version:1.0 + */ +@RestController +@RequestMapping("/qms/mobile") +public class QmsMobileController { + + @Autowired + private IQmsCheckRuleProjectService qmsCheckRuleProjectService; + @Autowired + private IMesBaseBarcodeInfoService mesBaseBarcodeInfoService; + + /** + * 获取质检结果 + */ +// @RequiresPermissions("qms:checkrule:list") + @GetMapping("/getCheckResult") + public AjaxResult getCheckResult(QmsMaterialCheckVo qmsMaterialCheckVo) { + String materialBarcode = qmsMaterialCheckVo.getMaterialBarcode(); + MesBaseBarcodeInfo baseBarcodeInfo = mesBaseBarcodeInfoService.selectMesBaseBarcodeInfoByBarcodeInfo(materialBarcode); + if (baseBarcodeInfo == null) { + throw new ServiceException("此物料条码系统中不存在"); + } + + + Long materialId = baseBarcodeInfo.getMaterialId(); + + List checkRuleProjects = qmsCheckRuleProjectService.getCheckRuleProjects(materialId); + return null; + + } +} diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/MesBaseBarcodeInfo.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/MesBaseBarcodeInfo.java new file mode 100644 index 00000000..9d729365 --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/MesBaseBarcodeInfo.java @@ -0,0 +1,371 @@ +package com.hw.qms.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.hw.common.core.annotation.Excel; +import com.hw.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 条码信息对象 mes_base_barcode_info + * + * @author xins + * @date 2024-01-15 + */ +public class MesBaseBarcodeInfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键标识 */ + private Long barcodeId; + + /** 打印时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "打印时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date printTime; + + /** 打印人 */ + @Excel(name = "打印人") + private String printPerson; + + /** 批次标识(0否，1是);在打印时，如果物料已设置，则根据物料的批次信息，如果没有设置则在此需要选择，选择物料等信息保存后同步设置物料信息。 */ + @Excel(name = "批次标识(0否，1是);在打印时，如果物料已设置，则根据物料的批次信息，如果没有设置则在此需要选择，选择物料等信息保存后同步设置物料信息。") + private String batchFlag; + + /** 条码类型（1原材料,2半成品,3成品,4背板） */ + @Excel(name = "条码类型", readConverterExp = "1=原材料,2半成品,3成品,4背板") + private String barcodeType; + + /** 条码内容;如果是按单个物料贴，则一个物料一个条码，如果是按批次贴，则条码跟批次代码相同 */ + @Excel(name = "条码内容;如果是按单个物料贴，则一个物料一个条码，如果是按批次贴，则条码跟批次代码相同") + private String barcodeInfo; + + /** 批次代码 */ + @Excel(name = "批次代码") + private String batchCode; + + /** 托盘RFID代码 */ + @Excel(name = "托盘RFID代码") + private String palletInfoCode; + + /** 物料ID，关联mes_base_material_info的material_id */ + @Excel(name = "物料ID，关联mes_base_material_info的material_id") + private Long materialId; + + /** 供应商ID */ + @Excel(name = "供应商ID") + private Long manufacturerId; + + /** 数量 */ + @Excel(name = "数量") + private BigDecimal amount; + + /** 打印机台名称，打印时获取 */ + @Excel(name = "打印机台名称，打印时获取") + private String machineName; + + /** 采购订单号;适合原材料入库时 */ + @Excel(name = "采购订单号;适合原材料入库时") + private String poNo; + + /** 生产日期;打印时根据领料单选择输入 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "生产日期;打印时根据领料单选择输入", width = 30, dateFormat = "yyyy-MM-dd") + private Date productionDate; + + /** 接受日期;打印时的系统日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "接受日期;打印时的系统日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date acceptedDate; + + /** 最晚出库日期;可以直接输入，也可以根据日限计算 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最晚出库日期;可以直接输入，也可以根据日限计算", width = 30, dateFormat = "yyyy-MM-dd") + private Date lastOutstockDate; + + /** 生产计划编号，关联mes_pd_product_plan的plan_code;适合生产出入库等 */ + @Excel(name = "生产计划编号，关联mes_pd_product_plan的plan_code;适合生产出入库等") + private String planCode; + + /** 生产计划明细编号，关联mes_product_plan_detail的plan_detail_code;适合生产出入库等 */ + @Excel(name = "生产计划明细编号，关联mes_product_plan_detail的plan_detail_code;适合生产出入库等") + private String planDetailCode; + + /** 销售订单编号;适合生产出入库等 */ + @Excel(name = "销售订单编号;适合生产出入库等") + private String saleorderCode; + + /** 项目号 */ + @Excel(name = "项目号") + private String projectNo; + + /** 流水号 */ + @Excel(name = "流水号") + private String serialNumber; + + /** 绑定状态(1绑定，0解绑) */ + @Excel(name = "绑定状态(1绑定，0解绑)") + private String bindStatus; + + /** 绑定托盘的人 */ + @Excel(name = "绑定托盘的人") + private String bindBy; + + /** 绑定托盘时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "绑定托盘时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date bindTime; + + public void setBarcodeId(Long barcodeId) + { + this.barcodeId = barcodeId; + } + + public Long getBarcodeId() + { + return barcodeId; + } + public void setPrintTime(Date printTime) + { + this.printTime = printTime; + } + + public Date getPrintTime() + { + return printTime; + } + public void setPrintPerson(String printPerson) + { + this.printPerson = printPerson; + } + + public String getPrintPerson() + { + return printPerson; + } + public void setBatchFlag(String batchFlag) + { + this.batchFlag = batchFlag; + } + + public String getBatchFlag() + { + return batchFlag; + } + public void setBarcodeType(String barcodeType) + { + this.barcodeType = barcodeType; + } + + public String getBarcodeType() + { + return barcodeType; + } + public void setBarcodeInfo(String barcodeInfo) + { + this.barcodeInfo = barcodeInfo; + } + + public String getBarcodeInfo() + { + return barcodeInfo; + } + public void setBatchCode(String batchCode) + { + this.batchCode = batchCode; + } + + public String getBatchCode() + { + return batchCode; + } + public void setPalletInfoCode(String palletInfoCode) + { + this.palletInfoCode = palletInfoCode; + } + + public String getPalletInfoCode() + { + return palletInfoCode; + } + public void setMaterialId(Long materialId) + { + this.materialId = materialId; + } + + public Long getMaterialId() + { + return materialId; + } + public void setManufacturerId(Long manufacturerId) + { + this.manufacturerId = manufacturerId; + } + + public Long getManufacturerId() + { + return manufacturerId; + } + public void setAmount(BigDecimal amount) + { + this.amount = amount; + } + + public BigDecimal getAmount() + { + return amount; + } + public void setMachineName(String machineName) + { + this.machineName = machineName; + } + + public String getMachineName() + { + return machineName; + } + public void setPoNo(String poNo) + { + this.poNo = poNo; + } + + public String getPoNo() + { + return poNo; + } + public void setProductionDate(Date productionDate) + { + this.productionDate = productionDate; + } + + public Date getProductionDate() + { + return productionDate; + } + public void setAcceptedDate(Date acceptedDate) + { + this.acceptedDate = acceptedDate; + } + + public Date getAcceptedDate() + { + return acceptedDate; + } + public void setLastOutstockDate(Date lastOutstockDate) + { + this.lastOutstockDate = lastOutstockDate; + } + + public Date getLastOutstockDate() + { + return lastOutstockDate; + } + public void setPlanCode(String planCode) + { + this.planCode = planCode; + } + + public String getPlanCode() + { + return planCode; + } + public void setPlanDetailCode(String planDetailCode) + { + this.planDetailCode = planDetailCode; + } + + public String getPlanDetailCode() + { + return planDetailCode; + } + public void setSaleorderCode(String saleorderCode) + { + this.saleorderCode = saleorderCode; + } + + public String getSaleorderCode() + { + return saleorderCode; + } + public void setProjectNo(String projectNo) + { + this.projectNo = projectNo; + } + + public String getProjectNo() + { + return projectNo; + } + public void setSerialNumber(String serialNumber) + { + this.serialNumber = serialNumber; + } + + public String getSerialNumber() + { + return serialNumber; + } + public void setBindStatus(String bindStatus) + { + this.bindStatus = bindStatus; + } + + public String getBindStatus() + { + return bindStatus; + } + public void setBindBy(String bindBy) + { + this.bindBy = bindBy; + } + + public String getBindBy() + { + return bindBy; + } + public void setBindTime(Date bindTime) + { + this.bindTime = bindTime; + } + + public Date getBindTime() + { + return bindTime; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("barcodeId", getBarcodeId()) + .append("printTime", getPrintTime()) + .append("printPerson", getPrintPerson()) + .append("batchFlag", getBatchFlag()) + .append("barcodeType", getBarcodeType()) + .append("barcodeInfo", getBarcodeInfo()) + .append("batchCode", getBatchCode()) + .append("palletInfoCode", getPalletInfoCode()) + .append("materialId", getMaterialId()) + .append("manufacturerId", getManufacturerId()) + .append("amount", getAmount()) + .append("machineName", getMachineName()) + .append("poNo", getPoNo()) + .append("productionDate", getProductionDate()) + .append("acceptedDate", getAcceptedDate()) + .append("lastOutstockDate", getLastOutstockDate()) + .append("planCode", getPlanCode()) + .append("planDetailCode", getPlanDetailCode()) + .append("saleorderCode", getSaleorderCode()) + .append("projectNo", getProjectNo()) + .append("serialNumber", getSerialNumber()) + .append("remark", getRemark()) + .append("bindStatus", getBindStatus()) + .append("bindBy", getBindBy()) + .append("bindTime", getBindTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/MesBaseMaterialInfo.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/MesBaseMaterialInfo.java new file mode 100644 index 00000000..f22642a3 --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/MesBaseMaterialInfo.java @@ -0,0 +1,376 @@ +package com.hw.qms.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.hw.common.core.annotation.Excel; +import com.hw.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 物料信息对象 mes_base_material_info + * + * @author xins + * @date 2024-01-09 + */ +public class MesBaseMaterialInfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键标识 */ + private Long materialId; + + /** ERP的主键;对应FMATERIALID */ + @Excel(name = "ERP的主键;对应FMATERIALID") + private Long erpId; + + /** 物料编码;对应ERP的FNumber */ + @Excel(name = "物料编码;对应ERP的FNumber") + private String materialCode; + + /** 旧物料编码 */ + @Excel(name = "旧物料编码") + private String oldMaterialCode; + + /** 物料名称;对应ERP的FName */ + @Excel(name = "物料名称;对应ERP的FName") + private String materialName; + + /** 物料大类(1,原材料 2,半成品 3,成品) */ + @Excel(name = "物料大类(1,原材料 2,半成品 3,成品)") + private String materialCategories; + + /** 物料小类;暂时不使用，预留 */ + @Excel(name = "物料小类;暂时不使用，预留") + private String materialSubclass; + + /** 物料类型，关联mes_base_material_type的material_type_id */ + @Excel(name = "物料类型，关联mes_base_material_type的material_type_id") + private Long materialTypeId; + + /** 批次标识，(0否，1是) */ + @Excel(name = "批次标识，(0否，1是)") + private String batchFlag; + + /** 计量单位ID;对应FBaseUnitId */ + @Excel(name = "计量单位ID;对应FBaseUnitId") + private Long materialUnitId; + + /** 计量单位名称 */ + @Excel(name = "计量单位名称") + private String materialUnit; + + /** 物料组 */ + @Excel(name = "物料组") + private String materialMatkl; + + /** 物料规格;对应FSpecification */ + @Excel(name = "物料规格;对应FSpecification") + private String materialSpec; + + /** 净重;FNETWEIGHT */ + @Excel(name = "净重;FNETWEIGHT") + private BigDecimal netWeight; + + /** 毛重;FGROSSWEIGHT */ + @Excel(name = "毛重;FGROSSWEIGHT") + private BigDecimal grossWeight; + + /** 所属工厂，关联mes_base_factory_info的factory_id */ + @Excel(name = "所属工厂，关联mes_base_factory_info的factory_id") + private Long factoryId; + + /** 创建组织;对应FCreateOrgId */ + @Excel(name = "创建组织;对应FCreateOrgId") + private Long createOrgId; + + /** 使用组织;对应FUseOrgId */ + @Excel(name = "使用组织;对应FUseOrgId") + private Long useOrgId; + + /** 所属产线;多个用,隔开 */ + @Excel(name = "所属产线;多个用,隔开") + private String prodlineId; + + /** 激活标识：1-是；0-否 */ + @Excel(name = "激活标识：1-是；0-否") + private String activeFlag; + + /** 删除标识(0否，1是) */ + @Excel(name = "删除标识(0否，1是)") + private String deletedFlag; + + /** 审核日期;对应FApproveDate */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "审核日期;对应FApproveDate", width = 30, dateFormat = "yyyy-MM-dd") + private Date approveDate; + + /** erp最后更新日期;对应FModifyDate */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "erp最后更新日期;对应FModifyDate", width = 30, dateFormat = "yyyy-MM-dd") + private Date erpModifyDate; + + private Long warehouseId; + + private Long checkRuleId; + + public void setMaterialId(Long materialId) + { + this.materialId = materialId; + } + + public Long getMaterialId() + { + return materialId; + } + public void setErpId(Long erpId) + { + this.erpId = erpId; + } + + public Long getErpId() + { + return erpId; + } + public void setMaterialCode(String materialCode) + { + this.materialCode = materialCode; + } + + public String getMaterialCode() + { + return materialCode; + } + public void setOldMaterialCode(String oldMaterialCode) + { + this.oldMaterialCode = oldMaterialCode; + } + + public String getOldMaterialCode() + { + return oldMaterialCode; + } + public void setMaterialName(String materialName) + { + this.materialName = materialName; + } + + public String getMaterialName() + { + return materialName; + } + public void setMaterialCategories(String materialCategories) + { + this.materialCategories = materialCategories; + } + + public String getMaterialCategories() + { + return materialCategories; + } + public void setMaterialSubclass(String materialSubclass) + { + this.materialSubclass = materialSubclass; + } + + public String getMaterialSubclass() + { + return materialSubclass; + } + public void setMaterialTypeId(Long materialTypeId) + { + this.materialTypeId = materialTypeId; + } + + public Long getMaterialTypeId() + { + return materialTypeId; + } + public void setBatchFlag(String batchFlag) + { + this.batchFlag = batchFlag; + } + + public String getBatchFlag() + { + return batchFlag; + } + public void setMaterialUnitId(Long materialUnitId) + { + this.materialUnitId = materialUnitId; + } + + public Long getMaterialUnitId() + { + return materialUnitId; + } + public void setMaterialUnit(String materialUnit) + { + this.materialUnit = materialUnit; + } + + public String getMaterialUnit() + { + return materialUnit; + } + public void setMaterialMatkl(String materialMatkl) + { + this.materialMatkl = materialMatkl; + } + + public String getMaterialMatkl() + { + return materialMatkl; + } + public void setMaterialSpec(String materialSpec) + { + this.materialSpec = materialSpec; + } + + public String getMaterialSpec() + { + return materialSpec; + } + public void setNetWeight(BigDecimal netWeight) + { + this.netWeight = netWeight; + } + + public BigDecimal getNetWeight() + { + return netWeight; + } + public void setGrossWeight(BigDecimal grossWeight) + { + this.grossWeight = grossWeight; + } + + public BigDecimal getGrossWeight() + { + return grossWeight; + } + public void setFactoryId(Long factoryId) + { + this.factoryId = factoryId; + } + + public Long getFactoryId() + { + return factoryId; + } + public void setCreateOrgId(Long createOrgId) + { + this.createOrgId = createOrgId; + } + + public Long getCreateOrgId() + { + return createOrgId; + } + public void setUseOrgId(Long useOrgId) + { + this.useOrgId = useOrgId; + } + + public Long getUseOrgId() + { + return useOrgId; + } + public void setProdlineId(String prodlineId) + { + this.prodlineId = prodlineId; + } + + public String getProdlineId() + { + return prodlineId; + } + public void setActiveFlag(String activeFlag) + { + this.activeFlag = activeFlag; + } + + public String getActiveFlag() + { + return activeFlag; + } + public void setDeletedFlag(String deletedFlag) + { + this.deletedFlag = deletedFlag; + } + + public String getDeletedFlag() + { + return deletedFlag; + } + public void setApproveDate(Date approveDate) + { + this.approveDate = approveDate; + } + + public Date getApproveDate() + { + return approveDate; + } + public void setErpModifyDate(Date erpModifyDate) + { + this.erpModifyDate = erpModifyDate; + } + + public Date getErpModifyDate() + { + return erpModifyDate; + } + + public Long getWarehouseId() { + return warehouseId; + } + + public void setWarehouseId(Long warehouseId) { + this.warehouseId = warehouseId; + } + + public Long getCheckRuleId() { + return checkRuleId; + } + + public void setCheckRuleId(Long checkRuleId) { + this.checkRuleId = checkRuleId; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("materialId", getMaterialId()) + .append("erpId", getErpId()) + .append("materialCode", getMaterialCode()) + .append("oldMaterialCode", getOldMaterialCode()) + .append("materialName", getMaterialName()) + .append("materialCategories", getMaterialCategories()) + .append("materialSubclass", getMaterialSubclass()) + .append("materialTypeId", getMaterialTypeId()) + .append("batchFlag", getBatchFlag()) + .append("materialUnitId", getMaterialUnitId()) + .append("materialUnit", getMaterialUnit()) + .append("materialMatkl", getMaterialMatkl()) + .append("materialSpec", getMaterialSpec()) + .append("netWeight", getNetWeight()) + .append("grossWeight", getGrossWeight()) + .append("factoryId", getFactoryId()) + .append("createOrgId", getCreateOrgId()) + .append("useOrgId", getUseOrgId()) + .append("prodlineId", getProdlineId()) + .append("activeFlag", getActiveFlag()) + .append("deletedFlag", getDeletedFlag()) + .append("remark", getRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("approveDate", getApproveDate()) + .append("erpModifyDate", getErpModifyDate()) + .toString(); + } +} diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckProject.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckProject.java new file mode 100644 index 00000000..7fd507b4 --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckProject.java @@ -0,0 +1,208 @@ +package com.hw.qms.domain; + +import java.math.BigDecimal; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.hw.common.core.annotation.Excel; +import com.hw.common.core.web.domain.BaseEntity; + +/** + * 检验项目对象 qms_check_project + * + * @author xins + * @date 2024-01-23 + */ +public class QmsCheckProject extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 检验项目ID */ + private Long checkProjectId; + + /** 检验项目名称 */ + @Excel(name = "检验项目名称") + private String checkProjectName; + + /** 项目状态(0禁用,1启用) */ + @Excel(name = "项目状态(0禁用,1启用)") + private String checkProjectStatus; + + /** 检验项目属性(1定性,2定量) */ + @Excel(name = "检验项目属性(1定性,2定量)") + private String checkProjectProperty; + + /** 检验方式(1,全检2,抽检);先默认全检，页面不显示；可以是一个批次有30%的物料需要质检，这30%的物料里检查的项目又可以抽检 */ + @Excel(name = "检验方式(1,全检2,抽检);先默认全检，页面不显示；可以是一个批次有30%的物料需要质检，这30%的物料里检查的项目又可以抽检") + private String checkMode; + + /** 抽检比例 */ + @Excel(name = "抽检比例") + private BigDecimal checkSample; + + /** 检验工具 */ + @Excel(name = "检验工具") + private String checkTool; + + /** 单位 */ + @Excel(name = "单位") + private String unitCode; + + /** 标准值 */ + @Excel(name = "标准值") + private BigDecimal standardValue; + + /** 上差值 */ + @Excel(name = "上差值") + private BigDecimal upperDiff; + + /** 下差值 */ + @Excel(name = "下差值") + private BigDecimal downDiff; + + /** 缺陷严重程度(3轻度缺陷 5中度缺陷 7重度缺陷)) */ + @Excel(name = "缺陷严重程度(1轻度缺陷 2中度缺陷 3重度缺陷))") + private String defectSeverity; + + /**检验规则ID*/ + private Long checkRuleId; + + public void setCheckProjectId(Long checkProjectId) + { + this.checkProjectId = checkProjectId; + } + + public Long getCheckProjectId() + { + return checkProjectId; + } + public void setCheckProjectName(String checkProjectName) + { + this.checkProjectName = checkProjectName; + } + + public String getCheckProjectName() + { + return checkProjectName; + } + public void setCheckProjectStatus(String checkProjectStatus) + { + this.checkProjectStatus = checkProjectStatus; + } + + public String getCheckProjectStatus() + { + return checkProjectStatus; + } + public void setCheckProjectProperty(String checkProjectProperty) + { + this.checkProjectProperty = checkProjectProperty; + } + + public String getCheckProjectProperty() + { + return checkProjectProperty; + } + public void setCheckMode(String checkMode) + { + this.checkMode = checkMode; + } + + public String getCheckMode() + { + return checkMode; + } + public void setCheckSample(BigDecimal checkSample) + { + this.checkSample = checkSample; + } + + public BigDecimal getCheckSample() + { + return checkSample; + } + public void setCheckTool(String checkTool) + { + this.checkTool = checkTool; + } + + public String getCheckTool() + { + return checkTool; + } + public void setUnitCode(String unitCode) + { + this.unitCode = unitCode; + } + + public String getUnitCode() + { + return unitCode; + } + public void setStandardValue(BigDecimal standardValue) + { + this.standardValue = standardValue; + } + + public BigDecimal getStandardValue() + { + return standardValue; + } + public void setUpperDiff(BigDecimal upperDiff) + { + this.upperDiff = upperDiff; + } + + public BigDecimal getUpperDiff() + { + return upperDiff; + } + public void setDownDiff(BigDecimal downDiff) + { + this.downDiff = downDiff; + } + + public BigDecimal getDownDiff() + { + return downDiff; + } + public void setDefectSeverity(String defectSeverity) + { + this.defectSeverity = defectSeverity; + } + + public String getDefectSeverity() + { + return defectSeverity; + } + + public Long getCheckRuleId() { + return checkRuleId; + } + + public void setCheckRuleId(Long checkRuleId) { + this.checkRuleId = checkRuleId; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("checkProjectId", getCheckProjectId()) + .append("checkProjectName", getCheckProjectName()) + .append("checkProjectStatus", getCheckProjectStatus()) + .append("checkProjectProperty", getCheckProjectProperty()) + .append("checkMode", getCheckMode()) + .append("checkSample", getCheckSample()) + .append("checkTool", getCheckTool()) + .append("unitCode", getUnitCode()) + .append("standardValue", getStandardValue()) + .append("upperDiff", getUpperDiff()) + .append("downDiff", getDownDiff()) + .append("defectSeverity", getDefectSeverity()) + .append("remark", getRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckResult.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckResult.java new file mode 100644 index 00000000..26f656ee --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckResult.java @@ -0,0 +1,240 @@ +package com.hw.qms.domain; + +import java.math.BigDecimal; +import java.util.List; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.hw.common.core.annotation.Excel; +import com.hw.common.core.web.domain.BaseEntity; + +/** + * 质检结果对象 qms_check_result + * + * @author xins + * @date 2024-01-23 + */ +public class QmsCheckResult extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 质检结果ID */ + private Long checkResultId; + + /** 物料类型(1:原材料,2:半成品,3:成品) */ + @Excel(name = "物料类型(1:原材料,2:半成品,3:成品)") + private String materialType; + + /** 检验物料ID，关联物料表的ID字段 */ + @Excel(name = "检验物料ID，关联物料表的ID字段") + private Long materialId; + + /** 检验批次，关联条码信息的batch_code */ + @Excel(name = "检验批次，关联条码信息的batch_code") + private String materialBatch; + + /** 检验方式(1,全检2,抽检) */ + @Excel(name = "检验方式(1,全检2,抽检)") + private String checkMode; + + /** 抽检比例 */ + @Excel(name = "抽检比例") + private BigDecimal checkSample; + + /** 生产计划编号 */ + @Excel(name = "生产计划编号") + private String planCode; + + /** 生产计划明细编号 */ + @Excel(name = "生产计划明细编号") + private String planDetailCode; + + /** 销售订单编号 */ + @Excel(name = "销售订单编号") + private String saleorderCode; + + /** 采购订单 */ + @Excel(name = "采购订单") + private String poNo; + + /** 采购订单行号 */ + @Excel(name = "采购订单行号") + private String poLine; + + /** 项目编号 */ + @Excel(name = "项目编号") + private String projectNo; + + /** 检验状态(0待检验,1检验中,2质检通过,3质检不通过) */ + @Excel(name = "检验状态(0待检验,1检验中,2质检通过,3质检不通过)") + private String checkStatus; + + /** 预留字段1 */ + @Excel(name = "预留字段1") + private String attr1; + + /** 质检结果详情信息 */ + private List qmsCheckResultDetailList; + + public void setCheckResultId(Long checkResultId) + { + this.checkResultId = checkResultId; + } + + public Long getCheckResultId() + { + return checkResultId; + } + public void setMaterialType(String materialType) + { + this.materialType = materialType; + } + + public String getMaterialType() + { + return materialType; + } + public void setMaterialId(Long materialId) + { + this.materialId = materialId; + } + + public Long getMaterialId() + { + return materialId; + } + public void setMaterialBatch(String materialBatch) + { + this.materialBatch = materialBatch; + } + + public String getMaterialBatch() + { + return materialBatch; + } + public void setCheckMode(String checkMode) + { + this.checkMode = checkMode; + } + + public String getCheckMode() + { + return checkMode; + } + public void setCheckSample(BigDecimal checkSample) + { + this.checkSample = checkSample; + } + + public BigDecimal getCheckSample() + { + return checkSample; + } + public void setPlanCode(String planCode) + { + this.planCode = planCode; + } + + public String getPlanCode() + { + return planCode; + } + public void setPlanDetailCode(String planDetailCode) + { + this.planDetailCode = planDetailCode; + } + + public String getPlanDetailCode() + { + return planDetailCode; + } + public void setSaleorderCode(String saleorderCode) + { + this.saleorderCode = saleorderCode; + } + + public String getSaleorderCode() + { + return saleorderCode; + } + public void setPoNo(String poNo) + { + this.poNo = poNo; + } + + public String getPoNo() + { + return poNo; + } + public void setPoLine(String poLine) + { + this.poLine = poLine; + } + + public String getPoLine() + { + return poLine; + } + public void setProjectNo(String projectNo) + { + this.projectNo = projectNo; + } + + public String getProjectNo() + { + return projectNo; + } + public void setCheckStatus(String checkStatus) + { + this.checkStatus = checkStatus; + } + + public String getCheckStatus() + { + return checkStatus; + } + public void setAttr1(String attr1) + { + this.attr1 = attr1; + } + + public String getAttr1() + { + return attr1; + } + + public List getQmsCheckResultDetailList() + { + return qmsCheckResultDetailList; + } + + public void setQmsCheckResultDetailList(List qmsCheckResultDetailList) + { + this.qmsCheckResultDetailList = qmsCheckResultDetailList; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("checkResultId", getCheckResultId()) + .append("materialType", getMaterialType()) + .append("materialId", getMaterialId()) + .append("materialBatch", getMaterialBatch()) + .append("checkMode", getCheckMode()) + .append("checkSample", getCheckSample()) + .append("planCode", getPlanCode()) + .append("planDetailCode", getPlanDetailCode()) + .append("saleorderCode", getSaleorderCode()) + .append("poNo", getPoNo()) + .append("poLine", getPoLine()) + .append("projectNo", getProjectNo()) + .append("checkStatus", getCheckStatus()) + .append("remark", getRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("attr1", getAttr1()) + .append("qmsCheckResultDetailList", getQmsCheckResultDetailList()) + .toString(); + } +} diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckResultDetail.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckResultDetail.java new file mode 100644 index 00000000..eed83470 --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckResultDetail.java @@ -0,0 +1,140 @@ +package com.hw.qms.domain; + +import java.util.List; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.hw.common.core.annotation.Excel; +import com.hw.common.core.web.domain.BaseEntity; + +/** + * 质检结果详情对象 qms_check_result_detail + * + * @author xins + * @date 2024-01-23 + */ +public class QmsCheckResultDetail extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 质检结果详情ID */ + private Long checkResultDetailId; + + /** 质检结果ID，关联质检结果主键 */ + @Excel(name = "质检结果ID，关联质检结果主键") + private Long checkResultId; + + /** 物料条码 */ + @Excel(name = "物料条码") + private String materialBarcode; + + /** 检验状态(0待检验,1检验中,2质检通过,3质检不通过) */ + @Excel(name = "检验状态(0待检验,1检验中,2质检通过,3质检不通过)") + private String checkStatus; + + + private String materialCode; + + private String materialName; + + private String poNo; + + private String saleorderCode; + + /** 质检结果详情项目信息信息 */ + private List qmsCheckResultDetailProjectList; + + public void setCheckResultDetailId(Long checkResultDetailId) + { + this.checkResultDetailId = checkResultDetailId; + } + + public Long getCheckResultDetailId() + { + return checkResultDetailId; + } + public void setCheckResultId(Long checkResultId) + { + this.checkResultId = checkResultId; + } + + public Long getCheckResultId() + { + return checkResultId; + } + public void setMaterialBarcode(String materialBarcode) + { + this.materialBarcode = materialBarcode; + } + + public String getMaterialBarcode() + { + return materialBarcode; + } + public void setCheckStatus(String checkStatus) + { + this.checkStatus = checkStatus; + } + + public String getCheckStatus() + { + return checkStatus; + } + + public String getMaterialCode() { + return materialCode; + } + + public void setMaterialCode(String materialCode) { + this.materialCode = materialCode; + } + + public String getMaterialName() { + return materialName; + } + + public void setMaterialName(String materialName) { + this.materialName = materialName; + } + + public String getPoNo() { + return poNo; + } + + public void setPoNo(String poNo) { + this.poNo = poNo; + } + + public String getSaleorderCode() { + return saleorderCode; + } + + public void setSaleorderCode(String saleorderCode) { + this.saleorderCode = saleorderCode; + } + + public List getQmsCheckResultDetailProjectList() + { + return qmsCheckResultDetailProjectList; + } + + public void setQmsCheckResultDetailProjectList(List qmsCheckResultDetailProjectList) + { + this.qmsCheckResultDetailProjectList = qmsCheckResultDetailProjectList; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("checkResultDetailId", getCheckResultDetailId()) + .append("checkResultId", getCheckResultId()) + .append("materialBarcode", getMaterialBarcode()) + .append("checkStatus", getCheckStatus()) + .append("remark", getRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("qmsCheckResultDetailProjectList", getQmsCheckResultDetailProjectList()) + .toString(); + } +} diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckResultDetailProject.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckResultDetailProject.java new file mode 100644 index 00000000..2aabf5aa --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckResultDetailProject.java @@ -0,0 +1,140 @@ +package com.hw.qms.domain; + +import java.math.BigDecimal; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.hw.common.core.annotation.Excel; +import com.hw.common.core.web.domain.BaseEntity; + +/** + * 质检结果详情项目信息对象 qms_check_result_detail_project + * + * @author xins + * @date 2024-01-23 + */ +public class QmsCheckResultDetailProject extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 质检结果详情项目信息ID */ + private Long resultDetailProjectId; + + /** 质检结果详情ID，关联qms_check_result_detail的check_result_detail_id */ + @Excel(name = "质检结果详情ID，关联qms_check_result_detail的check_result_detail_id") + private Long checkResultDetailId; + + /** 检验项目ID，关联qms_check_project的check_project_id */ + @Excel(name = "检验项目ID，关联qms_check_project的check_project_id") + private Long checkProjectId; + + /** 检验结果(1合格,0不合格);定性需选择，定量的话根据检验结果的具体值自动选择 */ + @Excel(name = "检验结果(1合格,0不合格);定性需选择，定量的话根据检验结果的具体值自动选择") + private String checkProjectStatus; + + /** 检验结果,具体值 */ + @Excel(name = "检验结果,具体值") + private BigDecimal checkProjectResult; + + /** 标准值 */ + @Excel(name = "标准值") + private BigDecimal standardValue; + + /** 上差值 */ + @Excel(name = "上差值") + private BigDecimal upperDiff; + + /** 下差值 */ + @Excel(name = "下差值") + private BigDecimal downDiff; + + public void setResultDetailProjectId(Long resultDetailProjectId) + { + this.resultDetailProjectId = resultDetailProjectId; + } + + public Long getResultDetailProjectId() + { + return resultDetailProjectId; + } + public void setCheckResultDetailId(Long checkResultDetailId) + { + this.checkResultDetailId = checkResultDetailId; + } + + public Long getCheckResultDetailId() + { + return checkResultDetailId; + } + public void setCheckProjectId(Long checkProjectId) + { + this.checkProjectId = checkProjectId; + } + + public Long getCheckProjectId() + { + return checkProjectId; + } + public void setCheckProjectStatus(String checkProjectStatus) + { + this.checkProjectStatus = checkProjectStatus; + } + + public String getCheckProjectStatus() + { + return checkProjectStatus; + } + public void setCheckProjectResult(BigDecimal checkProjectResult) + { + this.checkProjectResult = checkProjectResult; + } + + public BigDecimal getCheckProjectResult() + { + return checkProjectResult; + } + public void setStandardValue(BigDecimal standardValue) + { + this.standardValue = standardValue; + } + + public BigDecimal getStandardValue() + { + return standardValue; + } + public void setUpperDiff(BigDecimal upperDiff) + { + this.upperDiff = upperDiff; + } + + public BigDecimal getUpperDiff() + { + return upperDiff; + } + public void setDownDiff(BigDecimal downDiff) + { + this.downDiff = downDiff; + } + + public BigDecimal getDownDiff() + { + return downDiff; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("resultDetailProjectId", getResultDetailProjectId()) + .append("checkResultDetailId", getCheckResultDetailId()) + .append("checkProjectId", getCheckProjectId()) + .append("checkProjectStatus", getCheckProjectStatus()) + .append("checkProjectResult", getCheckProjectResult()) + .append("standardValue", getStandardValue()) + .append("upperDiff", getUpperDiff()) + .append("downDiff", getDownDiff()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckRule.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckRule.java new file mode 100644 index 00000000..b48dc2d2 --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckRule.java @@ -0,0 +1,142 @@ +package com.hw.qms.domain; + +import java.math.BigDecimal; +import java.util.List; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.hw.common.core.annotation.Excel; +import com.hw.common.core.web.domain.BaseEntity; + +/** + * 检验规则维护对象 qms_check_rule + * + * @author xins + * @date 2024-01-23 + */ +public class QmsCheckRule extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 检验规则id */ + private Long checkRuleId; + + /** 检验规则名称 */ + @Excel(name = "检验规则名称") + private String checkRuleName; + + /** 检验规则类型(1来料检验,3成品检验,4工序检验) */ + @Excel(name = "检验规则类型(1来料检验,3成品检验,4工序检验)") + private String checkRuleType; + + /** 目标类型(1:原材料类型,2:半成品类型,3:成品类型,4:原材料,5:半成品,6:成品,7:工序);先支持类型 */ + @Excel(name = "目标类型(1:原材料类型,2:半成品类型,3:成品类型,4:原材料,5:半成品,6:成品,7:工序);先支持类型") + private String targetType; + + /** 检验方式(1,全检2,抽检);这是按批次检验物料的检验方式 */ + @Excel(name = "检验方式(1,全检2,抽检);这是按批次检验物料的检验方式") + private String checkMode; + + /** 抽检比例 */ + @Excel(name = "抽检比例") + private BigDecimal checkSample; + + /** 状态(0禁用,1启用) */ + @Excel(name = "状态(0禁用,1启用)") + private String checkRuleStatus; + + /** 检验规则项目信息 */ + private List qmsCheckRuleProjectList; + + public void setCheckRuleId(Long checkRuleId) + { + this.checkRuleId = checkRuleId; + } + + public Long getCheckRuleId() + { + return checkRuleId; + } + public void setCheckRuleName(String checkRuleName) + { + this.checkRuleName = checkRuleName; + } + + public String getCheckRuleName() + { + return checkRuleName; + } + public void setCheckRuleType(String checkRuleType) + { + this.checkRuleType = checkRuleType; + } + + public String getCheckRuleType() + { + return checkRuleType; + } + public void setTargetType(String targetType) + { + this.targetType = targetType; + } + + public String getTargetType() + { + return targetType; + } + public void setCheckMode(String checkMode) + { + this.checkMode = checkMode; + } + + public String getCheckMode() + { + return checkMode; + } + public void setCheckSample(BigDecimal checkSample) + { + this.checkSample = checkSample; + } + + public BigDecimal getCheckSample() + { + return checkSample; + } + public void setCheckRuleStatus(String checkRuleStatus) + { + this.checkRuleStatus = checkRuleStatus; + } + + public String getCheckRuleStatus() + { + return checkRuleStatus; + } + + public List getQmsCheckRuleProjectList() + { + return qmsCheckRuleProjectList; + } + + public void setQmsCheckRuleProjectList(List qmsCheckRuleProjectList) + { + this.qmsCheckRuleProjectList = qmsCheckRuleProjectList; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("checkRuleId", getCheckRuleId()) + .append("checkRuleName", getCheckRuleName()) + .append("checkRuleType", getCheckRuleType()) + .append("targetType", getTargetType()) + .append("checkMode", getCheckMode()) + .append("checkSample", getCheckSample()) + .append("checkRuleStatus", getCheckRuleStatus()) + .append("remark", getRemark()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("qmsCheckRuleProjectList", getQmsCheckRuleProjectList()) + .toString(); + } +} diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckRuleDetail.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckRuleDetail.java new file mode 100644 index 00000000..8ce5f95b --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckRuleDetail.java @@ -0,0 +1,86 @@ +package com.hw.qms.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.hw.common.core.annotation.Excel; +import com.hw.common.core.web.domain.BaseEntity; + +/** + * 检验规则明细对象 qms_check_rule_detail + * + * @author xins + * @date 2024-01-26 + */ +public class QmsCheckRuleDetail extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 检验规则id，关联qms_check_rule的check_rule_id */ + @Excel(name = "检验规则id，关联qms_check_rule的check_rule_id") + private Long checkRuleId; + + /** 目标类型(1:物料2:物料类型,3:工序) */ + @Excel(name = "目标类型(1:物料2:物料类型,3:工序)") + private String targetType; + + /** 根据目标类型关联对应表的主键 */ + @Excel(name = "根据目标类型关联对应表的主键") + private Long targetId; + + private String materialCode; + + private String materialName; + + public void setCheckRuleId(Long checkRuleId) + { + this.checkRuleId = checkRuleId; + } + + public Long getCheckRuleId() + { + return checkRuleId; + } + public void setTargetType(String targetType) + { + this.targetType = targetType; + } + + public String getTargetType() + { + return targetType; + } + public void setTargetId(Long targetId) + { + this.targetId = targetId; + } + + public Long getTargetId() + { + return targetId; + } + + public String getMaterialCode() { + return materialCode; + } + + public void setMaterialCode(String materialCode) { + this.materialCode = materialCode; + } + + public String getMaterialName() { + return materialName; + } + + public void setMaterialName(String materialName) { + this.materialName = materialName; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("checkRuleId", getCheckRuleId()) + .append("targetType", getTargetType()) + .append("targetId", getTargetId()) + .toString(); + } +} diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckRuleProject.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckRuleProject.java new file mode 100644 index 00000000..2b2a0140 --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/QmsCheckRuleProject.java @@ -0,0 +1,94 @@ +package com.hw.qms.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.hw.common.core.annotation.Excel; +import com.hw.common.core.web.domain.BaseEntity; + +/** + * 检验规则项目对象 qms_check_rule_project + * + * @author xins + * @date 2024-01-23 + */ +public class QmsCheckRuleProject extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 检验规则id，关联qms_check_rule的check_rule_id */ + private Long checkRuleId; + + /** 检验项目id，关联qms_check_project的check_project_id */ + private Long checkProjectId; + + /** 检验顺序 */ + @Excel(name = "检验顺序") + private Long projectStepOrder; + + private QmsCheckProject checkProject; + + private String targetType; + + private Long targetId; + + public void setCheckRuleId(Long checkRuleId) + { + this.checkRuleId = checkRuleId; + } + + public Long getCheckRuleId() + { + return checkRuleId; + } + public void setCheckProjectId(Long checkProjectId) + { + this.checkProjectId = checkProjectId; + } + + public Long getCheckProjectId() + { + return checkProjectId; + } + public void setProjectStepOrder(Long projectStepOrder) + { + this.projectStepOrder = projectStepOrder; + } + + public Long getProjectStepOrder() + { + return projectStepOrder; + } + + public QmsCheckProject getCheckProject() { + return checkProject; + } + + public void setCheckProject(QmsCheckProject checkProject) { + this.checkProject = checkProject; + } + + public String getTargetType() { + return targetType; + } + + public void setTargetType(String targetType) { + this.targetType = targetType; + } + + public Long getTargetId() { + return targetId; + } + + public void setTargetId(Long targetId) { + this.targetId = targetId; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("checkRuleId", getCheckRuleId()) + .append("checkProjectId", getCheckProjectId()) + .append("projectStepOrder", getProjectStepOrder()) + .toString(); + } +} diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/vo/QmsMaterialCheckVo.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/vo/QmsMaterialCheckVo.java new file mode 100644 index 00000000..87649b48 --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/domain/vo/QmsMaterialCheckVo.java @@ -0,0 +1,23 @@ +package com.hw.qms.domain.vo; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.math.BigDecimal; + +/** + * @Description: 物料检验VO + * @ClassName: QmsMaterialCheckVo + * @Author : xins + * @Date :2024-01-26 10:37 + * @Version :1.0 + */ +@Data +public class QmsMaterialCheckVo { + + //物料条码 + @NotBlank(message="物料条码必须输入") + private String materialBarcode; + +} diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/MesBaseBarcodeInfoMapper.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/MesBaseBarcodeInfoMapper.java new file mode 100644 index 00000000..62d73799 --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/MesBaseBarcodeInfoMapper.java @@ -0,0 +1,72 @@ +package com.hw.qms.mapper; + + +import com.hw.qms.domain.MesBaseBarcodeInfo; + +import java.util.List; + +/** + * 条码信息Mapper接口 + * + * @author xs + * @date 2023-12-20 + */ +public interface MesBaseBarcodeInfoMapper +{ + /** + * 查询条码信息 + * + * @param barcodeInfo 条码信息UI + * @return 条码信息 + */ + public MesBaseBarcodeInfo selectMesBaseBarcodeInfoByBarcodeInfo(String barcodeInfo); + + + /** + * 查询条码信息 + * + * @param barcodeId 条码信息主键 + * @return 条码信息 + */ + public MesBaseBarcodeInfo selectMesBaseBarcodeInfoByBarcodeId(Long barcodeId); + + /** + * 查询条码信息列表 + * + * @param mesBaseBarcodeInfo 条码信息 + * @return 条码信息集合 + */ + public List selectMesBaseBarcodeInfoList(MesBaseBarcodeInfo mesBaseBarcodeInfo); + + /** + * 新增条码信息 + * + * @param mesBaseBarcodeInfo 条码信息 + * @return 结果 + */ + public int insertMesBaseBarcodeInfo(MesBaseBarcodeInfo mesBaseBarcodeInfo); + + /** + * 修改条码信息 + * + * @param mesBaseBarcodeInfo 条码信息 + * @return 结果 + */ + public int updateMesBaseBarcodeInfo(MesBaseBarcodeInfo mesBaseBarcodeInfo); + + /** + * 删除条码信息 + * + * @param barcodeId 条码信息主键 + * @return 结果 + */ + public int deleteMesBaseBarcodeInfoByBarcodeId(Long barcodeId); + + /** + * 批量删除条码信息 + * + * @param barcodeIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteMesBaseBarcodeInfoByBarcodeIds(Long[] barcodeIds); +} diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/MesBaseMaterialInfoMapper.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/MesBaseMaterialInfoMapper.java new file mode 100644 index 00000000..ff11046f --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/MesBaseMaterialInfoMapper.java @@ -0,0 +1,84 @@ +package com.hw.qms.mapper; + +import com.hw.qms.domain.MesBaseMaterialInfo; + +import java.util.List; + +/** + * 物料信息Mapper接口 + * + * @author xins + * @date 2023-12-21 + */ +public interface MesBaseMaterialInfoMapper +{ + /** + * 查询物料信息 + * + * @param materialId 物料信息主键 + * @return 物料信息 + */ + public MesBaseMaterialInfo selectMesBaseMaterialInfoByMaterialId(Long materialId); + + /** + * 查询物料信息列表 + * + * @param mesBaseMaterialInfo 物料信息 + * @return 物料信息集合 + */ + public List selectMesBaseMaterialInfoList(MesBaseMaterialInfo mesBaseMaterialInfo); + + /** + * 新增物料信息 + * + * @param mesBaseMaterialInfo 物料信息 + * @return 结果 + */ + public int insertMesBaseMaterialInfo(MesBaseMaterialInfo mesBaseMaterialInfo); + + /** + * 修改物料信息 + * + * @param mesBaseMaterialInfo 物料信息 + * @return 结果 + */ + public int updateMesBaseMaterialInfo(MesBaseMaterialInfo mesBaseMaterialInfo); + + /** + * 删除物料信息 + * + * @param materialId 物料信息主键 + * @return 结果 + */ + public int deleteMesBaseMaterialInfoByMaterialId(Long materialId); + + /** + * 批量删除物料信息 + * + * @param materialIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteMesBaseMaterialInfoByMaterialIds(Long[] materialIds); + + + + + /** + * 查询物料信息列表 + * + * @param materialIds 物料信息ID列表 + * @return 物料信息集合 + */ + public List selectMesBaseMaterialInfoListByMaterialIds(Long[] materialIds); + + + /** + * 查询物料信息列表,提供给仓储配置物料列表使用 + * + * @param mesBaseMaterialInfo 物料信息 + * @return 物料信息集合 + */ + public List selectMaterialInfos4AllocateCheckRule(MesBaseMaterialInfo mesBaseMaterialInfo); + + +} diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/QmsCheckProjectMapper.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/QmsCheckProjectMapper.java new file mode 100644 index 00000000..a3ee5200 --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/QmsCheckProjectMapper.java @@ -0,0 +1,75 @@ +package com.hw.qms.mapper; + +import java.util.List; +import com.hw.qms.domain.QmsCheckProject; + +/** + * 检验项目Mapper接口 + * + * @author xins + * @date 2024-01-23 + */ +public interface QmsCheckProjectMapper +{ + /** + * 查询检验项目 + * + * @param checkProjectId 检验项目主键 + * @return 检验项目 + */ + public QmsCheckProject selectQmsCheckProjectByCheckProjectId(Long checkProjectId); + + /** + * 查询检验项目列表 + * + * @param qmsCheckProject 检验项目 + * @return 检验项目集合 + */ + public List selectQmsCheckProjectList(QmsCheckProject qmsCheckProject); + + /** + * 新增检验项目 + * + * @param qmsCheckProject 检验项目 + * @return 结果 + */ + public int insertQmsCheckProject(QmsCheckProject qmsCheckProject); + + /** + * 修改检验项目 + * + * @param qmsCheckProject 检验项目 + * @return 结果 + */ + public int updateQmsCheckProject(QmsCheckProject qmsCheckProject); + + /** + * 删除检验项目 + * + * @param checkProjectId 检验项目主键 + * @return 结果 + */ + public int deleteQmsCheckProjectByCheckProjectId(Long checkProjectId); + + /** + * 批量删除检验项目 + * + * @param checkProjectIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteQmsCheckProjectByCheckProjectIds(Long[] checkProjectIds); + + + + + + /** + * 查询检验项目列表,提供给检验规则查询未分配项目使用 + * + * @param qmsCheckProject 检验项目 + * @return 检验项目集合 + */ + public List selectQmsCheckProjects4AllocateCheckRule(QmsCheckProject qmsCheckProject); + + +} diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/QmsCheckResultDetailMapper.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/QmsCheckResultDetailMapper.java new file mode 100644 index 00000000..b66ec328 --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/QmsCheckResultDetailMapper.java @@ -0,0 +1,99 @@ +package com.hw.qms.mapper; + +import java.util.List; +import com.hw.qms.domain.QmsCheckResultDetail; +import com.hw.qms.domain.QmsCheckResultDetailProject; + +/** + * 质检结果详情Mapper接口 + * + * @author xins + * @date 2024-01-23 + */ +public interface QmsCheckResultDetailMapper +{ + /** + * 查询质检结果详情 + * + * @param checkResultDetailId 质检结果详情主键 + * @return 质检结果详情 + */ + public QmsCheckResultDetail selectQmsCheckResultDetailByCheckResultDetailId(Long checkResultDetailId); + + /** + * 查询质检结果详情列表 + * + * @param qmsCheckResultDetail 质检结果详情 + * @return 质检结果详情集合 + */ + public List selectQmsCheckResultDetailList(QmsCheckResultDetail qmsCheckResultDetail); + + /** + * 新增质检结果详情 + * + * @param qmsCheckResultDetail 质检结果详情 + * @return 结果 + */ + public int insertQmsCheckResultDetail(QmsCheckResultDetail qmsCheckResultDetail); + + /** + * 修改质检结果详情 + * + * @param qmsCheckResultDetail 质检结果详情 + * @return 结果 + */ + public int updateQmsCheckResultDetail(QmsCheckResultDetail qmsCheckResultDetail); + + /** + * 删除质检结果详情 + * + * @param checkResultDetailId 质检结果详情主键 + * @return 结果 + */ + public int deleteQmsCheckResultDetailByCheckResultDetailId(Long checkResultDetailId); + + /** + * 批量删除质检结果详情 + * + * @param checkResultDetailIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteQmsCheckResultDetailByCheckResultDetailIds(Long[] checkResultDetailIds); + + /** + * 批量删除质检结果详情项目信息 + * + * @param checkResultDetailIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteQmsCheckResultDetailProjectByCheckResultDetailIds(Long[] checkResultDetailIds); + + /** + * 批量新增质检结果详情项目信息 + * + * @param qmsCheckResultDetailProjectList 质检结果详情项目信息列表 + * @return 结果 + */ + public int batchQmsCheckResultDetailProject(List qmsCheckResultDetailProjectList); + + + /** + * 通过质检结果详情主键删除质检结果详情项目信息信息 + * + * @param checkResultDetailId 质检结果详情ID + * @return 结果 + */ + public int deleteQmsCheckResultDetailProjectByCheckResultDetailId(Long checkResultDetailId); + + + + + /** + * 查询质检结果详情 + * + * @param materialBarcode 物料条码 + * @return 质检结果详情 + */ + public QmsCheckResultDetail selectQmsCheckResultDetailByMaterialBarcode(String materialBarcode); + +} diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/QmsCheckResultMapper.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/QmsCheckResultMapper.java new file mode 100644 index 00000000..9cd1955e --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/QmsCheckResultMapper.java @@ -0,0 +1,87 @@ +package com.hw.qms.mapper; + +import java.util.List; +import com.hw.qms.domain.QmsCheckResult; +import com.hw.qms.domain.QmsCheckResultDetail; + +/** + * 质检结果Mapper接口 + * + * @author xins + * @date 2024-01-23 + */ +public interface QmsCheckResultMapper +{ + /** + * 查询质检结果 + * + * @param checkResultId 质检结果主键 + * @return 质检结果 + */ + public QmsCheckResult selectQmsCheckResultByCheckResultId(Long checkResultId); + + /** + * 查询质检结果列表 + * + * @param qmsCheckResult 质检结果 + * @return 质检结果集合 + */ + public List selectQmsCheckResultList(QmsCheckResult qmsCheckResult); + + /** + * 新增质检结果 + * + * @param qmsCheckResult 质检结果 + * @return 结果 + */ + public int insertQmsCheckResult(QmsCheckResult qmsCheckResult); + + /** + * 修改质检结果 + * + * @param qmsCheckResult 质检结果 + * @return 结果 + */ + public int updateQmsCheckResult(QmsCheckResult qmsCheckResult); + + /** + * 删除质检结果 + * + * @param checkResultId 质检结果主键 + * @return 结果 + */ + public int deleteQmsCheckResultByCheckResultId(Long checkResultId); + + /** + * 批量删除质检结果 + * + * @param checkResultIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteQmsCheckResultByCheckResultIds(Long[] checkResultIds); + + /** + * 批量删除质检结果详情 + * + * @param checkResultIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteQmsCheckResultDetailByCheckResultIds(Long[] checkResultIds); + + /** + * 批量新增质检结果详情 + * + * @param qmsCheckResultDetailList 质检结果详情列表 + * @return 结果 + */ + public int batchQmsCheckResultDetail(List qmsCheckResultDetailList); + + + /** + * 通过质检结果主键删除质检结果详情信息 + * + * @param checkResultId 质检结果ID + * @return 结果 + */ + public int deleteQmsCheckResultDetailByCheckResultId(Long checkResultId); +} diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/QmsCheckRuleDetailMapper.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/QmsCheckRuleDetailMapper.java new file mode 100644 index 00000000..932a6606 --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/QmsCheckRuleDetailMapper.java @@ -0,0 +1,79 @@ +package com.hw.qms.mapper; + +import java.util.List; +import com.hw.qms.domain.QmsCheckRuleDetail; + +/** + * 检验规则明细Mapper接口 + * + * @author xins + * @date 2024-01-26 + */ +public interface QmsCheckRuleDetailMapper +{ + /** + * 查询检验规则明细 + * + * @param checkRuleId 检验规则明细主键 + * @return 检验规则明细 + */ + public QmsCheckRuleDetail selectQmsCheckRuleDetailByCheckRuleId(Long checkRuleId); + + /** + * 查询检验规则明细列表 + * + * @param qmsCheckRuleDetail 检验规则明细 + * @return 检验规则明细集合 + */ + public List selectQmsCheckRuleDetailList(QmsCheckRuleDetail qmsCheckRuleDetail); + + /** + * 新增检验规则明细 + * + * @param qmsCheckRuleDetail 检验规则明细 + * @return 结果 + */ + public int insertQmsCheckRuleDetail(QmsCheckRuleDetail qmsCheckRuleDetail); + + /** + * 修改检验规则明细 + * + * @param qmsCheckRuleDetail 检验规则明细 + * @return 结果 + */ + public int updateQmsCheckRuleDetail(QmsCheckRuleDetail qmsCheckRuleDetail); + + /** + * 删除检验规则明细 + * + * @param checkRuleId 检验规则明细主键 + * @return 结果 + */ + public int deleteQmsCheckRuleDetailByCheckRuleId(Long checkRuleId); + + /** + * 批量删除检验规则明细 + * + * @param checkRuleIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteQmsCheckRuleDetailByCheckRuleIds(Long[] checkRuleIds); + + + /** + * 查询检验规则明细列表,Join material + * + * @param qmsCheckRuleDetail 检验规则明细 + * @return 检验规则明细集合 + */ + public List selectQmsCheckRuleDetailJoinList(QmsCheckRuleDetail qmsCheckRuleDetail); + + + /** + * 批量删除检验规则明细 + * + * @param checkRuleDetails 需要删除的数据列表 + * @return 结果 + */ + public int deleteQmsCheckRuleDetails(List checkRuleDetails); +} diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/QmsCheckRuleMapper.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/QmsCheckRuleMapper.java new file mode 100644 index 00000000..9d652313 --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/QmsCheckRuleMapper.java @@ -0,0 +1,98 @@ +package com.hw.qms.mapper; + +import java.util.List; +import com.hw.qms.domain.QmsCheckRule; +import com.hw.qms.domain.QmsCheckRuleDetail; +import com.hw.qms.domain.QmsCheckRuleProject; + +/** + * 检验规则维护Mapper接口 + * + * @author xins + * @date 2024-01-26 + */ +public interface QmsCheckRuleMapper +{ + /** + * 查询检验规则维护 + * + * @param checkRuleId 检验规则维护主键 + * @return 检验规则维护 + */ + public QmsCheckRule selectQmsCheckRuleByCheckRuleId(Long checkRuleId); + + /** + * 查询检验规则维护列表 + * + * @param qmsCheckRule 检验规则维护 + * @return 检验规则维护集合 + */ + public List selectQmsCheckRuleList(QmsCheckRule qmsCheckRule); + + /** + * 新增检验规则维护 + * + * @param qmsCheckRule 检验规则维护 + * @return 结果 + */ + public int insertQmsCheckRule(QmsCheckRule qmsCheckRule); + + /** + * 修改检验规则维护 + * + * @param qmsCheckRule 检验规则维护 + * @return 结果 + */ + public int updateQmsCheckRule(QmsCheckRule qmsCheckRule); + + /** + * 删除检验规则维护 + * + * @param checkRuleId 检验规则维护主键 + * @return 结果 + */ + public int deleteQmsCheckRuleByCheckRuleId(Long checkRuleId); + + /** + * 批量删除检验规则维护 + * + * @param checkRuleIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteQmsCheckRuleByCheckRuleIds(Long[] checkRuleIds); + + /** + * 批量删除检验规则项目 + * + * @param checkRuleIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteQmsCheckRuleProjectByCheckRuleIds(Long[] checkRuleIds); + + /** + * 批量新增检验规则明细 + * + * @param qmsCheckRuleDetailList 检验规则明细列表 + * @return 结果 + */ + public int batchQmsCheckRuleDetail(List qmsCheckRuleDetailList); + + /** + * 通过检验规则维护主键删除检验规则项目信息 + * + * @param checkRuleId 检验规则维护ID + * @return 结果 + */ + public int deleteQmsCheckRuleProjectByCheckRuleId(Long checkRuleId); + + + + /** + * 批量新增检验规则项目 + * + * @param qmsCheckRuleProjectList 检验规则项目列表 + * @return 结果 + */ + public int batchQmsCheckRuleProject(List qmsCheckRuleProjectList); + +} diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/QmsCheckRuleProjectMapper.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/QmsCheckRuleProjectMapper.java new file mode 100644 index 00000000..6014a4f1 --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/mapper/QmsCheckRuleProjectMapper.java @@ -0,0 +1,89 @@ +package com.hw.qms.mapper; + +import java.util.List; +import com.hw.qms.domain.QmsCheckRuleProject; + +/** + * 检验规则项目Mapper接口 + * + * @author xins + * @date 2024-01-23 + */ +public interface QmsCheckRuleProjectMapper +{ + /** + * 查询检验规则项目 + * + * @param checkRuleId 检验规则项目主键 + * @return 检验规则项目 + */ + public QmsCheckRuleProject selectQmsCheckRuleProjectByCheckRuleId(Long checkRuleId); + + /** + * 查询检验规则项目列表 + * + * @param qmsCheckRuleProject 检验规则项目 + * @return 检验规则项目集合 + */ + public List selectQmsCheckRuleProjectList(QmsCheckRuleProject qmsCheckRuleProject); + + /** + * 新增检验规则项目 + * + * @param qmsCheckRuleProject 检验规则项目 + * @return 结果 + */ + public int insertQmsCheckRuleProject(QmsCheckRuleProject qmsCheckRuleProject); + + /** + * 修改检验规则项目 + * + * @param qmsCheckRuleProject 检验规则项目 + * @return 结果 + */ + public int updateQmsCheckRuleProject(QmsCheckRuleProject qmsCheckRuleProject); + + /** + * 删除检验规则项目 + * + * @param checkRuleId 检验规则项目主键 + * @return 结果 + */ + public int deleteQmsCheckRuleProjectByCheckRuleId(Long checkRuleId); + + /** + * 批量删除检验规则项目 + * + * @param checkRuleIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteQmsCheckRuleProjectByCheckRuleIds(Long[] checkRuleIds); + + /** + * 根据检验规则明细的target查询检验规则项目列表 + * + * @param qmsCheckRuleProject 检验规则项目 + * @return 检验规则项目集合 + */ + public List selectQmsCheckRuleProjectListByTarget(QmsCheckRuleProject qmsCheckRuleProject); + + + + + /** + * 批量删除检验规则项目 + * + * @param checkRuleProjects 需要删除的数据列表 + * @return 结果 + */ + public int deleteQmsCheckRuleProjects(List checkRuleProjects); + + + /** + * 查询检验规则项目列表 + * + * @param qmsCheckRuleProject 检验规则项目 + * @return 检验规则项目集合 + */ + public List selectQmsCheckRuleProjectJoinList(QmsCheckRuleProject qmsCheckRuleProject); +} diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/service/IMesBaseBarcodeInfoService.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/IMesBaseBarcodeInfoService.java new file mode 100644 index 00000000..cf977426 --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/IMesBaseBarcodeInfoService.java @@ -0,0 +1,71 @@ +package com.hw.qms.service; + +import com.hw.qms.domain.MesBaseBarcodeInfo; + +import java.util.List; + +/** + * 条码信息Service接口 + * + * @author xs + * @date 2023-12-20 + */ +public interface IMesBaseBarcodeInfoService +{ + /** + * 查询条码信息 + * + * @param barcodeInfo 条码信息UID + * @return 条码信息 + */ + public MesBaseBarcodeInfo selectMesBaseBarcodeInfoByBarcodeInfo(String barcodeInfo); + + + /** + * 查询条码信息 + * + * @param barcodeId 条码信息主键 + * @return 条码信息 + */ + public MesBaseBarcodeInfo selectMesBaseBarcodeInfoByBarcodeId(Long barcodeId); + + /** + * 查询条码信息列表 + * + * @param mesBaseBarcodeInfo 条码信息 + * @return 条码信息集合 + */ + public List selectMesBaseBarcodeInfoList(MesBaseBarcodeInfo mesBaseBarcodeInfo); + + /** + * 新增条码信息 + * + * @param mesBaseBarcodeInfo 条码信息 + * @return 结果 + */ + public int insertMesBaseBarcodeInfo(MesBaseBarcodeInfo mesBaseBarcodeInfo); + + /** + * 修改条码信息 + * + * @param mesBaseBarcodeInfo 条码信息 + * @return 结果 + */ + public int updateMesBaseBarcodeInfo(MesBaseBarcodeInfo mesBaseBarcodeInfo); + + /** + * 批量删除条码信息 + * + * @param barcodeIds 需要删除的条码信息主键集合 + * @return 结果 + */ + public int deleteMesBaseBarcodeInfoByBarcodeIds(Long[] barcodeIds); + + /** + * 删除条码信息信息 + * + * @param barcodeId 条码信息主键 + * @return 结果 + */ + public int deleteMesBaseBarcodeInfoByBarcodeId(Long barcodeId); +} diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/service/IMesBaseMaterialInfoService.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/IMesBaseMaterialInfoService.java new file mode 100644 index 00000000..78fc9821 --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/IMesBaseMaterialInfoService.java @@ -0,0 +1,79 @@ +package com.hw.qms.service; + +import com.hw.qms.domain.MesBaseMaterialInfo; + +import java.util.List; + +/** + * 物料信息Service接口 + * + * @author xins + * @date 2023-12-21 + */ +public interface IMesBaseMaterialInfoService +{ + /** + * 查询物料信息 + * + * @param materialId 物料信息主键 + * @return 物料信息 + */ + public MesBaseMaterialInfo selectMesBaseMaterialInfoByMaterialId(Long materialId); + + /** + * 查询物料信息列表 + * + * @param mesBaseMaterialInfo 物料信息 + * @return 物料信息集合 + */ + public List selectMesBaseMaterialInfoList(MesBaseMaterialInfo mesBaseMaterialInfo); + + /** + * 新增物料信息 + * + * @param mesBaseMaterialInfo 物料信息 + * @return 结果 + */ + public int insertMesBaseMaterialInfo(MesBaseMaterialInfo mesBaseMaterialInfo); + + /** + * 修改物料信息 + * + * @param mesBaseMaterialInfo 物料信息 + * @return 结果 + */ + public int updateMesBaseMaterialInfo(MesBaseMaterialInfo mesBaseMaterialInfo); + + /** + * 批量删除物料信息 + * + * @param materialIds 需要删除的物料信息主键集合 + * @return 结果 + */ + public int deleteMesBaseMaterialInfoByMaterialIds(Long[] materialIds); + + /** + * 删除物料信息信息 + * + * @param materialId 物料信息主键 + * @return 结果 + */ + public int deleteMesBaseMaterialInfoByMaterialId(Long materialId); + + /** + * 查询物料信息列表 + * + * @param materialIds 物料信息ID列表 + * @return 物料信息 + */ + public List selectMesBaseMaterialInfoListByMaterialIds(Long[] materialIds); + + + /** + * 查询物料信息列表，提供给仓储配置物料列表使用 + * + * @param mesBaseMaterialInfo 物料信息 + * @return 物料信息 + */ + public List selectMaterialInfos4AllocateCheckRule(MesBaseMaterialInfo mesBaseMaterialInfo); +} diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/service/IQmsCheckProjectService.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/IQmsCheckProjectService.java new file mode 100644 index 00000000..cfe8e0b4 --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/IQmsCheckProjectService.java @@ -0,0 +1,70 @@ +package com.hw.qms.service; + +import java.util.List; +import com.hw.qms.domain.QmsCheckProject; + +/** + * 检验项目Service接口 + * + * @author xins + * @date 2024-01-23 + */ +public interface IQmsCheckProjectService +{ + /** + * 查询检验项目 + * + * @param checkProjectId 检验项目主键 + * @return 检验项目 + */ + public QmsCheckProject selectQmsCheckProjectByCheckProjectId(Long checkProjectId); + + /** + * 查询检验项目列表 + * + * @param qmsCheckProject 检验项目 + * @return 检验项目集合 + */ + public List selectQmsCheckProjectList(QmsCheckProject qmsCheckProject); + + /** + * 新增检验项目 + * + * @param qmsCheckProject 检验项目 + * @return 结果 + */ + public int insertQmsCheckProject(QmsCheckProject qmsCheckProject); + + /** + * 修改检验项目 + * + * @param qmsCheckProject 检验项目 + * @return 结果 + */ + public int updateQmsCheckProject(QmsCheckProject qmsCheckProject); + + /** + * 批量删除检验项目 + * + * @param checkProjectIds 需要删除的检验项目主键集合 + * @return 结果 + */ + public int deleteQmsCheckProjectByCheckProjectIds(Long[] checkProjectIds); + + /** + * 删除检验项目信息 + * + * @param checkProjectId 检验项目主键 + * @return 结果 + */ + public int deleteQmsCheckProjectByCheckProjectId(Long checkProjectId); + + + /** + * 查询检验项目列表,提供给检验规则查询未分配项目使用 + * + * @param qmsCheckProject 检验项目 + * @return 检验项目 + */ + public List selectQmsCheckProjects4AllocateCheckRule(QmsCheckProject qmsCheckProject); +} diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/service/IQmsCheckResultDetailService.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/IQmsCheckResultDetailService.java new file mode 100644 index 00000000..f310c608 --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/IQmsCheckResultDetailService.java @@ -0,0 +1,68 @@ +package com.hw.qms.service; + +import java.util.List; +import com.hw.qms.domain.QmsCheckResultDetail; + +/** + * 质检结果详情Service接口 + * + * @author xins + * @date 2024-01-23 + */ +public interface IQmsCheckResultDetailService +{ + /** + * 查询质检结果详情 + * + * @param checkResultDetailId 质检结果详情主键 + * @return 质检结果详情 + */ + public QmsCheckResultDetail selectQmsCheckResultDetailByCheckResultDetailId(Long checkResultDetailId); + + /** + * 查询质检结果详情列表 + * + * @param qmsCheckResultDetail 质检结果详情 + * @return 质检结果详情集合 + */ + public List selectQmsCheckResultDetailList(QmsCheckResultDetail qmsCheckResultDetail); + + /** + * 新增质检结果详情 + * + * @param qmsCheckResultDetail 质检结果详情 + * @return 结果 + */ + public int insertQmsCheckResultDetail(QmsCheckResultDetail qmsCheckResultDetail); + + /** + * 修改质检结果详情 + * + * @param qmsCheckResultDetail 质检结果详情 + * @return 结果 + */ + public int updateQmsCheckResultDetail(QmsCheckResultDetail qmsCheckResultDetail); + + /** + * 批量删除质检结果详情 + * + * @param checkResultDetailIds 需要删除的质检结果详情主键集合 + * @return 结果 + */ + public int deleteQmsCheckResultDetailByCheckResultDetailIds(Long[] checkResultDetailIds); + + /** + * 删除质检结果详情信息 + * + * @param checkResultDetailId 质检结果详情主键 + * @return 结果 + */ + public int deleteQmsCheckResultDetailByCheckResultDetailId(Long checkResultDetailId); + + /** + * 获取质检结果详情 + * @param materialBarcode 物料条码 + * @return + */ + public QmsCheckResultDetail getCheckResultDetail(String materialBarcode); +} diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/service/IQmsCheckResultService.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/IQmsCheckResultService.java new file mode 100644 index 00000000..4c14368a --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/IQmsCheckResultService.java @@ -0,0 +1,61 @@ +package com.hw.qms.service; + +import java.util.List; +import com.hw.qms.domain.QmsCheckResult; + +/** + * 质检结果Service接口 + * + * @author xins + * @date 2024-01-23 + */ +public interface IQmsCheckResultService +{ + /** + * 查询质检结果 + * + * @param checkResultId 质检结果主键 + * @return 质检结果 + */ + public QmsCheckResult selectQmsCheckResultByCheckResultId(Long checkResultId); + + /** + * 查询质检结果列表 + * + * @param qmsCheckResult 质检结果 + * @return 质检结果集合 + */ + public List selectQmsCheckResultList(QmsCheckResult qmsCheckResult); + + /** + * 新增质检结果 + * + * @param qmsCheckResult 质检结果 + * @return 结果 + */ + public int insertQmsCheckResult(QmsCheckResult qmsCheckResult); + + /** + * 修改质检结果 + * + * @param qmsCheckResult 质检结果 + * @return 结果 + */ + public int updateQmsCheckResult(QmsCheckResult qmsCheckResult); + + /** + * 批量删除质检结果 + * + * @param checkResultIds 需要删除的质检结果主键集合 + * @return 结果 + */ + public int deleteQmsCheckResultByCheckResultIds(Long[] checkResultIds); + + /** + * 删除质检结果信息 + * + * @param checkResultId 质检结果主键 + * @return 结果 + */ + public int deleteQmsCheckResultByCheckResultId(Long checkResultId); +} diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/service/IQmsCheckRuleDetailService.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/IQmsCheckRuleDetailService.java new file mode 100644 index 00000000..f55383dd --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/IQmsCheckRuleDetailService.java @@ -0,0 +1,78 @@ +package com.hw.qms.service; + +import java.util.List; +import com.hw.qms.domain.QmsCheckRuleDetail; + +/** + * 检验规则明细Service接口 + * + * @author xins + * @date 2024-01-26 + */ +public interface IQmsCheckRuleDetailService +{ + /** + * 查询检验规则明细 + * + * @param checkRuleId 检验规则明细主键 + * @return 检验规则明细 + */ + public QmsCheckRuleDetail selectQmsCheckRuleDetailByCheckRuleId(Long checkRuleId); + + /** + * 查询检验规则明细列表 + * + * @param qmsCheckRuleDetail 检验规则明细 + * @return 检验规则明细集合 + */ + public List selectQmsCheckRuleDetailList(QmsCheckRuleDetail qmsCheckRuleDetail); + + /** + * 新增检验规则明细 + * + * @param qmsCheckRuleDetail 检验规则明细 + * @return 结果 + */ + public int insertQmsCheckRuleDetail(QmsCheckRuleDetail qmsCheckRuleDetail); + + /** + * 修改检验规则明细 + * + * @param qmsCheckRuleDetail 检验规则明细 + * @return 结果 + */ + public int updateQmsCheckRuleDetail(QmsCheckRuleDetail qmsCheckRuleDetail); + + /** + * 批量删除检验规则明细 + * + * @param checkRuleIds 需要删除的检验规则明细主键集合 + * @return 结果 + */ + public int deleteQmsCheckRuleDetailByCheckRuleIds(Long[] checkRuleIds); + + /** + * 删除检验规则明细信息 + * + * @param checkRuleId 检验规则明细主键 + * @return 结果 + */ + public int deleteQmsCheckRuleDetailByCheckRuleId(Long checkRuleId); + + + /** + * 查询检验规则明细列表,Join material + * + * @param qmsCheckRuleDetail 检验规则明细 + * @return 检验规则明细 + */ + public List selectQmsCheckRuleDetailJoinList(QmsCheckRuleDetail qmsCheckRuleDetail); + + /** + * 批量删除检验规则明细 + * + * @param checkRuleDetailList 需要删除的检验规则明细列表 + * @return 结果 + */ + public int deleteQmsCheckRuleDetails(List checkRuleDetailList); +} diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/service/IQmsCheckRuleProjectService.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/IQmsCheckRuleProjectService.java new file mode 100644 index 00000000..32f63d79 --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/IQmsCheckRuleProjectService.java @@ -0,0 +1,84 @@ +package com.hw.qms.service; + +import java.util.List; +import com.hw.qms.domain.QmsCheckRuleProject; + +/** + * 检验规则项目Service接口 + * + * @author xins + * @date 2024-01-23 + */ +public interface IQmsCheckRuleProjectService +{ + /** + * 查询检验规则项目 + * + * @param checkRuleId 检验规则项目主键 + * @return 检验规则项目 + */ + public QmsCheckRuleProject selectQmsCheckRuleProjectByCheckRuleId(Long checkRuleId); + + /** + * 查询检验规则项目列表 + * + * @param qmsCheckRuleProject 检验规则项目 + * @return 检验规则项目集合 + */ + public List selectQmsCheckRuleProjectList(QmsCheckRuleProject qmsCheckRuleProject); + + /** + * 新增检验规则项目 + * + * @param qmsCheckRuleProject 检验规则项目 + * @return 结果 + */ + public int insertQmsCheckRuleProject(QmsCheckRuleProject qmsCheckRuleProject); + + /** + * 修改检验规则项目 + * + * @param qmsCheckRuleProject 检验规则项目 + * @return 结果 + */ + public int updateQmsCheckRuleProject(QmsCheckRuleProject qmsCheckRuleProject); + + /** + * 批量删除检验规则项目 + * + * @param checkRuleIds 需要删除的检验规则项目主键集合 + * @return 结果 + */ + public int deleteQmsCheckRuleProjectByCheckRuleIds(Long[] checkRuleIds); + + /** + * 删除检验规则项目信息 + * + * @param checkRuleId 检验规则项目主键 + * @return 结果 + */ + public int deleteQmsCheckRuleProjectByCheckRuleId(Long checkRuleId); + + /** + * 获取检验规则项目 + * @param materialId 物料ID + * @return + */ + public List getCheckRuleProjects(Long materialId); + + /** + * 查询检验规则项目列表,Join checkproject + * + * @param qmsCheckRuleProject 检验规则项目 + * @return 检验规则项目 + */ + public List selectQmsCheckRuleProjectJoinList(QmsCheckRuleProject qmsCheckRuleProject); + + /** + * 批量删除检验规则项目 + * + * @param checkRuleProjectList 需要删除的检验规则项目列表 + * @return 结果 + */ + public int deleteQmsCheckRuleProjects(List checkRuleProjectList); +} diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/service/IQmsCheckRuleService.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/IQmsCheckRuleService.java new file mode 100644 index 00000000..c182257d --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/IQmsCheckRuleService.java @@ -0,0 +1,76 @@ +package com.hw.qms.service; + +import java.util.List; +import com.hw.qms.domain.QmsCheckRule; +import com.hw.qms.domain.QmsCheckRuleDetail; +import com.hw.qms.domain.QmsCheckRuleProject; + +/** + * 检验规则维护Service接口 + * + * @author xins + * @date 2024-01-26 + */ +public interface IQmsCheckRuleService +{ + /** + * 查询检验规则维护 + * + * @param checkRuleId 检验规则维护主键 + * @return 检验规则维护 + */ + public QmsCheckRule selectQmsCheckRuleByCheckRuleId(Long checkRuleId); + + /** + * 查询检验规则维护列表 + * + * @param qmsCheckRule 检验规则维护 + * @return 检验规则维护集合 + */ + public List selectQmsCheckRuleList(QmsCheckRule qmsCheckRule); + + /** + * 新增检验规则维护 + * + * @param qmsCheckRule 检验规则维护 + * @return 结果 + */ + public int insertQmsCheckRule(QmsCheckRule qmsCheckRule); + + /** + * 修改检验规则维护 + * + * @param qmsCheckRule 检验规则维护 + * @return 结果 + */ + public int updateQmsCheckRule(QmsCheckRule qmsCheckRule); + + /** + * 批量删除检验规则维护 + * + * @param checkRuleIds 需要删除的检验规则维护主键集合 + * @return 结果 + */ + public int deleteQmsCheckRuleByCheckRuleIds(Long[] checkRuleIds); + + /** + * 删除检验规则维护信息 + * + * @param checkRuleId 检验规则维护主键 + * @return 结果 + */ + public int deleteQmsCheckRuleByCheckRuleId(Long checkRuleId); + + /** + * 批量插入检验规则明细 + * @param checkRuleDetailList + */ + public int batchInsertCheckRuleDetail(List checkRuleDetailList); + + + /** + * 批量插入检验规则项目 + * @param checkRuleProjectList + */ + public int batchInsertCheckRuleProject(List checkRuleProjectList); +} diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/MesBaseBarcodeInfoServiceImpl.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/MesBaseBarcodeInfoServiceImpl.java new file mode 100644 index 00000000..3835a498 --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/MesBaseBarcodeInfoServiceImpl.java @@ -0,0 +1,110 @@ +package com.hw.qms.service.impl; + +import com.hw.common.core.utils.DateUtils; +import com.hw.qms.domain.MesBaseBarcodeInfo; +import com.hw.qms.mapper.MesBaseBarcodeInfoMapper; +import com.hw.qms.service.IMesBaseBarcodeInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 条码信息Service业务层处理 + * + * @author xs + * @date 2023-12-20 + */ +@Service +public class MesBaseBarcodeInfoServiceImpl implements IMesBaseBarcodeInfoService +{ + @Autowired + private MesBaseBarcodeInfoMapper mesBaseBarcodeInfoMapper; + + /** + * 查询条码信息 + * + * @param barcodeInfo 条码信息UID + * @return 条码信息 + */ + @Override + public MesBaseBarcodeInfo selectMesBaseBarcodeInfoByBarcodeInfo(String barcodeInfo) + { + return mesBaseBarcodeInfoMapper.selectMesBaseBarcodeInfoByBarcodeInfo(barcodeInfo); + } + + + /** + * 查询条码信息 + * + * @param barcodeId 条码信息主键 + * @return 条码信息 + */ + @Override + public MesBaseBarcodeInfo selectMesBaseBarcodeInfoByBarcodeId(Long barcodeId) + { + return mesBaseBarcodeInfoMapper.selectMesBaseBarcodeInfoByBarcodeId(barcodeId); + } + + /** + * 查询条码信息列表 + * + * @param mesBaseBarcodeInfo 条码信息 + * @return 条码信息 + */ + @Override + public List selectMesBaseBarcodeInfoList(MesBaseBarcodeInfo mesBaseBarcodeInfo) + { + return mesBaseBarcodeInfoMapper.selectMesBaseBarcodeInfoList(mesBaseBarcodeInfo); + } + + /** + * 新增条码信息 + * + * @param mesBaseBarcodeInfo 条码信息 + * @return 结果 + */ + @Override + public int insertMesBaseBarcodeInfo(MesBaseBarcodeInfo mesBaseBarcodeInfo) + { + mesBaseBarcodeInfo.setCreateTime(DateUtils.getNowDate()); + return mesBaseBarcodeInfoMapper.insertMesBaseBarcodeInfo(mesBaseBarcodeInfo); + } + + /** + * 修改条码信息 + * + * @param mesBaseBarcodeInfo 条码信息 + * @return 结果 + */ + @Override + public int updateMesBaseBarcodeInfo(MesBaseBarcodeInfo mesBaseBarcodeInfo) + { + mesBaseBarcodeInfo.setUpdateTime(DateUtils.getNowDate()); + return mesBaseBarcodeInfoMapper.updateMesBaseBarcodeInfo(mesBaseBarcodeInfo); + } + + /** + * 批量删除条码信息 + * + * @param barcodeIds 需要删除的条码信息主键 + * @return 结果 + */ + @Override + public int deleteMesBaseBarcodeInfoByBarcodeIds(Long[] barcodeIds) + { + return mesBaseBarcodeInfoMapper.deleteMesBaseBarcodeInfoByBarcodeIds(barcodeIds); + } + + /** + * 删除条码信息信息 + * + * @param barcodeId 条码信息主键 + * @return 结果 + */ + @Override + public int deleteMesBaseBarcodeInfoByBarcodeId(Long barcodeId) + { + return mesBaseBarcodeInfoMapper.deleteMesBaseBarcodeInfoByBarcodeId(barcodeId); + } +} diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/MesBaseMaterialInfoServiceImpl.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/MesBaseMaterialInfoServiceImpl.java new file mode 100644 index 00000000..4191b175 --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/MesBaseMaterialInfoServiceImpl.java @@ -0,0 +1,126 @@ +package com.hw.qms.service.impl; + +import com.hw.common.core.utils.DateUtils; +import com.hw.qms.domain.MesBaseMaterialInfo; +import com.hw.qms.mapper.MesBaseMaterialInfoMapper; +import com.hw.qms.service.IMesBaseMaterialInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 物料信息Service业务层处理 + * + * @author xins + * @date 2023-12-21 + */ +@Service +public class MesBaseMaterialInfoServiceImpl implements IMesBaseMaterialInfoService +{ + @Autowired + private MesBaseMaterialInfoMapper mesBaseMaterialInfoMapper; + + /** + * 查询物料信息 + * + * @param materialId 物料信息主键 + * @return 物料信息 + */ + @Override + public MesBaseMaterialInfo selectMesBaseMaterialInfoByMaterialId(Long materialId) + { + return mesBaseMaterialInfoMapper.selectMesBaseMaterialInfoByMaterialId(materialId); + } + + /** + * 查询物料信息列表 + * + * @param mesBaseMaterialInfo 物料信息 + * @return 物料信息 + */ + @Override + public List selectMesBaseMaterialInfoList(MesBaseMaterialInfo mesBaseMaterialInfo) + { + return mesBaseMaterialInfoMapper.selectMesBaseMaterialInfoList(mesBaseMaterialInfo); + } + + /** + * 新增物料信息 + * + * @param mesBaseMaterialInfo 物料信息 + * @return 结果 + */ + @Override + public int insertMesBaseMaterialInfo(MesBaseMaterialInfo mesBaseMaterialInfo) + { + mesBaseMaterialInfo.setCreateTime(DateUtils.getNowDate()); + return mesBaseMaterialInfoMapper.insertMesBaseMaterialInfo(mesBaseMaterialInfo); + } + + /** + * 修改物料信息 + * + * @param mesBaseMaterialInfo 物料信息 + * @return 结果 + */ + @Override + public int updateMesBaseMaterialInfo(MesBaseMaterialInfo mesBaseMaterialInfo) + { + mesBaseMaterialInfo.setUpdateTime(DateUtils.getNowDate()); + return mesBaseMaterialInfoMapper.updateMesBaseMaterialInfo(mesBaseMaterialInfo); + } + + /** + * 批量删除物料信息 + * + * @param materialIds 需要删除的物料信息主键 + * @return 结果 + */ + @Override + public int deleteMesBaseMaterialInfoByMaterialIds(Long[] materialIds) + { + return mesBaseMaterialInfoMapper.deleteMesBaseMaterialInfoByMaterialIds(materialIds); + } + + /** + * 删除物料信息信息 + * + * @param materialId 物料信息主键 + * @return 结果 + */ + @Override + public int deleteMesBaseMaterialInfoByMaterialId(Long materialId) + { + return mesBaseMaterialInfoMapper.deleteMesBaseMaterialInfoByMaterialId(materialId); + } + + + + + /** + * 查询物料信息列表 + * + * @param materialIds 物料信息ID列表 + * @return 物料信息 + */ + @Override + public List selectMesBaseMaterialInfoListByMaterialIds(Long[] materialIds) + { + return mesBaseMaterialInfoMapper.selectMesBaseMaterialInfoListByMaterialIds(materialIds); + } + + + /** + * 查询物料信息列表，提供给仓储配置物料列表使用 + * + * @param mesBaseMaterialInfo 物料信息 + * @return 物料信息 + */ + @Override + public List selectMaterialInfos4AllocateCheckRule(MesBaseMaterialInfo mesBaseMaterialInfo) + { + return mesBaseMaterialInfoMapper.selectMaterialInfos4AllocateCheckRule(mesBaseMaterialInfo); + } + +} diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsCheckProjectServiceImpl.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsCheckProjectServiceImpl.java new file mode 100644 index 00000000..97bdf812 --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsCheckProjectServiceImpl.java @@ -0,0 +1,126 @@ +package com.hw.qms.service.impl; + +import java.util.List; + +import com.hw.common.core.constant.QmsConstants; +import com.hw.common.core.utils.DateUtils; +import com.hw.common.security.utils.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.hw.qms.mapper.QmsCheckProjectMapper; +import com.hw.qms.domain.QmsCheckProject; +import com.hw.qms.service.IQmsCheckProjectService; + +/** + * 检验项目Service业务层处理 + * + * @author xins + * @date 2024-01-23 + */ +@Service +public class QmsCheckProjectServiceImpl implements IQmsCheckProjectService +{ + @Autowired + private QmsCheckProjectMapper qmsCheckProjectMapper; + + /** + * 查询检验项目 + * + * @param checkProjectId 检验项目主键 + * @return 检验项目 + */ + @Override + public QmsCheckProject selectQmsCheckProjectByCheckProjectId(Long checkProjectId) + { + return qmsCheckProjectMapper.selectQmsCheckProjectByCheckProjectId(checkProjectId); + } + + /** + * 查询检验项目列表 + * + * @param qmsCheckProject 检验项目 + * @return 检验项目 + */ + @Override + public List selectQmsCheckProjectList(QmsCheckProject qmsCheckProject) + { + return qmsCheckProjectMapper.selectQmsCheckProjectList(qmsCheckProject); + } + + /** + * 新增检验项目 + * + * @param qmsCheckProject 检验项目 + * @return 结果 + */ + @Override + public int insertQmsCheckProject(QmsCheckProject qmsCheckProject) + { + qmsCheckProject.setCreateBy(SecurityUtils.getUsername()); + qmsCheckProject.setCreateTime(DateUtils.getNowDate()); + return qmsCheckProjectMapper.insertQmsCheckProject(qmsCheckProject); + } + + /** + * 修改检验项目 + * + * @param qmsCheckProject 检验项目 + * @return 结果 + */ + @Override + public int updateQmsCheckProject(QmsCheckProject qmsCheckProject) + { + String checkProjectProperty = qmsCheckProject.getCheckProjectProperty(); + if(checkProjectProperty.equals(QmsConstants.QMS_CHECK_PROJECT_PROPERTY_QUALITATIVE)){ + qmsCheckProject.setStandardValue(null); + qmsCheckProject.setUpperDiff(null); + qmsCheckProject.setDownDiff(null); + } + + qmsCheckProject.setUpdateBy(SecurityUtils.getUsername()); + qmsCheckProject.setUpdateTime(DateUtils.getNowDate()); + return qmsCheckProjectMapper.updateQmsCheckProject(qmsCheckProject); + } + + /** + * 批量删除检验项目 + * + * @param checkProjectIds 需要删除的检验项目主键 + * @return 结果 + */ + @Override + public int deleteQmsCheckProjectByCheckProjectIds(Long[] checkProjectIds) + { + return qmsCheckProjectMapper.deleteQmsCheckProjectByCheckProjectIds(checkProjectIds); + } + + /** + * 删除检验项目信息 + * + * @param checkProjectId 检验项目主键 + * @return 结果 + */ + @Override + public int deleteQmsCheckProjectByCheckProjectId(Long checkProjectId) + { + return qmsCheckProjectMapper.deleteQmsCheckProjectByCheckProjectId(checkProjectId); + } + + + + + + + /** + * 查询检验项目列表,提供给检验规则查询未分配项目使用 + * + * @param qmsCheckProject 检验项目 + * @return 检验项目 + */ + @Override + public List selectQmsCheckProjects4AllocateCheckRule(QmsCheckProject qmsCheckProject) + { + return qmsCheckProjectMapper.selectQmsCheckProjects4AllocateCheckRule(qmsCheckProject); + } + +} diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsCheckResultDetailServiceImpl.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsCheckResultDetailServiceImpl.java new file mode 100644 index 00000000..74052fb8 --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsCheckResultDetailServiceImpl.java @@ -0,0 +1,144 @@ +package com.hw.qms.service.impl; + +import java.util.List; + +import com.hw.common.core.constant.QmsConstants; +import com.hw.common.core.utils.DateUtils; +import com.hw.qms.domain.MesBaseBarcodeInfo; +import com.hw.qms.domain.QmsCheckRuleProject; +import com.hw.qms.domain.vo.QmsMaterialCheckVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; + +import com.hw.common.core.utils.StringUtils; +import org.springframework.transaction.annotation.Transactional; +import com.hw.qms.domain.QmsCheckResultDetailProject; +import com.hw.qms.mapper.QmsCheckResultDetailMapper; +import com.hw.qms.domain.QmsCheckResultDetail; +import com.hw.qms.service.IQmsCheckResultDetailService; + +/** + * 质检结果详情Service业务层处理 + * + * @author xins + * @date 2024-01-23 + */ +@Service +public class QmsCheckResultDetailServiceImpl implements IQmsCheckResultDetailService { + @Autowired + private QmsCheckResultDetailMapper qmsCheckResultDetailMapper; + + /** + * 查询质检结果详情 + * + * @param checkResultDetailId 质检结果详情主键 + * @return 质检结果详情 + */ + @Override + public QmsCheckResultDetail selectQmsCheckResultDetailByCheckResultDetailId(Long checkResultDetailId) { + return qmsCheckResultDetailMapper.selectQmsCheckResultDetailByCheckResultDetailId(checkResultDetailId); + } + + /** + * 查询质检结果详情列表 + * + * @param qmsCheckResultDetail 质检结果详情 + * @return 质检结果详情 + */ + @Override + public List selectQmsCheckResultDetailList(QmsCheckResultDetail qmsCheckResultDetail) { + return qmsCheckResultDetailMapper.selectQmsCheckResultDetailList(qmsCheckResultDetail); + } + + /** + * 新增质检结果详情 + * + * @param qmsCheckResultDetail 质检结果详情 + * @return 结果 + */ + @Transactional + @Override + public int insertQmsCheckResultDetail(QmsCheckResultDetail qmsCheckResultDetail) { + qmsCheckResultDetail.setCreateTime(DateUtils.getNowDate()); + int rows = qmsCheckResultDetailMapper.insertQmsCheckResultDetail(qmsCheckResultDetail); + insertQmsCheckResultDetailProject(qmsCheckResultDetail); + return rows; + } + + /** + * 修改质检结果详情 + * + * @param qmsCheckResultDetail 质检结果详情 + * @return 结果 + */ + @Transactional + @Override + public int updateQmsCheckResultDetail(QmsCheckResultDetail qmsCheckResultDetail) { + qmsCheckResultDetail.setUpdateTime(DateUtils.getNowDate()); + qmsCheckResultDetailMapper.deleteQmsCheckResultDetailProjectByCheckResultDetailId(qmsCheckResultDetail.getCheckResultDetailId()); + insertQmsCheckResultDetailProject(qmsCheckResultDetail); + return qmsCheckResultDetailMapper.updateQmsCheckResultDetail(qmsCheckResultDetail); + } + + /** + * 批量删除质检结果详情 + * + * @param checkResultDetailIds 需要删除的质检结果详情主键 + * @return 结果 + */ + @Transactional + @Override + public int deleteQmsCheckResultDetailByCheckResultDetailIds(Long[] checkResultDetailIds) { + qmsCheckResultDetailMapper.deleteQmsCheckResultDetailProjectByCheckResultDetailIds(checkResultDetailIds); + return qmsCheckResultDetailMapper.deleteQmsCheckResultDetailByCheckResultDetailIds(checkResultDetailIds); + } + + /** + * 删除质检结果详情信息 + * + * @param checkResultDetailId 质检结果详情主键 + * @return 结果 + */ + @Transactional + @Override + public int deleteQmsCheckResultDetailByCheckResultDetailId(Long checkResultDetailId) { + qmsCheckResultDetailMapper.deleteQmsCheckResultDetailProjectByCheckResultDetailId(checkResultDetailId); + return qmsCheckResultDetailMapper.deleteQmsCheckResultDetailByCheckResultDetailId(checkResultDetailId); + } + + /** + * 新增质检结果详情项目信息信息 + * + * @param qmsCheckResultDetail 质检结果详情对象 + */ + public void insertQmsCheckResultDetailProject(QmsCheckResultDetail qmsCheckResultDetail) { + List qmsCheckResultDetailProjectList = qmsCheckResultDetail.getQmsCheckResultDetailProjectList(); + Long checkResultDetailId = qmsCheckResultDetail.getCheckResultDetailId(); + if (StringUtils.isNotNull(qmsCheckResultDetailProjectList)) { + List list = new ArrayList(); + for (QmsCheckResultDetailProject qmsCheckResultDetailProject : qmsCheckResultDetailProjectList) { + qmsCheckResultDetailProject.setCheckResultDetailId(checkResultDetailId); + list.add(qmsCheckResultDetailProject); + } + if (list.size() > 0) { + qmsCheckResultDetailMapper.batchQmsCheckResultDetailProject(list); + } + } + } + + + /** + * 获取质检结果详情 + * @param materialBarcode 物料条码 + * @return + */ + @Override + public QmsCheckResultDetail getCheckResultDetail(String materialBarcode) { + //现获取质检结果with质检项目结果详情信息 + QmsCheckResultDetail checkResultDetail = qmsCheckResultDetailMapper.selectQmsCheckResultDetailByMaterialBarcode(materialBarcode); + return checkResultDetail; + } + +} diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsCheckResultServiceImpl.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsCheckResultServiceImpl.java new file mode 100644 index 00000000..d27d5390 --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsCheckResultServiceImpl.java @@ -0,0 +1,144 @@ +package com.hw.qms.service.impl; + +import java.util.List; + +import com.hw.common.core.constant.QmsConstants; +import com.hw.common.core.utils.DateUtils; +import com.hw.qms.domain.MesBaseBarcodeInfo; +import com.hw.qms.domain.QmsCheckRuleProject; +import com.hw.qms.domain.vo.QmsMaterialCheckVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.util.ArrayList; +import com.hw.common.core.utils.StringUtils; +import org.springframework.transaction.annotation.Transactional; +import com.hw.qms.domain.QmsCheckResultDetail; +import com.hw.qms.mapper.QmsCheckResultMapper; +import com.hw.qms.domain.QmsCheckResult; +import com.hw.qms.service.IQmsCheckResultService; + +/** + * 质检结果Service业务层处理 + * + * @author xins + * @date 2024-01-23 + */ +@Service +public class QmsCheckResultServiceImpl implements IQmsCheckResultService +{ + @Autowired + private QmsCheckResultMapper qmsCheckResultMapper; + + /** + * 查询质检结果 + * + * @param checkResultId 质检结果主键 + * @return 质检结果 + */ + @Override + public QmsCheckResult selectQmsCheckResultByCheckResultId(Long checkResultId) + { + return qmsCheckResultMapper.selectQmsCheckResultByCheckResultId(checkResultId); + } + + /** + * 查询质检结果列表 + * + * @param qmsCheckResult 质检结果 + * @return 质检结果 + */ + @Override + public List selectQmsCheckResultList(QmsCheckResult qmsCheckResult) + { + return qmsCheckResultMapper.selectQmsCheckResultList(qmsCheckResult); + } + + /** + * 新增质检结果 + * + * @param qmsCheckResult 质检结果 + * @return 结果 + */ + @Transactional + @Override + public int insertQmsCheckResult(QmsCheckResult qmsCheckResult) + { + qmsCheckResult.setCreateTime(DateUtils.getNowDate()); + int rows = qmsCheckResultMapper.insertQmsCheckResult(qmsCheckResult); + insertQmsCheckResultDetail(qmsCheckResult); + return rows; + } + + /** + * 修改质检结果 + * + * @param qmsCheckResult 质检结果 + * @return 结果 + */ + @Transactional + @Override + public int updateQmsCheckResult(QmsCheckResult qmsCheckResult) + { + qmsCheckResult.setUpdateTime(DateUtils.getNowDate()); + qmsCheckResultMapper.deleteQmsCheckResultDetailByCheckResultId(qmsCheckResult.getCheckResultId()); + insertQmsCheckResultDetail(qmsCheckResult); + return qmsCheckResultMapper.updateQmsCheckResult(qmsCheckResult); + } + + /** + * 批量删除质检结果 + * + * @param checkResultIds 需要删除的质检结果主键 + * @return 结果 + */ + @Transactional + @Override + public int deleteQmsCheckResultByCheckResultIds(Long[] checkResultIds) + { + qmsCheckResultMapper.deleteQmsCheckResultDetailByCheckResultIds(checkResultIds); + return qmsCheckResultMapper.deleteQmsCheckResultByCheckResultIds(checkResultIds); + } + + /** + * 删除质检结果信息 + * + * @param checkResultId 质检结果主键 + * @return 结果 + */ + @Transactional + @Override + public int deleteQmsCheckResultByCheckResultId(Long checkResultId) + { + qmsCheckResultMapper.deleteQmsCheckResultDetailByCheckResultId(checkResultId); + return qmsCheckResultMapper.deleteQmsCheckResultByCheckResultId(checkResultId); + } + + /** + * 新增质检结果详情信息 + * + * @param qmsCheckResult 质检结果对象 + */ + public void insertQmsCheckResultDetail(QmsCheckResult qmsCheckResult) + { + List qmsCheckResultDetailList = qmsCheckResult.getQmsCheckResultDetailList(); + Long checkResultId = qmsCheckResult.getCheckResultId(); + if (StringUtils.isNotNull(qmsCheckResultDetailList)) + { + List list = new ArrayList(); + for (QmsCheckResultDetail qmsCheckResultDetail : qmsCheckResultDetailList) + { + qmsCheckResultDetail.setCheckResultId(checkResultId); + list.add(qmsCheckResultDetail); + } + if (list.size() > 0) + { + qmsCheckResultMapper.batchQmsCheckResultDetail(list); + } + } + } + + + + + +} diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsCheckRuleDetailServiceImpl.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsCheckRuleDetailServiceImpl.java new file mode 100644 index 00000000..5bd4fde1 --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsCheckRuleDetailServiceImpl.java @@ -0,0 +1,129 @@ +package com.hw.qms.service.impl; + +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.hw.qms.mapper.QmsCheckRuleDetailMapper; +import com.hw.qms.domain.QmsCheckRuleDetail; +import com.hw.qms.service.IQmsCheckRuleDetailService; + +/** + * 检验规则明细Service业务层处理 + * + * @author xins + * @date 2024-01-26 + */ +@Service +public class QmsCheckRuleDetailServiceImpl implements IQmsCheckRuleDetailService +{ + @Autowired + private QmsCheckRuleDetailMapper qmsCheckRuleDetailMapper; + + /** + * 查询检验规则明细 + * + * @param checkRuleId 检验规则明细主键 + * @return 检验规则明细 + */ + @Override + public QmsCheckRuleDetail selectQmsCheckRuleDetailByCheckRuleId(Long checkRuleId) + { + return qmsCheckRuleDetailMapper.selectQmsCheckRuleDetailByCheckRuleId(checkRuleId); + } + + /** + * 查询检验规则明细列表 + * + * @param qmsCheckRuleDetail 检验规则明细 + * @return 检验规则明细 + */ + @Override + public List selectQmsCheckRuleDetailList(QmsCheckRuleDetail qmsCheckRuleDetail) + { + return qmsCheckRuleDetailMapper.selectQmsCheckRuleDetailList(qmsCheckRuleDetail); + } + + /** + * 新增检验规则明细 + * + * @param qmsCheckRuleDetail 检验规则明细 + * @return 结果 + */ + @Override + public int insertQmsCheckRuleDetail(QmsCheckRuleDetail qmsCheckRuleDetail) + { + return qmsCheckRuleDetailMapper.insertQmsCheckRuleDetail(qmsCheckRuleDetail); + } + + /** + * 修改检验规则明细 + * + * @param qmsCheckRuleDetail 检验规则明细 + * @return 结果 + */ + @Override + public int updateQmsCheckRuleDetail(QmsCheckRuleDetail qmsCheckRuleDetail) + { + return qmsCheckRuleDetailMapper.updateQmsCheckRuleDetail(qmsCheckRuleDetail); + } + + /** + * 批量删除检验规则明细 + * + * @param checkRuleIds 需要删除的检验规则明细主键 + * @return 结果 + */ + @Override + public int deleteQmsCheckRuleDetailByCheckRuleIds(Long[] checkRuleIds) + { + return qmsCheckRuleDetailMapper.deleteQmsCheckRuleDetailByCheckRuleIds(checkRuleIds); + } + + /** + * 删除检验规则明细信息 + * + * @param checkRuleId 检验规则明细主键 + * @return 结果 + */ + @Override + public int deleteQmsCheckRuleDetailByCheckRuleId(Long checkRuleId) + { + return qmsCheckRuleDetailMapper.deleteQmsCheckRuleDetailByCheckRuleId(checkRuleId); + } + + + + + + + + + + + /** + * 查询检验规则明细列表,Join material + * + * @param qmsCheckRuleDetail 检验规则明细 + * @return 检验规则明细 + */ + @Override + public List selectQmsCheckRuleDetailJoinList(QmsCheckRuleDetail qmsCheckRuleDetail) + { + return qmsCheckRuleDetailMapper.selectQmsCheckRuleDetailJoinList(qmsCheckRuleDetail); + } + + + /** + * 批量删除检验规则明细 + * + * @param checkRuleDetailList 需要删除的检验规则明细列表 + * @return 结果 + */ + @Override + public int deleteQmsCheckRuleDetails(List checkRuleDetailList) + { + return qmsCheckRuleDetailMapper.deleteQmsCheckRuleDetails(checkRuleDetailList); + } + + +} diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsCheckRuleProjectServiceImpl.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsCheckRuleProjectServiceImpl.java new file mode 100644 index 00000000..141126c9 --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsCheckRuleProjectServiceImpl.java @@ -0,0 +1,134 @@ +package com.hw.qms.service.impl; + +import java.util.List; + +import com.hw.common.core.constant.QmsConstants; +import com.hw.qms.domain.MesBaseBarcodeInfo; +import com.hw.qms.domain.QmsCheckResultDetail; +import com.hw.qms.domain.QmsCheckRuleDetail; +import com.hw.qms.domain.vo.QmsMaterialCheckVo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.hw.qms.mapper.QmsCheckRuleProjectMapper; +import com.hw.qms.domain.QmsCheckRuleProject; +import com.hw.qms.service.IQmsCheckRuleProjectService; + +/** + * 检验规则项目Service业务层处理 + * + * @author xins + * @date 2024-01-23 + */ +@Service +public class QmsCheckRuleProjectServiceImpl implements IQmsCheckRuleProjectService { + @Autowired + private QmsCheckRuleProjectMapper qmsCheckRuleProjectMapper; + + /** + * 查询检验规则项目 + * + * @param checkRuleId 检验规则项目主键 + * @return 检验规则项目 + */ + @Override + public QmsCheckRuleProject selectQmsCheckRuleProjectByCheckRuleId(Long checkRuleId) { + return qmsCheckRuleProjectMapper.selectQmsCheckRuleProjectByCheckRuleId(checkRuleId); + } + + /** + * 查询检验规则项目列表 + * + * @param qmsCheckRuleProject 检验规则项目 + * @return 检验规则项目 + */ + @Override + public List selectQmsCheckRuleProjectList(QmsCheckRuleProject qmsCheckRuleProject) { + return qmsCheckRuleProjectMapper.selectQmsCheckRuleProjectList(qmsCheckRuleProject); + } + + /** + * 新增检验规则项目 + * + * @param qmsCheckRuleProject 检验规则项目 + * @return 结果 + */ + @Override + public int insertQmsCheckRuleProject(QmsCheckRuleProject qmsCheckRuleProject) { + return qmsCheckRuleProjectMapper.insertQmsCheckRuleProject(qmsCheckRuleProject); + } + + /** + * 修改检验规则项目 + * + * @param qmsCheckRuleProject 检验规则项目 + * @return 结果 + */ + @Override + public int updateQmsCheckRuleProject(QmsCheckRuleProject qmsCheckRuleProject) { + return qmsCheckRuleProjectMapper.updateQmsCheckRuleProject(qmsCheckRuleProject); + } + + /** + * 批量删除检验规则项目 + * + * @param checkRuleIds 需要删除的检验规则项目主键 + * @return 结果 + */ + @Override + public int deleteQmsCheckRuleProjectByCheckRuleIds(Long[] checkRuleIds) { + return qmsCheckRuleProjectMapper.deleteQmsCheckRuleProjectByCheckRuleIds(checkRuleIds); + } + + /** + * 删除检验规则项目信息 + * + * @param checkRuleId 检验规则项目主键 + * @return 结果 + */ + @Override + public int deleteQmsCheckRuleProjectByCheckRuleId(Long checkRuleId) { + return qmsCheckRuleProjectMapper.deleteQmsCheckRuleProjectByCheckRuleId(checkRuleId); + } + + + /** + * 获取检验规则项目 + * @param materialId 物料ID + * @return + */ + @Override + public List getCheckRuleProjects(Long materialId) { + QmsCheckRuleProject queryCheckRuleProject = new QmsCheckRuleProject(); + queryCheckRuleProject.setTargetType(QmsConstants.QMS_CHECK_RULE_DETAIL_TARGET_TYPE_MATERIAL); + queryCheckRuleProject.setTargetId(materialId); + + List checkRuleProjects = qmsCheckRuleProjectMapper.selectQmsCheckRuleProjectListByTarget(queryCheckRuleProject); + + return checkRuleProjects; + } + + + + /** + * 查询检验规则项目列表,Join checkproject + * + * @param qmsCheckRuleProject 检验规则项目 + * @return 检验规则项目 + */ + @Override + public List selectQmsCheckRuleProjectJoinList(QmsCheckRuleProject qmsCheckRuleProject) { + return qmsCheckRuleProjectMapper.selectQmsCheckRuleProjectJoinList(qmsCheckRuleProject); + } + + /** + * 批量删除检验规则项目 + * + * @param checkRuleProjectList 需要删除的检验规则项目列表 + * @return 结果 + */ + @Override + public int deleteQmsCheckRuleProjects(List checkRuleProjectList) + { + return qmsCheckRuleProjectMapper.deleteQmsCheckRuleProjects(checkRuleProjectList); + } +} diff --git a/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsCheckRuleServiceImpl.java b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsCheckRuleServiceImpl.java new file mode 100644 index 00000000..ffca6733 --- /dev/null +++ b/hw-modules/hw-qms/src/main/java/com/hw/qms/service/impl/QmsCheckRuleServiceImpl.java @@ -0,0 +1,171 @@ +package com.hw.qms.service.impl; + +import java.util.Date; +import java.util.List; + +import com.hw.common.core.constant.QmsConstants; +import com.hw.common.core.constant.WmsConstants; +import com.hw.common.core.utils.DateUtils; +import com.hw.common.security.utils.SecurityUtils; +import com.hw.qms.domain.*; +import com.hw.qms.domain.vo.QmsMaterialCheckVo; +import com.hw.qms.mapper.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; + +import com.hw.common.core.utils.StringUtils; +import org.springframework.transaction.annotation.Transactional; +import com.hw.qms.service.IQmsCheckRuleService; + +/** + * 检验规则维护Service业务层处理 + * + * @author xins + * @date 2024-01-25 + */ +@Service +public class QmsCheckRuleServiceImpl implements IQmsCheckRuleService { + @Autowired + private QmsCheckRuleMapper qmsCheckRuleMapper; + + @Autowired + private QmsCheckResultDetailMapper qmsCheckResultDetailMapper; + + + /** + * 查询检验规则维护 + * + * @param checkRuleId 检验规则维护主键 + * @return 检验规则维护 + */ + @Override + public QmsCheckRule selectQmsCheckRuleByCheckRuleId(Long checkRuleId) { + return qmsCheckRuleMapper.selectQmsCheckRuleByCheckRuleId(checkRuleId); + } + + /** + * 查询检验规则维护列表 + * + * @param qmsCheckRule 检验规则维护 + * @return 检验规则维护 + */ + @Override + public List selectQmsCheckRuleList(QmsCheckRule qmsCheckRule) { + return qmsCheckRuleMapper.selectQmsCheckRuleList(qmsCheckRule); + } + + /** + * 新增检验规则维护 + * + * @param qmsCheckRule 检验规则维护 + * @return 结果 + */ + @Transactional + @Override + public int insertQmsCheckRule(QmsCheckRule qmsCheckRule) { + qmsCheckRule.setCreateBy(SecurityUtils.getUsername()); + qmsCheckRule.setCreateTime(DateUtils.getNowDate()); + if (qmsCheckRule.getCheckMode().equals(QmsConstants.QMS_CHECK_MODE)) { + qmsCheckRule.setCheckSample(null); + } + + int rows = qmsCheckRuleMapper.insertQmsCheckRule(qmsCheckRule); + insertQmsCheckRuleProject(qmsCheckRule); + return rows; + } + + /** + * 修改检验规则维护 + * + * @param qmsCheckRule 检验规则维护 + * @return 结果 + */ + @Transactional + @Override + public int updateQmsCheckRule(QmsCheckRule qmsCheckRule) { + qmsCheckRule.setUpdateBy(SecurityUtils.getUsername()); + qmsCheckRule.setUpdateTime(DateUtils.getNowDate()); + if (qmsCheckRule.getCheckMode().equals(QmsConstants.QMS_CHECK_MODE)) { + qmsCheckRule.setCheckSample(null); + } + qmsCheckRuleMapper.deleteQmsCheckRuleProjectByCheckRuleId(qmsCheckRule.getCheckRuleId()); + insertQmsCheckRuleProject(qmsCheckRule); + return qmsCheckRuleMapper.updateQmsCheckRule(qmsCheckRule); + } + + /** + * 批量删除检验规则维护 + * + * @param checkRuleIds 需要删除的检验规则维护主键 + * @return 结果 + */ + @Transactional + @Override + public int deleteQmsCheckRuleByCheckRuleIds(Long[] checkRuleIds) { + qmsCheckRuleMapper.deleteQmsCheckRuleProjectByCheckRuleIds(checkRuleIds); + return qmsCheckRuleMapper.deleteQmsCheckRuleByCheckRuleIds(checkRuleIds); + } + + /** + * 删除检验规则维护信息 + * + * @param checkRuleId 检验规则维护主键 + * @return 结果 + */ + @Transactional + @Override + public int deleteQmsCheckRuleByCheckRuleId(Long checkRuleId) { + qmsCheckRuleMapper.deleteQmsCheckRuleProjectByCheckRuleId(checkRuleId); + return qmsCheckRuleMapper.deleteQmsCheckRuleByCheckRuleId(checkRuleId); + } + + + /** + * 新增检验规则项目信息 + * + * @param qmsCheckRule 检验规则维护对象 + */ + public void insertQmsCheckRuleProject(QmsCheckRule qmsCheckRule) + { + List qmsCheckRuleProjectList = qmsCheckRule.getQmsCheckRuleProjectList(); + Long checkRuleId = qmsCheckRule.getCheckRuleId(); + if (StringUtils.isNotNull(qmsCheckRuleProjectList)) + { + List list = new ArrayList(); + for (QmsCheckRuleProject qmsCheckRuleProject : qmsCheckRuleProjectList) + { + qmsCheckRuleProject.setCheckRuleId(checkRuleId); + list.add(qmsCheckRuleProject); + } + if (list.size() > 0) + { + qmsCheckRuleMapper.batchQmsCheckRuleProject(list); + } + } + } + + + /** + * 批量插入检验规则明细 + * @param checkRuleDetailList + */ + @Override + public int batchInsertCheckRuleDetail(List checkRuleDetailList) { + return qmsCheckRuleMapper.batchQmsCheckRuleDetail(checkRuleDetailList); + } + + + /** + * 批量插入检验规则项目 + * @param checkRuleProjectList + */ + @Override + public int batchInsertCheckRuleProject(List checkRuleProjectList) { + return qmsCheckRuleMapper.batchQmsCheckRuleProject(checkRuleProjectList); + } + + + +} diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsApiController.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsApiController.java index aebba3ad..c236c4d8 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsApiController.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsApiController.java @@ -3,13 +3,12 @@ package com.hw.wms.controller; import com.hw.common.core.constant.WmsConstants; import com.hw.common.core.web.controller.BaseController; import com.hw.common.core.web.domain.AjaxResult; +import com.hw.common.core.web.page.TableDataInfo; import com.hw.common.log.annotation.Log; import com.hw.common.log.enums.BusinessType; -import com.hw.wms.domain.WmsRawOutstock; -import com.hw.wms.domain.WmsRawOutstockDetail; -import com.hw.wms.domain.WmsRawReturn; -import com.hw.wms.domain.WmsRawReturnDetail; +import com.hw.wms.domain.*; import com.hw.wms.domain.vo.*; +import com.hw.wms.service.IWmsBaseWarehouseService; import com.hw.wms.service.IWmsRawInstockService; import com.hw.wms.service.IWmsRawOutstockService; import com.hw.wms.service.IWmsRawReturnService; @@ -26,8 +25,10 @@ import java.util.List; * @date 2023-12-26 */ @RestController -@RequestMapping("/wms/api") +@RequestMapping("/api") public class WmsApiController extends BaseController { + @Autowired + private IWmsBaseWarehouseService wmsBaseWarehouseService; @Autowired private IWmsRawOutstockService wmsRawOutstockService; @@ -36,6 +37,17 @@ public class WmsApiController extends BaseController { private IWmsRawReturnService wmsRawReturnService; + /** + * 查询仓库列表 + */ +// @RequiresPermissions("wms:rawoutstock:list") + @GetMapping("/getWarehouses") + public AjaxResult getWarehouses(WmsBaseWarehouse queryBaseWarehouse) { + List list = wmsBaseWarehouseService.selectWmsBaseWarehouseList(queryBaseWarehouse); + return success(list); + } + + /** * 申请领料 */ diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsMobileController.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsMobileController.java index 29733c85..d79d1fd8 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsMobileController.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsMobileController.java @@ -1,6 +1,9 @@ package com.hw.wms.controller; +import com.hw.common.core.constant.SecurityConstants; import com.hw.common.core.constant.WmsConstants; +import com.hw.common.core.domain.R; +import com.hw.common.core.exception.ServiceException; import com.hw.common.core.utils.poi.ExcelUtil; import com.hw.common.core.utils.uuid.Seq; import com.hw.common.core.web.controller.BaseController; @@ -9,14 +12,19 @@ import com.hw.common.core.web.page.TableDataInfo; import com.hw.common.log.annotation.Log; import com.hw.common.log.enums.BusinessType; import com.hw.common.security.annotation.RequiresPermissions; +import com.hw.mes.api.RemoteMesService; +import com.hw.mes.api.domain.MesBaseBarcodeInfo; import com.hw.wms.domain.*; import com.hw.wms.domain.vo.*; import com.hw.wms.service.*; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; import javafx.scene.control.Tab; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; import javax.servlet.ServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -28,7 +36,7 @@ import java.util.List; * @date 2023-12-20 */ @RestController -@RequestMapping("/wms/mobile") +@RequestMapping("/mobile") public class WmsMobileController extends BaseController { @Autowired private IWmsRawInstockService wmsRawInstockService; @@ -60,6 +68,29 @@ public class WmsMobileController extends BaseController { @Autowired private IWmsProductStockService wmsProductStockService; + @Resource + private RemoteMesService remoteMesService; + + /** + * 根据物料条码获取条码信息 + */ +// @RequiresPermissions("wms:rawoutstock:query") + @GetMapping(value = "/getBaseBarcodeInfo/{materialBarcode}") + public AjaxResult getBaseBarcodeInfo(@PathVariable("materialBarcode") String materialBarcode) { + R baseBarcodeInfoR = remoteMesService.getBarcode(materialBarcode, SecurityConstants.INNER); + if (baseBarcodeInfoR == null) { + throw new ServiceException("物料编码有误"); + } + + MesBaseBarcodeInfo baseBarcodeInfo = baseBarcodeInfoR.getData(); + if (baseBarcodeInfo == null) { + throw new ServiceException("物料编码有误"); + } + + return success(baseBarcodeInfo); + } + + /** * 新增原材料入库记录 */ @@ -226,7 +257,7 @@ public class WmsMobileController extends BaseController { */ // @RequiresPermissions("wms:rawoutstock:query") @GetMapping(value = "/getProductStocksByWarehouseId") - public TableDataInfo getProductStocksByWarehouseId( WmsProductStock queryProductStock) { + public TableDataInfo getProductStocksByWarehouseId(WmsProductStock queryProductStock) { startPage(); // WmsProductStock queryProductStock = new WmsProductStock(); // queryProductStock.setWarehouseId(Long.valueOf(request.getParameter("warehouseId"))); @@ -331,8 +362,8 @@ public class WmsMobileController extends BaseController { WmsProductOutstockDetail queryProductOutstockDetail = new WmsProductOutstockDetail(); List productOutstockDetails = wmsProductOutstockDetailService.selectWmsProductOutstockDetailList(queryProductOutstockDetail); - ajax.put("productOutstock",productOutstock); - ajax.put("productOutstockDetails",productOutstockDetails); + ajax.put("productOutstock", productOutstock); + ajax.put("productOutstockDetails", productOutstockDetails); return ajax; } @@ -346,17 +377,6 @@ public class WmsMobileController extends BaseController { } - - - - - - - - - - - /** * 人工移库 */ diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsMoveController.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsMoveController.java index f7bed411..4b162c3b 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsMoveController.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/controller/WmsMoveController.java @@ -3,6 +3,9 @@ package com.hw.wms.controller; import java.util.List; import java.io.IOException; import javax.servlet.http.HttpServletResponse; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -24,10 +27,11 @@ import com.hw.common.core.web.page.TableDataInfo; /** * 移库合库记录Controller - * + * * @author xins * @date 2024-01-09 */ +@Api(tags = "cangchu1",description = "dd1") @RestController @RequestMapping("/move") public class WmsMoveController extends BaseController @@ -38,6 +42,7 @@ public class WmsMoveController extends BaseController /** * 查询移库合库记录列表 */ + @ApiOperation("cccc") @RequiresPermissions("wms:move:list") @GetMapping("/list") public TableDataInfo list(WmsMove wmsMove) diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsProductStock.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsProductStock.java index 451805d5..a97dd229 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsProductStock.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsProductStock.java @@ -25,6 +25,10 @@ public class WmsProductStock extends BaseEntity @Excel(name = "仓库ID") private Long warehouseId; + /** 仓库楼层 */ + @Excel(name = "仓库楼层") + private Long warehouseFloor; + /** 库位编码 */ @Excel(name = "库位编码") private String locationCode; @@ -118,6 +122,15 @@ public class WmsProductStock extends BaseEntity { return warehouseId; } + + public Long getWarehouseFloor() { + return warehouseFloor; + } + + public void setWarehouseFloor(Long warehouseFloor) { + this.warehouseFloor = warehouseFloor; + } + public void setLocationCode(String locationCode) { this.locationCode = locationCode; diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawOutstockDetail.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawOutstockDetail.java index 7ba42573..2395edf9 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawOutstockDetail.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawOutstockDetail.java @@ -25,6 +25,10 @@ public class WmsRawOutstockDetail extends BaseEntity @Excel(name = "原材料出库ID") private Long rawOutstockId; + /** 仓库ID */ + @Excel(name = "仓库ID") + private Long warehouseId; + /** 库位编码 */ @Excel(name = "库位编码") private String locationCode; @@ -126,6 +130,15 @@ public class WmsRawOutstockDetail extends BaseEntity { return rawOutstockId; } + + public Long getWarehouseId() { + return warehouseId; + } + + public void setWarehouseId(Long warehouseId) { + this.warehouseId = warehouseId; + } + public void setLocationCode(String locationCode) { this.locationCode = locationCode; diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawStock.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawStock.java index cd1e7785..39aae9a4 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawStock.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/domain/WmsRawStock.java @@ -25,6 +25,10 @@ public class WmsRawStock extends BaseEntity @Excel(name = "仓库ID") private Long warehouseId; + /** 仓库楼层 */ + @Excel(name = "仓库楼层") + private Long warehouseFloor; + /** 库位编码 */ @Excel(name = "库位编码") private String locationCode; @@ -85,22 +89,6 @@ public class WmsRawStock extends BaseEntity @Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd") private Date updateDate; - /** 物料组1，主关件、辅料、大宗（预留） */ - @Excel(name = "物料组1，主关件、辅料、大宗", readConverterExp = "预=留") - private String materialGroup1; - - /** 物料组2，未定（预留） */ - @Excel(name = "物料组2，未定", readConverterExp = "预=留") - private String materialGroup2; - - /** 物料组3，未定（预留） */ - @Excel(name = "物料组3，未定", readConverterExp = "预=留") - private String materialGroup3; - - /** 不良品库存数量 */ - @Excel(name = "不良品库存数量") - private BigDecimal defAmount; - /** 有效标记 */ @Excel(name = "有效标记") private String activeFlag; @@ -123,6 +111,15 @@ public class WmsRawStock extends BaseEntity { return warehouseId; } + + public Long getWarehouseFloor() { + return warehouseFloor; + } + + public void setWarehouseFloor(Long warehouseFloor) { + this.warehouseFloor = warehouseFloor; + } + public void setLocationCode(String locationCode) { this.locationCode = locationCode; @@ -249,42 +246,6 @@ public class WmsRawStock extends BaseEntity { return updateDate; } - public void setMaterialGroup1(String materialGroup1) - { - this.materialGroup1 = materialGroup1; - } - - public String getMaterialGroup1() - { - return materialGroup1; - } - public void setMaterialGroup2(String materialGroup2) - { - this.materialGroup2 = materialGroup2; - } - - public String getMaterialGroup2() - { - return materialGroup2; - } - public void setMaterialGroup3(String materialGroup3) - { - this.materialGroup3 = materialGroup3; - } - - public String getMaterialGroup3() - { - return materialGroup3; - } - public void setDefAmount(BigDecimal defAmount) - { - this.defAmount = defAmount; - } - - public BigDecimal getDefAmount() - { - return defAmount; - } public void setActiveFlag(String activeFlag) { this.activeFlag = activeFlag; @@ -315,10 +276,6 @@ public class WmsRawStock extends BaseEntity .append("createDate", getCreateDate()) .append("updateBy", getUpdateBy()) .append("updateDate", getUpdateDate()) - .append("materialGroup1", getMaterialGroup1()) - .append("materialGroup2", getMaterialGroup2()) - .append("materialGroup3", getMaterialGroup3()) - .append("defAmount", getDefAmount()) .append("activeFlag", getActiveFlag()) .toString(); } diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsRawInstockServiceImpl.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsRawInstockServiceImpl.java index da5cda44..8726f945 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsRawInstockServiceImpl.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsRawInstockServiceImpl.java @@ -249,7 +249,8 @@ public class WmsRawInstockServiceImpl implements IWmsRawInstockService { queryRawStock.setLocationCode(locationCode); BigDecimal totalAmount = wmsRawStockMapper.getRawStockTotalAmount(queryRawStock); totalAmount = totalAmount == null ? BigDecimal.ZERO : totalAmount; - if (totalAmount.add(wmsRawInstockVo.getInstockAmount()).compareTo(baseLocation.getQtyLimit()) > 0) { + BigDecimal qtyLimit = baseLocation.getQtyLimit() == null ? BigDecimal.ZERO : baseLocation.getQtyLimit(); + if (totalAmount.add(wmsRawInstockVo.getInstockAmount()).compareTo(qtyLimit) > 0) { throw new ServiceException("已超出库位数量限制，请重新选择库位"); } diff --git a/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsRawOutstockServiceImpl.java b/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsRawOutstockServiceImpl.java index 1bea41e8..b4b8a39c 100644 --- a/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsRawOutstockServiceImpl.java +++ b/hw-modules/hw-wms/src/main/java/com/hw/wms/service/impl/WmsRawOutstockServiceImpl.java @@ -387,6 +387,7 @@ public class WmsRawOutstockServiceImpl implements IWmsRawOutstockService { @Transactional(rollbackFor = Exception.class) @Override public int applyRawOutstock(WmsRawOutstock wmsRawOutstock) { + //todo:不能取拆分后的，只能是组装出库才能获取 Long warehouseId = wmsRawOutstock.getWarehouseId(); List rawOutstockDetails = wmsRawOutstock.getWmsRawOutstockDetailList(); //根据物料ID分组获取总申请数量 diff --git a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductStockMapper.xml b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductStockMapper.xml index 69e1689e..9daebff5 100644 --- a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductStockMapper.xml +++ b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsProductStockMapper.xml @@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + diff --git a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawOutstockDetailMapper.xml b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawOutstockDetailMapper.xml index 3d081d0b..cc44eff1 100644 --- a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawOutstockDetailMapper.xml +++ b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawOutstockDetailMapper.xml @@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + diff --git a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawStockMapper.xml b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawStockMapper.xml index 9267e4c6..eab3af1e 100644 --- a/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawStockMapper.xml +++ b/hw-modules/hw-wms/src/main/resources/mapper/wms/WmsRawStockMapper.xml @@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -23,15 +24,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - - - select raw_stock_id, warehouse_id, location_code, stock_type, material_id, instock_batch, instock_date, last_outstock_time, quality_status, complete_flag,total_amount, frozen_amount, occupy_amount, supplier_id, create_by, create_date, update_by, update_date, material_group1, material_group2, material_group3, def_amount, active_flag from wms_raw_stock + select raw_stock_id, warehouse_id, location_code, stock_type, material_id, instock_batch, instock_date, last_outstock_time, quality_status, complete_flag,total_amount, frozen_amount, occupy_amount, supplier_id, create_by, create_date, update_by, update_date, active_flag from wms_raw_stock @@ -84,10 +77,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_date, update_by, update_date, - material_group1, - material_group2, - material_group3, - def_amount, active_flag, @@ -108,10 +97,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{createDate}, #{updateBy}, #{updateDate}, - #{materialGroup1}, - #{materialGroup2}, - #{materialGroup3}, - #{defAmount}, #{activeFlag}, @@ -136,10 +121,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_date = #{createDate}, update_by = #{updateBy}, update_date = #{updateDate}, - material_group1 = #{materialGroup1}, - material_group2 = #{materialGroup2}, - material_group3 = #{materialGroup3}, - def_amount = #{defAmount}, active_flag = #{activeFlag}, where raw_stock_id = #{rawStockId} @@ -207,10 +188,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and supplier_id = #{supplierId} and create_date = #{createDate} and update_date = #{updateDate} - and material_group1 = #{materialGroup1} - and material_group2 = #{materialGroup2} - and material_group3 = #{materialGroup3} - and def_amount = #{defAmount} and active_flag = #{activeFlag} and totalAmount > 0 @@ -219,4 +196,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + diff --git a/hw-ui/src/api/qms/checkproject.js b/hw-ui/src/api/qms/checkproject.js new file mode 100644 index 00000000..ecb36cf0 --- /dev/null +++ b/hw-ui/src/api/qms/checkproject.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询检验项目列表 +export function listCheckproject(query) { + return request({ + url: '/qms/checkproject/list', + method: 'get', + params: query + }) +} + +// 查询检验项目详细 +export function getCheckproject(checkProjectId) { + return request({ + url: '/qms/checkproject/' + checkProjectId, + method: 'get' + }) +} + +// 新增检验项目 +export function addCheckproject(data) { + return request({ + url: '/qms/checkproject', + method: 'post', + data: data + }) +} + +// 修改检验项目 +export function updateCheckproject(data) { + return request({ + url: '/qms/checkproject', + method: 'put', + data: data + }) +} + +// 删除检验项目 +export function delCheckproject(checkProjectId) { + return request({ + url: '/qms/checkproject/' + checkProjectId, + method: 'delete' + }) +} diff --git a/hw-ui/src/api/qms/checkrule.js b/hw-ui/src/api/qms/checkrule.js new file mode 100644 index 00000000..64d6d858 --- /dev/null +++ b/hw-ui/src/api/qms/checkrule.js @@ -0,0 +1,92 @@ +import request from '@/utils/request' + +// 查询检验规则维护列表 +export function listCheckrule(query) { + return request({ + url: '/qms/checkrule/list', + method: 'get', + params: query + }) +} + +// 查询检验规则维护详细 +export function getCheckrule(checkRuleId) { + return request({ + url: '/qms/checkrule/' + checkRuleId, + method: 'get' + }) +} + +// 新增检验规则维护 +export function addCheckrule(data) { + return request({ + url: '/qms/checkrule', + method: 'post', + data: data + }) +} + +// 修改检验规则维护 +export function updateCheckrule(data) { + return request({ + url: '/qms/checkrule', + method: 'put', + data: data + }) +} + +// 删除检验规则维护 +export function delCheckrule(checkRuleId) { + return request({ + url: '/qms/checkrule/' + checkRuleId, + method: 'delete' + }) +} + +// 查询检验项目 +export function getCheckProjects() { + return request({ + url: '/qms/checkrule/getCheckProjects', + method: 'get' + }) +} + + + + + +// 查询检验规则未配置物料信息列表 +export function selectMaterialInfos4AllocateCheckRule(query) { + return request({ + url: '/qms/checkrule/selectMaterialInfos4AllocateCheckRule', + method: 'get', + params: query + }) +} + +// 查询已选择规则明细(物料) +export function selectCheckRuleDetailList(query) { + return request({ + url: '/qms/checkrule/selectCheckRuleDetailList', + method: 'get', + params: query + }) +} + +// 配置检验规则明细（物料） +export function allocateCheckRuleDetails(data) { + return request({ + url: '/qms/checkrule/allocateCheckRuleDetails', + method: 'put', + data: data + }) +} + +// 删除检验规则配置的物料信息 +export function unallocateCheckRuleDetails(data) { + return request({ + url: '/qms/checkrule/unallocateCheckRuleDetails', + method: 'post', + data: data + }) +} diff --git a/hw-ui/src/api/wms/transfer.js b/hw-ui/src/api/wms/transfer.js new file mode 100644 index 00000000..973ebd08 --- /dev/null +++ b/hw-ui/src/api/wms/transfer.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询转库记录列表 +export function listTransfer(query) { + return request({ + url: '/wms/transfer/list', + method: 'get', + params: query + }) +} + +// 查询转库记录详细 +export function getTransfer(transferId) { + return request({ + url: '/wms/transfer/' + transferId, + method: 'get' + }) +} + +// 新增转库记录 +export function addTransfer(data) { + return request({ + url: '/wms/transfer', + method: 'post', + data: data + }) +} + +// 修改转库记录 +export function updateTransfer(data) { + return request({ + url: '/wms/transfer', + method: 'put', + data: data + }) +} + +// 删除转库记录 +export function delTransfer(transferId) { + return request({ + url: '/wms/transfer/' + transferId, + method: 'delete' + }) +} diff --git a/hw-ui/src/assets/images/togglemenu-left.png b/hw-ui/src/assets/images/togglemenu-left.png new file mode 100644 index 00000000..ebeaf3af Binary files /dev/null and b/hw-ui/src/assets/images/togglemenu-left.png differ diff --git a/hw-ui/src/assets/images/togglemenu-right.png b/hw-ui/src/assets/images/togglemenu-right.png new file mode 100644 index 00000000..20c26249 Binary files /dev/null and b/hw-ui/src/assets/images/togglemenu-right.png differ diff --git a/hw-ui/src/router/index.js b/hw-ui/src/router/index.js index a475e908..bf6e92b8 100644 --- a/hw-ui/src/router/index.js +++ b/hw-ui/src/router/index.js @@ -277,7 +277,20 @@ export const dynamicRoutes = [ }, ], }, - + { + path: '/checkRule/checkRuleDetailConfig', + component: Layout, + hidden: true, + permissions: ['qms:checkrule:add'], + children: [ + { + path: 'index/:checkRuleId(\\d+)', + component: () => import('@/views/qms/base/checkrule/checkRuleDetail'), + name: 'ConfigCheckRuleDetail', + meta: { title: '规则明细配置', activeMenu: '/qms/base/checkrule' } + } + ] + }, ] diff --git a/hw-ui/src/views/qms/base/checkproject/index.vue b/hw-ui/src/views/qms/base/checkproject/index.vue new file mode 100644 index 00000000..b8bc1c6c --- /dev/null +++ b/hw-ui/src/views/qms/base/checkproject/index.vue @@ -0,0 +1,408 @@ + + + diff --git a/hw-ui/src/views/qms/base/checkrule/checkRuleDetail.vue b/hw-ui/src/views/qms/base/checkrule/checkRuleDetail.vue new file mode 100644 index 00000000..6c694629 --- /dev/null +++ b/hw-ui/src/views/qms/base/checkrule/checkRuleDetail.vue @@ -0,0 +1,318 @@ + + + diff --git a/hw-ui/src/views/qms/base/checkrule/index.vue b/hw-ui/src/views/qms/base/checkrule/index.vue new file mode 100644 index 00000000..5a48e906 --- /dev/null +++ b/hw-ui/src/views/qms/base/checkrule/index.vue @@ -0,0 +1,518 @@ + + + diff --git a/hw-ui/src/views/system/menu/index.vue b/hw-ui/src/views/system/menu/index.vue index c703fa0a..c66a2bdf 100644 --- a/hw-ui/src/views/system/menu/index.vue +++ b/hw-ui/src/views/system/menu/index.vue @@ -123,6 +123,7 @@ 目录 菜单 按钮 + PDA diff --git a/hw-ui/src/views/wms/info/transfer/index.vue b/hw-ui/src/views/wms/info/transfer/index.vue new file mode 100644 index 00000000..75dd7166 --- /dev/null +++ b/hw-ui/src/views/wms/info/transfer/index.vue @@ -0,0 +1,736 @@ + + +