kelvin/wms-gj-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
刘名喜 2024-10-31 19:48:35 +08:00
commit 9da5ad4228
15 changed files with 1630 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ktg-admin/src/main/resources/application.yml
View File

@ -103,7 +103,7 @@ mybatis:
# PageHelper分页插件 # PageHelper分页插件
pagehelper: pagehelper:
# helperDialect: mysql helperDialect: oracle
supportMethodsArguments: true supportMethodsArguments: true
params: count=countSql params: count=countSql

104
ktg-mes/src/main/java/com/ktg/mes/md/controller/WmsBusinessTypeController.java Normal file
View File

@ -0,0 +1,104 @@
package com.ktg.mes.md.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize;
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.ktg.common.annotation.Log;
import com.ktg.common.core.controller.BaseController;
import com.ktg.common.core.domain.AjaxResult;
import com.ktg.common.enums.BusinessType;
import com.ktg.mes.md.domain.WmsBusinessType;
import com.ktg.mes.md.service.IWmsBusinessTypeService;
import com.ktg.common.utils.poi.ExcelUtil;
import com.ktg.common.core.page.TableDataInfo;
/**
* 出入库类型Controller
*
* @author yinjinlu
* @date 2024-10-31
*/
@RestController
@RequestMapping("/md/TYPE")
public class WmsBusinessTypeController extends BaseController
{
@Autowired
private IWmsBusinessTypeService wmsBusinessTypeService;
/**
* 查询出入库类型列表
*/
@PreAuthorize("@ss.hasPermi('md:TYPE:list')")
@GetMapping("/list")
public TableDataInfo list(WmsBusinessType wmsBusinessType)
{
startPage();
List<WmsBusinessType> list = wmsBusinessTypeService.selectWmsBusinessTypeList(wmsBusinessType);
return getDataTable(list);
}
/**
* 导出出入库类型列表
*/
@PreAuthorize("@ss.hasPermi('md:TYPE:export')")
@Log(title = "出入库类型", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, WmsBusinessType wmsBusinessType)
{
List<WmsBusinessType> list = wmsBusinessTypeService.selectWmsBusinessTypeList(wmsBusinessType);
ExcelUtil<WmsBusinessType> util = new ExcelUtil<WmsBusinessType>(WmsBusinessType.class);
util.exportExcel(response, list, "出入库类型数据");
}
/**
* 获取出入库类型详细信息
*/
@PreAuthorize("@ss.hasPermi('md:TYPE:query')")
@GetMapping(value = "/{typeId}")
public AjaxResult getInfo(@PathVariable("typeId") String typeId)
{
return AjaxResult.success(wmsBusinessTypeService.selectWmsBusinessTypeByTypeId(typeId));
}
/**
* 新增出入库类型
*/
@PreAuthorize("@ss.hasPermi('md:TYPE:add')")
@Log(title = "出入库类型", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody WmsBusinessType wmsBusinessType)
{
return toAjax(wmsBusinessTypeService.insertWmsBusinessType(wmsBusinessType));
}
/**
* 修改出入库类型
*/
@PreAuthorize("@ss.hasPermi('md:TYPE:edit')")
@Log(title = "出入库类型", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody WmsBusinessType wmsBusinessType)
{
return toAjax(wmsBusinessTypeService.updateWmsBusinessType(wmsBusinessType));
}
/**
* 删除出入库类型
*/
@PreAuthorize("@ss.hasPermi('md:TYPE:remove')")
@Log(title = "出入库类型", businessType = BusinessType.DELETE)
@DeleteMapping("/{typeIds}")
public AjaxResult remove(@PathVariable String[] typeIds)
{
return toAjax(wmsBusinessTypeService.deleteWmsBusinessTypeByTypeIds(typeIds));
}
}

339
ktg-mes/src/main/java/com/ktg/mes/md/domain/WmsBusinessType.java Normal file
View File

@ -0,0 +1,339 @@
package com.ktg.mes.md.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ktg.common.annotation.Excel;
import com.ktg.common.core.domain.BaseEntity;
/**
* 出入库类型对象 WMS_BUSINESS_TYPE
*
* @author yinjinlu
* @date 2024-10-31
*/
public class WmsBusinessType extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
private String typeId;
/**
* 修改日期
*/
@Excel(name = "修改日期")
private String modifyDate;
/**
* 激活标识(0激活1冻结)
*/
@Excel(name = "激活标识(0激活1冻结)")
private String isActive;
/**
* 删除标识(0未删除1删除)
*/
@Excel(name = "删除标识(0未删除1删除)")
private String isDelete;
/**
* 类型编码
*/
@Excel(name = "类型编码")
private String code;
/**
* 类型名称
*/
@Excel(name = "类型名称")
private String name;
/**
* 业务标识:1入库；2出库；
*/
@Excel(name = "业务标识:1入库；2出库；")
private String flag;
/** 业务分类:01-采购入库 02-生产入库 03-生产退料 04-委外入库 05-委外退料 06-销售退货 07-调拨入库 08-盘盈入库 09-其它入库
61-生产领料 62-销售出库 63-采购退料 64-委外发料 65-生产补料 67-调拨出库 68-盘盈出库 69-其他出库 */
@Excel(name = "业务分类:01-采购入库 02-生产入库 03-生产退料 04-委外入库 05-委外退料 06-销售退货 07-调拨入库 08-盘盈入库 09-其它入库 61-生产领料 62-销售出库 63-采购退料 64-委外发料 65-生产补料 67-调拨出库 68-盘盈出库 69-其他出库")
private String type;
/** 是否默认:0否；1是 */
@Excel(name = "是否默认:0否；1是")
private String isDefault;
/** 是否全局应用:0否；1是 */
@Excel(name = "是否全局应用:0否；1是")
private String isGlobal;
/** 是否需要上架:0否；1是 */
@Excel(name = "是否需要上架:0否；1是")
private String isNeedUp;
/** 质检类型：0-不质检，1-先质检后上架，2-先上架后质检 */
@Excel(name = "质检类型：0-不质检，1-先质检后上架，2-先上架后质检 ")
private String qualityType;
/** 是否出库复核:0否；1是 */
@Excel(name = "是否出库复核:0否；1是")
private String isOutboundReview;
/** 波次策略 */
@Excel(name = "波次策略")
private String waveStrategy;
/** 是否允许多次收发:0否；1是 */
@Excel(name = "是否允许多次收发:0否；1是")
private String isMultipleAllowed;
/** 是否允许不足量完成任务:0否；1是 */
@Excel(name = "是否允许不足量完成任务:0否；1是")
private String isShortageAllowed;
/** 是否允许超量收发:0否；1是 */
@Excel(name = "是否允许超量收发:0否；1是")
private String isExcessAllowed;
/** 是否整单过账:0否；1是 */
@Excel(name = "是否整单过账:0否；1是")
private String isWholeOrderPost;
/** 是否允许手工新建:0否；1是 */
@Excel(name = "是否允许手工新建:0否；1是")
private String isManuallyCreate;
/** 是否无任务作业:0否；1是 */
@Excel(name = "是否无任务作业:0否；1是")
private String isNoTask;
/** 是否允许负库存:0否；1是 */
@Excel(name = "是否允许负库存:0否；1是")
private String isNegativeInv;
/** 是否安全库存检查:0否；1是 */
@Excel(name = "是否安全库存检查:0否；1是")
private String isCheckSafetyStock;
/** 是否记录入库时间:0否；1是 */
@Excel(name = "是否记录入库时间:0否；1是")
private String isRecordInboundTime;
public void setTypeId(String typeId) {
this.typeId = typeId;
}
public String getTypeId() {
return typeId;
}
public void setModifyDate(String modifyDate) {
this.modifyDate = modifyDate;
}
public String getModifyDate() {
return modifyDate;
}
public void setIsActive(String isActive) {
this.isActive = isActive;
}
public String getIsActive() {
return isActive;
}
public void setIsDelete(String isDelete) {
this.isDelete = isDelete;
}
public String getIsDelete() {
return isDelete;
}
public void setCode(String code) {
this.code = code;
}
public String getCode() {
return code;
}
public void setName(String name) {
this.name = name;
}
public String getName() {
return name;
}
public void setFlag(String flag) {
this.flag = flag;
}
public String getFlag() {
return flag;
}
public void setType(String type) {
this.type = type;
}
public String getType() {
return type;
}
public void setIsDefault(String isDefault) {
this.isDefault = isDefault;
}
public String getIsDefault() {
return isDefault;
}
public void setIsGlobal(String isGlobal) {
this.isGlobal = isGlobal;
}
public String getIsGlobal() {
return isGlobal;
}
public void setIsNeedUp(String isNeedUp) {
this.isNeedUp = isNeedUp;
}
public String getIsNeedUp() {
return isNeedUp;
}
public void setQualityType(String qualityType) {
this.qualityType = qualityType;
}
public String getQualityType() {
return qualityType;
}
public void setIsOutboundReview(String isOutboundReview) {
this.isOutboundReview = isOutboundReview;
}
public String getIsOutboundReview() {
return isOutboundReview;
}
public void setWaveStrategy(String waveStrategy) {
this.waveStrategy = waveStrategy;
}
public String getWaveStrategy() {
return waveStrategy;
}
public void setIsMultipleAllowed(String isMultipleAllowed) {
this.isMultipleAllowed = isMultipleAllowed;
}
public String getIsMultipleAllowed() {
return isMultipleAllowed;
}
public void setIsShortageAllowed(String isShortageAllowed) {
this.isShortageAllowed = isShortageAllowed;
}
public String getIsShortageAllowed() {
return isShortageAllowed;
}
public void setIsExcessAllowed(String isExcessAllowed) {
this.isExcessAllowed = isExcessAllowed;
}
public String getIsExcessAllowed() {
return isExcessAllowed;
}
public void setIsWholeOrderPost(String isWholeOrderPost) {
this.isWholeOrderPost = isWholeOrderPost;
}
public String getIsWholeOrderPost() {
return isWholeOrderPost;
}
public void setIsManuallyCreate(String isManuallyCreate) {
this.isManuallyCreate = isManuallyCreate;
}
public String getIsManuallyCreate() {
return isManuallyCreate;
}
public void setIsNoTask(String isNoTask) {
this.isNoTask = isNoTask;
}
public String getIsNoTask() {
return isNoTask;
}
public void setIsNegativeInv(String isNegativeInv) {
this.isNegativeInv = isNegativeInv;
}
public String getIsNegativeInv() {
return isNegativeInv;
}
public void setIsCheckSafetyStock(String isCheckSafetyStock) {
this.isCheckSafetyStock = isCheckSafetyStock;
}
public String getIsCheckSafetyStock() {
return isCheckSafetyStock;
}
public void setIsRecordInboundTime(String isRecordInboundTime) {
this.isRecordInboundTime = isRecordInboundTime;
}
public String getIsRecordInboundTime() {
return isRecordInboundTime;
}
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("typeId", getTypeId())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("modifyDate", getModifyDate())
.append("isActive", getIsActive())
.append("isDelete", getIsDelete())
.append("code", getCode())
.append("name", getName())
.append("flag", getFlag())
.append("type", getType())
.append("isDefault", getIsDefault())
.append("isGlobal", getIsGlobal())
.append("isNeedUp", getIsNeedUp())
.append("qualityType", getQualityType())
.append("isOutboundReview", getIsOutboundReview())
.append("waveStrategy", getWaveStrategy())
.append("isMultipleAllowed", getIsMultipleAllowed())
.append("isShortageAllowed", getIsShortageAllowed())
.append("isExcessAllowed", getIsExcessAllowed())
.append("isWholeOrderPost", getIsWholeOrderPost())
.append("isManuallyCreate", getIsManuallyCreate())
.append("isNoTask", getIsNoTask())
.append("isNegativeInv", getIsNegativeInv())
.append("isCheckSafetyStock", getIsCheckSafetyStock())
.append("isRecordInboundTime", getIsRecordInboundTime())
.append("remark", getRemark())
.toString();
}
}

61
ktg-mes/src/main/java/com/ktg/mes/md/mapper/WmsBusinessTypeMapper.java Normal file
View File

@ -0,0 +1,61 @@
package com.ktg.mes.md.mapper;
import java.util.List;
import com.ktg.mes.md.domain.WmsBusinessType;
/**
* 出入库类型Mapper接口
*
* @author yinjinlu
* @date 2024-10-31
*/
public interface WmsBusinessTypeMapper
{
/**
* 查询出入库类型
*
* @param typeId 出入库类型主键
* @return 出入库类型
*/
public WmsBusinessType selectWmsBusinessTypeByTypeId(String typeId);
/**
* 查询出入库类型列表
*
* @param wmsBusinessType 出入库类型
* @return 出入库类型集合
*/
public List<WmsBusinessType> selectWmsBusinessTypeList(WmsBusinessType wmsBusinessType);
/**
* 新增出入库类型
*
* @param wmsBusinessType 出入库类型
* @return 结果
*/
public int insertWmsBusinessType(WmsBusinessType wmsBusinessType);
/**
* 修改出入库类型
*
* @param wmsBusinessType 出入库类型
* @return 结果
*/
public int updateWmsBusinessType(WmsBusinessType wmsBusinessType);
/**
* 删除出入库类型
*
* @param typeId 出入库类型主键
* @return 结果
*/
public int deleteWmsBusinessTypeByTypeId(String typeId);
/**
* 批量删除出入库类型
*
* @param typeIds 需要删除的数据主键集合
* @return 结果
*/
public int deleteWmsBusinessTypeByTypeIds(String[] typeIds);
}

61
ktg-mes/src/main/java/com/ktg/mes/md/service/IWmsBusinessTypeService.java Normal file
View File

@ -0,0 +1,61 @@
package com.ktg.mes.md.service;
import java.util.List;
import com.ktg.mes.md.domain.WmsBusinessType;
/**
* 出入库类型Service接口
*
* @author yinjinlu
* @date 2024-10-31
*/
public interface IWmsBusinessTypeService
{
/**
* 查询出入库类型
*
* @param typeId 出入库类型主键
* @return 出入库类型
*/
public WmsBusinessType selectWmsBusinessTypeByTypeId(String typeId);
/**
* 查询出入库类型列表
*
* @param wmsBusinessType 出入库类型
* @return 出入库类型集合
*/
public List<WmsBusinessType> selectWmsBusinessTypeList(WmsBusinessType wmsBusinessType);
/**
* 新增出入库类型
*
* @param wmsBusinessType 出入库类型
* @return 结果
*/
public int insertWmsBusinessType(WmsBusinessType wmsBusinessType);
/**
* 修改出入库类型
*
* @param wmsBusinessType 出入库类型
* @return 结果
*/
public int updateWmsBusinessType(WmsBusinessType wmsBusinessType);
/**
* 批量删除出入库类型
*
* @param typeIds 需要删除的出入库类型主键集合
* @return 结果
*/
public int deleteWmsBusinessTypeByTypeIds(String[] typeIds);
/**
* 删除出入库类型信息
*
* @param typeId 出入库类型主键
* @return 结果
*/
public int deleteWmsBusinessTypeByTypeId(String typeId);
}

95
ktg-mes/src/main/java/com/ktg/mes/md/service/impl/WmsBusinessTypeServiceImpl.java Normal file
View File

@ -0,0 +1,95 @@
package com.ktg.mes.md.service.impl;
import java.util.List;
import com.ktg.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ktg.mes.md.mapper.WmsBusinessTypeMapper;
import com.ktg.mes.md.domain.WmsBusinessType;
import com.ktg.mes.md.service.IWmsBusinessTypeService;
/**
* 出入库类型Service业务层处理
*
* @author yinjinlu
* @date 2024-10-31
*/
@Service
public class WmsBusinessTypeServiceImpl implements IWmsBusinessTypeService
{
@Autowired
private WmsBusinessTypeMapper wmsBusinessTypeMapper;
/**
* 查询出入库类型
*
* @param typeId 出入库类型主键
* @return 出入库类型
*/
@Override
public WmsBusinessType selectWmsBusinessTypeByTypeId(String typeId)
{
return wmsBusinessTypeMapper.selectWmsBusinessTypeByTypeId(typeId);
}
/**
* 查询出入库类型列表
*
* @param wmsBusinessType 出入库类型
* @return 出入库类型
*/
@Override
public List<WmsBusinessType> selectWmsBusinessTypeList(WmsBusinessType wmsBusinessType)
{
return wmsBusinessTypeMapper.selectWmsBusinessTypeList(wmsBusinessType);
}
/**
* 新增出入库类型
*
* @param wmsBusinessType 出入库类型
* @return 结果
*/
@Override
public int insertWmsBusinessType(WmsBusinessType wmsBusinessType)
{
wmsBusinessType.setCreateTime(DateUtils.getNowDate());
return wmsBusinessTypeMapper.insertWmsBusinessType(wmsBusinessType);
}
/**
* 修改出入库类型
*
* @param wmsBusinessType 出入库类型
* @return 结果
*/
@Override
public int updateWmsBusinessType(WmsBusinessType wmsBusinessType)
{
return wmsBusinessTypeMapper.updateWmsBusinessType(wmsBusinessType);
}
/**
* 批量删除出入库类型
*
* @param typeIds 需要删除的出入库类型主键
* @return 结果
*/
@Override
public int deleteWmsBusinessTypeByTypeIds(String[] typeIds)
{
return wmsBusinessTypeMapper.deleteWmsBusinessTypeByTypeIds(typeIds);
}
/**
* 删除出入库类型信息
*
* @param typeId 出入库类型主键
* @return 结果
*/
@Override
public int deleteWmsBusinessTypeByTypeId(String typeId)
{
return wmsBusinessTypeMapper.deleteWmsBusinessTypeByTypeId(typeId);
}
}

95
ktg-mes/src/main/java/com/ktg/mes/qc/controller/InventoryTaskController.java Normal file
View File

@ -0,0 +1,95 @@
package com.ktg.mes.qc.controller;
import com.ktg.common.annotation.Log;
import com.ktg.common.constant.UserConstants;
import com.ktg.common.core.controller.BaseController;
import com.ktg.common.core.domain.AjaxResult;
import com.ktg.common.core.page.TableDataInfo;
import com.ktg.common.enums.BusinessType;
import com.ktg.mes.qc.domain.InventoryTask;
import com.ktg.mes.qc.domain.QcDefect;
import com.ktg.mes.qc.service.InventoryTaskService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import static com.ktg.common.utils.PageUtils.startPage;
/**
* 常见缺陷Controller
*
* @author yinjinlu
* @date 2022-05-19
*/
@RestController
@RequestMapping("InventoryTaskController")
public class InventoryTaskController extends BaseController {
@Autowired
private InventoryTaskService inventoryTaskService;
/**
* 查询定检任务列表
*/
@GetMapping("/list")
public TableDataInfo list(InventoryTask inventoryTask) {
startPage();
List<InventoryTask> list = inventoryTaskService.getList(inventoryTask);
return getDataTable(list);
}
/**
* 修改任务
*/
@PreAuthorize("@ss.hasPermi('mes:qc:qcdefect:edit')")
@Log(title = "定检任务", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody InventoryTask inventoryTask)
{
return toAjax(inventoryTaskService.updateInventoryTask(inventoryTask));
}
/**
* 新增计划
*/
@PreAuthorize("@ss.hasPermi('mes:qc:qcdefect:add')")
@Log(title = "定检任务", businessType = BusinessType.INSERT)
@PostMapping("/save")
public AjaxResult add(@RequestBody InventoryTask inventoryTask)
{
return toAjax(inventoryTaskService.insertInventoryTask(inventoryTask));
}
/**
* 获取定检任务详细信息
*/
@PreAuthorize("@ss.hasPermi('mes:qc:qcindex:query')")
@GetMapping(value = "/{wmsInventoryID}")
public AjaxResult getInfo(@PathVariable("wmsInventoryID") Long wmsInventoryID)
{
return AjaxResult.success(inventoryTaskService.selectInventoryTaskById(wmsInventoryID));
}
/**
* 删除
*/
@PreAuthorize("@ss.hasPermi('mes:qc:qcdefect:remove')")
@Log(title = "定检任务", businessType = BusinessType.DELETE)
@DeleteMapping("/{wmsInventoryID}")
public AjaxResult remove(@PathVariable Long wmsInventoryID)
{
return toAjax(inventoryTaskService.delById(wmsInventoryID));
}
/**
* 批量删除
*/
@PreAuthorize("@ss.hasPermi('mes:qc:qcdefect:remove')")
@Log(title = "定检任务", businessType = BusinessType.DELETE)
@DeleteMapping("del/{wmsInventoryIDs}")
public AjaxResult remove(@PathVariable Long[] wmsInventoryIDs)
{
return toAjax(inventoryTaskService.delByIds(wmsInventoryIDs));
}
}

288
ktg-mes/src/main/java/com/ktg/mes/qc/domain/InventoryTask.java Normal file
View File

@ -0,0 +1,288 @@
package com.ktg.mes.qc.domain;
import com.ktg.common.core.domain.BaseEntity;
import java.sql.Timestamp;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
/**
* 工装定检对象对象 qc_defect
*
*/
public class InventoryTask extends BaseEntity {
private static final long serialVersionUID = 1L;
//id
private Long wmsInventoryID;
//编码
private String wmsInventoryCode;
//名称
private String name;
//分类Id
private String uomId;
//分类名称
private String uomName;
//物料Id名称
private String productId;
//物料名称
private String productName;
//点检模型
private String mrlModel;
//点检模型名称
private String mrlModelName;
//点检周期
private String mrlPeriod;
//计划规则
private String planPeriod;
//开始时间
private Timestamp startTime;
//结束时间
private Timestamp finishTime;
//上次检测时间
private Timestamp superiorTime;
//下次检测时间
private Timestamp belowTime;
//工装定检预警
private String mrlWarning;
//是否完成
private String updatebby;
//是否删除
private int isDelete;
//是否激活
private int isActive;
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
// 其他 getter 和 setter 也需要相应地调整
public String getMrlModel() {
return mrlModel;
}
public void setMrlModel(String mrlModel) {
this.mrlModel = mrlModel;
}
public String getMrlPeriod() {
return mrlPeriod;
}
public void setMrlPeriod(String mrlPeriod) {
this.mrlPeriod = mrlPeriod;
}
public String getPlanPeriod() {
return planPeriod;
}
public void setPlanPeriod(String planPeriod) {
this.planPeriod = planPeriod;
}
public Timestamp getStartTime() {
return startTime;
}
public void setStartTime(String startTime) {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
try {
Date parsedDate = format.parse(startTime);
this.startTime = new Timestamp(parsedDate.getTime());
} catch (ParseException e) {
e.printStackTrace();
}
}
public Timestamp getFinishTime() {
return finishTime;
}
public void setFinishTime(String finishTime) {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
try {
Date parsedDate = format.parse(finishTime);
this.finishTime = new Timestamp(parsedDate.getTime());
} catch (ParseException e) {
e.printStackTrace(); // 或记录日志，抛出自定义异常等
}
}
public Timestamp getSuperiorTime() {
return superiorTime;
}
public void setSuperiorTime(String superiorTime) {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
try {
Date parsedDate = format.parse(superiorTime);
this.superiorTime = new Timestamp(parsedDate.getTime());
} catch (ParseException e) {
e.printStackTrace(); // 或记录日志，抛出自定义异常等
}
}
public Timestamp getBelowTime() {
return belowTime;
}
public void setBelowTime(String belowTime) {
System.out.println(belowTime);
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
try {
Date parsedDate = format.parse(belowTime);
this.belowTime = new Timestamp(parsedDate.getTime());
} catch (ParseException e) {
e.printStackTrace(); // 或记录日志，抛出自定义异常等
}
}
public String getMrlWarning() {
return mrlWarning;
}
public void setMrlWarning(String mrlWarning) {
this.mrlWarning = mrlWarning;
}
public String getUpdatebby() {
return updatebby;
}
public void setUpdatebby(String updatebby) {
this.updatebby = updatebby;
}
public int getIsDelete() {
return isDelete;
}
public void setIsDelete(int isDelete) {
this.isDelete = isDelete;
}
public int getIsActive() {
return isActive;
}
public void setIsActive(int isActive) {
this.isActive = isActive;
}
public String getMrlModelName() {
return mrlModelName;
}
public void setMrlModelName(String mrlModelName) {
this.mrlModelName = mrlModelName;
}
public Long getWmsInventoryID() {
return wmsInventoryID;
}
public void setWmsInventoryID(Long wmsInventoryID) {
this.wmsInventoryID = wmsInventoryID;
}
public String getWmsInventoryCode() {
return wmsInventoryCode;
}
public void setWmsInventoryCode(String wmsInventoryCode) {
this.wmsInventoryCode = wmsInventoryCode;
}
public String getUomId() {
return uomId;
}
public void setUomId(String uomId) {
this.uomId = uomId;
}
public String getUomName() {
return uomName;
}
public void setUomName(String uomName) {
this.uomName = uomName;
}
public String getProductId() {
return productId;
}
public void setProductId(String productId) {
this.productId = productId;
}
public String getProductName() {
return productName;
}
public void setProductName(String productName) {
this.productName = productName;
}
public void setStartTime(Timestamp startTime) {
this.startTime = startTime;
}
public void setFinishTime(Timestamp finishTime) {
this.finishTime = finishTime;
}
public void setSuperiorTime(Timestamp superiorTime) {
this.superiorTime = superiorTime;
}
public void setBelowTime(Timestamp belowTime) {
this.belowTime = belowTime;
}
@Override
public String toString() {
return "InventoryTask{" +
"wmsInventoryID=" + wmsInventoryID +
", wmsInventoryCode='" + wmsInventoryCode + '\'' +
", name='" + name + '\'' +
", uomId='" + uomId + '\'' +
", uomName='" + uomName + '\'' +
", productId='" + productId + '\'' +
", productName='" + productName + '\'' +
", mrlModel='" + mrlModel + '\'' +
", mrlModelName='" + mrlModelName + '\'' +
", mrlPeriod='" + mrlPeriod + '\'' +
", planPeriod='" + planPeriod + '\'' +
", startTime=" + startTime +
", finishTime=" + finishTime +
", superiorTime=" + superiorTime +
", belowTime=" + belowTime +
", mrlWarning='" + mrlWarning + '\'' +
", updatebby='" + updatebby + '\'' +
", isDelete=" + isDelete +
", isActive=" + isActive +
'}';
}
}

57
ktg-mes/src/main/java/com/ktg/mes/qc/mapper/InventoryTaskMapper.java Normal file
View File

@ -0,0 +1,57 @@
package com.ktg.mes.qc.mapper;
import com.ktg.mes.qc.domain.InventoryTask;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 工装定检Mapper接口
*
*/
public interface InventoryTaskMapper {
/**
* 查询工装定检任务
*
* @param id 工装定检主键
* @return 工装定检
*/
public InventoryTask selectInventoryTaskById(@Param("Id") Long id);
/**
* 查询工装定检任务集合
*
* @param inventoryTask 工装定检对象
* @return 工装定检集合
*/
List<InventoryTask> getList(InventoryTask inventoryTask);
/**
* 新增工装定检任务
* @param inventoryTask
* @return
*/
public int insertInventoryTask(InventoryTask inventoryTask);
/**
* 修改工装定检任务
* @param inventoryTask
* @return
*/
public int updateInventoryTask(InventoryTask inventoryTask);
/**
* 删除工装定检任务
* @param id
* @return
*/
public int delById(@Param("Id") Long id);
/**
* 批量删除工装定检任务
* @param ids
* @return
*/
public int delByIds(@Param("list") Long[] ids);
}

8
ktg-mes/src/main/java/com/ktg/mes/qc/mapper/QcTemplateMapper.java
View File

@ -4,6 +4,7 @@ import java.util.List;
import com.ktg.mes.qc.domain.QcMobParam; import com.ktg.mes.qc.domain.QcMobParam;
import com.ktg.mes.qc.domain.QcTemplate; import com.ktg.mes.qc.domain.QcTemplate;
import org.apache.ibatis.annotations.Select;
/** /**
* 检测模板Mapper接口 * 检测模板Mapper接口
@ -13,6 +14,13 @@ import com.ktg.mes.qc.domain.QcTemplate;
*/ */
public interface QcTemplateMapper public interface QcTemplateMapper
{ {
/**
* 查询检测模板
*
* @return 检测模板
*/
public List<QcTemplate> getAll();
/** /**
* 查询检测模板 * 查询检测模板
* *

57
ktg-mes/src/main/java/com/ktg/mes/qc/service/InventoryTaskService.java Normal file
View File

@ -0,0 +1,57 @@
package com.ktg.mes.qc.service;
import com.ktg.mes.qc.domain.InventoryTask;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 工装定检Service接口
*
*/
public interface InventoryTaskService {
/**
* 查询工装定检任务
*
* @param id 工装定检主键
* @return 工装定检
*/
public InventoryTask selectInventoryTaskById(@Param("Id") Long id);
/**
* 查询工装定检任务集合
*
* @param id 工装定检对象
* @return 工装定检集合
*/
List<InventoryTask> getList(InventoryTask inventoryTask);
/**
* 新增工装定检任务
* @param inventoryTask
* @return
*/
public int insertInventoryTask(InventoryTask inventoryTask);
/**
* 修改工装定检任务
* @param inventoryTask
* @return
*/
public int updateInventoryTask(InventoryTask inventoryTask);
/**
* 删除工装定检任务
* @param id
* @return
*/
public int delById(Long id);
/**
* 批量删除工装定检任务
* @param ids
* @return
*/
public int delByIds(Long[] ids);
}

109
ktg-mes/src/main/java/com/ktg/mes/qc/service/impl/InventoryTaskServiceImpl.java Normal file
View File

@ -0,0 +1,109 @@
package com.ktg.mes.qc.service.impl;
import com.ktg.common.utils.DateUtils;
import com.ktg.mes.md.domain.MdItem;
import com.ktg.mes.md.mapper.MdItemMapper;
import com.ktg.mes.qc.domain.InventoryTask;
import com.ktg.mes.qc.domain.QcTemplate;
import com.ktg.mes.qc.mapper.InventoryTaskMapper;
import com.ktg.mes.qc.mapper.QcDefectRecordMapper;
import com.ktg.mes.qc.mapper.QcTemplateMapper;
import com.ktg.mes.qc.service.InventoryTaskService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.sql.Timestamp;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import static com.ktg.common.utils.SecurityUtils.getUsername;
/**
* 工装定检Service业务层处理
*
*/
@Service
public class InventoryTaskServiceImpl implements InventoryTaskService {
@Autowired
private InventoryTaskMapper inventoryTaskMapper;
@Autowired
private MdItemMapper mdItemMapper;
@Autowired
private QcTemplateMapper qcTemplateMapper;
@Override
public InventoryTask selectInventoryTaskById(Long id) {
InventoryTask inventoryTask = inventoryTaskMapper.selectInventoryTaskById(id);
QcTemplate qcTemplate = qcTemplateMapper.selectQcTemplateByTemplateId(Long.parseLong(inventoryTask.getMrlModel()));
inventoryTask.setMrlModelName(qcTemplate.getTemplateName());
MdItem mdItem = mdItemMapper.selectMdItemById(Long.parseLong(inventoryTask.getProductId()));
inventoryTask.setProductName(mdItem.getItemName());
inventoryTask.setUomName(mdItem.getItemTypeName());
return inventoryTask;
}
@Override
public List<InventoryTask> getList(InventoryTask inventoryTask) {
List<InventoryTask> list = inventoryTaskMapper.getList(inventoryTask);
List<QcTemplate> qcTemplates = qcTemplateMapper.getAll();
for (InventoryTask task : list) {
for (QcTemplate qcTemplate : qcTemplates) {
if (Long.parseLong(task.getMrlModel()) == qcTemplate.getTemplateId())
task.setMrlModelName(qcTemplate.getTemplateName());
}
}
List<MdItem> mdItems = mdItemMapper.selectMdItemAll();
for (InventoryTask task : list) {
for (MdItem mdItem : mdItems) {
if (Long.parseLong(task.getProductId()) == mdItem.getItemId()) {
task.setProductName(mdItem.getItemName());
task.setUomName(mdItem.getItemTypeName());
}
}
}
return list;
}
@Override
public int insertInventoryTask(InventoryTask inventoryTask) {
String s = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
inventoryTask.setCreateBy(getUsername());
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
try {
Date parsedDate = format.parse(s);
inventoryTask.setCreateTime(parsedDate);
} catch (ParseException e) {
e.printStackTrace(); // 或记录日志，抛出自定义异常等
}
return inventoryTaskMapper.insertInventoryTask(inventoryTask);
}
@Override
public int updateInventoryTask(InventoryTask inventoryTask) {
// String s = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
// inventoryTask.setUpdatebby(getUsername());
// SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
// try {
// Date parsedDate = format.parse(s);
// inventoryTask.setUpdateTime(parsedDate);
// } catch (ParseException e) {
// e.printStackTrace(); // 或记录日志，抛出自定义异常等
// }
return inventoryTaskMapper.updateInventoryTask(inventoryTask);
}
@Override
public int delById(Long id) {
return inventoryTaskMapper.delById(id);
}
@Override
public int delByIds(Long[] ids) {
return inventoryTaskMapper.delByIds(ids);
}
}

225
ktg-mes/src/main/resources/mapper/md/WmsBusinessTypeMapper.xml Normal file
View File

@ -0,0 +1,225 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ktg.mes.md.mapper.WmsBusinessTypeMapper">
<resultMap type="WmsBusinessType" id="WmsBusinessTypeResult">
<result property="typeId" column="TYPE_ID"/>
<result property="createBy" column="CREATE_BY"/>
<result property="createTime" column="CREATE_TIME"/>
<result property="updateBy" column="UPDATE_BY"/>
<result property="modifyDate" column="MODIFY_DATE"/>
<result property="isActive" column="IS_ACTIVE"/>
<result property="isDelete" column="IS_DELETE"/>
<result property="code" column="CODE"/>
<result property="name" column="NAME"/>
<result property="flag" column="FLAG"/>
<result property="type" column="TYPE"/>
<result property="isDefault" column="IS_DEFAULT"/>
<result property="isGlobal" column="IS_GLOBAL"/>
<result property="isNeedUp" column="IS_NEED_UP"/>
<result property="qualityType" column="QUALITY_TYPE"/>
<result property="isOutboundReview" column="IS_OUTBOUND_REVIEW"/>
<result property="waveStrategy" column="WAVE_STRATEGY"/>
<result property="isMultipleAllowed" column="IS_MULTIPLE_ALLOWED"/>
<result property="isShortageAllowed" column="IS_SHORTAGE_ALLOWED"/>
<result property="isExcessAllowed" column="IS_EXCESS_ALLOWED"/>
<result property="isWholeOrderPost" column="IS_WHOLE_ORDER_POST"/>
<result property="isManuallyCreate" column="IS_MANUALLY_CREATE"/>
<result property="isNoTask" column="IS_NO_TASK"/>
<result property="isNegativeInv" column="IS_NEGATIVE_INV"/>
<result property="isCheckSafetyStock" column="IS_CHECK_SAFETY_STOCK"/>
<result property="isRecordInboundTime" column="IS_RECORD_INBOUND_TIME"/>
<result property="remark" column="REMARK"/>
</resultMap>
<sql id="selectWmsBusinessTypeVo">
select TYPE_ID,
CREATE_BY,
CREATE_TIME,
UPDATE_BY,
MODIFY_DATE,
IS_ACTIVE,
IS_DELETE,
CODE,
NAME,
FLAG,
TYPE,
IS_DEFAULT,
IS_GLOBAL,
IS_NEED_UP,
QUALITY_TYPE,
IS_OUTBOUND_REVIEW,
WAVE_STRATEGY,
IS_MULTIPLE_ALLOWED,
IS_SHORTAGE_ALLOWED,
IS_EXCESS_ALLOWED,
IS_WHOLE_ORDER_POST,
IS_MANUALLY_CREATE,
IS_NO_TASK,
IS_NEGATIVE_INV,
IS_CHECK_SAFETY_STOCK,
IS_RECORD_INBOUND_TIME,
REMARK
from WMS_BUSINESS_TYPE
where IS_DELETE = 0
</sql>
<select id="selectWmsBusinessTypeList" parameterType="WmsBusinessType" resultMap="WmsBusinessTypeResult">
<include refid="selectWmsBusinessTypeVo"/>
<where>
<if test="createBy != null and createBy != ''">and CREATE_BY = #{createBy}</if>
<if test="createTime != null and createTime != ''">and CREATE_TIME = #{createTime}</if>
<if test="updateBy != null and updateBy != ''">and UPDATE_BY = #{updateBy}</if>
<if test="modifyDate != null and modifyDate != ''">and MODIFY_DATE = #{modifyDate}</if>
<if test="isActive != null and isActive != ''">and IS_ACTIVE = #{isActive}</if>
<if test="isDelete != null and isDelete != ''">and IS_DELETE = #{isDelete}</if>
<if test="code != null and code != ''">and CODE = #{code}</if>
<if test="name != null and name != ''">and NAME like concat('%', #{name}, '%')</if>
<if test="flag != null and flag != ''">and FLAG = #{flag}</if>
<if test="type != null and type != ''">and TYPE = #{type}</if>
<if test="isDefault != null and isDefault != ''">and IS_DEFAULT = #{isDefault}</if>
<if test="isGlobal != null and isGlobal != ''">and IS_GLOBAL = #{isGlobal}</if>
<if test="isNeedUp != null and isNeedUp != ''">and IS_NEED_UP = #{isNeedUp}</if>
<if test="qualityType != null and qualityType != ''">and QUALITY_TYPE = #{qualityType}</if>
<if test="isOutboundReview != null and isOutboundReview != ''">and IS_OUTBOUND_REVIEW =
#{isOutboundReview}
</if>
<if test="waveStrategy != null and waveStrategy != ''">and WAVE_STRATEGY = #{waveStrategy}</if>
<if test="isMultipleAllowed != null and isMultipleAllowed != ''">and IS_MULTIPLE_ALLOWED =
#{isMultipleAllowed}
</if>
<if test="isShortageAllowed != null and isShortageAllowed != ''">and IS_SHORTAGE_ALLOWED =
#{isShortageAllowed}
</if>
<if test="isExcessAllowed != null and isExcessAllowed != ''">and IS_EXCESS_ALLOWED = #{isExcessAllowed}
</if>
<if test="isWholeOrderPost != null and isWholeOrderPost != ''">and IS_WHOLE_ORDER_POST =
#{isWholeOrderPost}
</if>
<if test="isManuallyCreate != null and isManuallyCreate != ''">and IS_MANUALLY_CREATE =
#{isManuallyCreate}
</if>
<if test="isNoTask != null and isNoTask != ''">and IS_NO_TASK = #{isNoTask}</if>
<if test="isNegativeInv != null and isNegativeInv != ''">and IS_NEGATIVE_INV = #{isNegativeInv}</if>
<if test="isCheckSafetyStock != null and isCheckSafetyStock != ''">and IS_CHECK_SAFETY_STOCK =
#{isCheckSafetyStock}
</if>
<if test="isRecordInboundTime != null and isRecordInboundTime != ''">and IS_RECORD_INBOUND_TIME =
#{isRecordInboundTime}
</if>
<if test="remark != null and remark != ''">and REMARK = #{remark}</if>
</where>
</select>
<select id="selectWmsBusinessTypeByTypeId" parameterType="String" resultMap="WmsBusinessTypeResult">
<include refid="selectWmsBusinessTypeVo"/>
where TYPE_ID = #{typeId}
</select>
<insert id="insertWmsBusinessType" parameterType="WmsBusinessType" useGeneratedKeys="true" keyProperty="typeId">
insert into WMS_BUSINESS_TYPE
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="createBy != null">CREATE_BY,</if>
<if test="createTime != null">CREATE_TIME,</if>
<if test="updateBy != null">UPDATE_BY,</if>
<if test="modifyDate != null">MODIFY_DATE,</if>
<if test="isActive != null">IS_ACTIVE,</if>
<if test="isDelete != null">IS_DELETE,</if>
<if test="code != null">CODE,</if>
<if test="name != null">NAME,</if>
<if test="flag != null">FLAG,</if>
<if test="type != null">TYPE,</if>
<if test="isDefault != null">IS_DEFAULT,</if>
<if test="isGlobal != null">IS_GLOBAL,</if>
<if test="isNeedUp != null">IS_NEED_UP,</if>
<if test="qualityType != null">QUALITY_TYPE,</if>
<if test="isOutboundReview != null">IS_OUTBOUND_REVIEW,</if>
<if test="waveStrategy != null">WAVE_STRATEGY,</if>
<if test="isMultipleAllowed != null">IS_MULTIPLE_ALLOWED,</if>
<if test="isShortageAllowed != null">IS_SHORTAGE_ALLOWED,</if>
<if test="isExcessAllowed != null">IS_EXCESS_ALLOWED,</if>
<if test="isWholeOrderPost != null">IS_WHOLE_ORDER_POST,</if>
<if test="isManuallyCreate != null">IS_MANUALLY_CREATE,</if>
<if test="isNoTask != null">IS_NO_TASK,</if>
<if test="isNegativeInv != null">IS_NEGATIVE_INV,</if>
<if test="isCheckSafetyStock != null">IS_CHECK_SAFETY_STOCK,</if>
<if test="isRecordInboundTime != null">IS_RECORD_INBOUND_TIME,</if>
<if test="remark != null">REMARK,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="modifyDate != null">#{modifyDate},</if>
<if test="isActive != null">#{isActive},</if>
<if test="isDelete != null">#{isDelete},</if>
<if test="code != null">#{code},</if>
<if test="name != null">#{name},</if>
<if test="flag != null">#{flag},</if>
<if test="type != null">#{type},</if>
<if test="isDefault != null">#{isDefault},</if>
<if test="isGlobal != null">#{isGlobal},</if>
<if test="isNeedUp != null">#{isNeedUp},</if>
<if test="qualityType != null">#{qualityType},</if>
<if test="isOutboundReview != null">#{isOutboundReview},</if>
<if test="waveStrategy != null">#{waveStrategy},</if>
<if test="isMultipleAllowed != null">#{isMultipleAllowed},</if>
<if test="isShortageAllowed != null">#{isShortageAllowed},</if>
<if test="isExcessAllowed != null">#{isExcessAllowed},</if>
<if test="isWholeOrderPost != null">#{isWholeOrderPost},</if>
<if test="isManuallyCreate != null">#{isManuallyCreate},</if>
<if test="isNoTask != null">#{isNoTask},</if>
<if test="isNegativeInv != null">#{isNegativeInv},</if>
<if test="isCheckSafetyStock != null">#{isCheckSafetyStock},</if>
<if test="isRecordInboundTime != null">#{isRecordInboundTime},</if>
<if test="remark != null">#{remark},</if>
</trim>
</insert>
<update id="updateWmsBusinessType" parameterType="WmsBusinessType">
update WMS_BUSINESS_TYPE
<trim prefix="SET" suffixOverrides=",">
<if test="createBy != null">CREATE_BY = #{createBy},</if>
<if test="createTime != null">CREATE_TIME = #{createTime},</if>
<if test="updateBy != null">UPDATE_BY = #{updateBy},</if>
<if test="modifyDate != null">MODIFY_DATE = #{modifyDate},</if>
<if test="isActive != null">IS_ACTIVE = #{isActive},</if>
<if test="isDelete != null">IS_DELETE = #{isDelete},</if>
<if test="code != null">CODE = #{code},</if>
<if test="name != null">NAME = #{name},</if>
<if test="flag != null">FLAG = #{flag},</if>
<if test="type != null">TYPE = #{type},</if>
<if test="isDefault != null">IS_DEFAULT = #{isDefault},</if>
<if test="isGlobal != null">IS_GLOBAL = #{isGlobal},</if>
<if test="isNeedUp != null">IS_NEED_UP = #{isNeedUp},</if>
<if test="qualityType != null">QUALITY_TYPE = #{qualityType},</if>
<if test="isOutboundReview != null">IS_OUTBOUND_REVIEW = #{isOutboundReview},</if>
<if test="waveStrategy != null">WAVE_STRATEGY = #{waveStrategy},</if>
<if test="isMultipleAllowed != null">IS_MULTIPLE_ALLOWED = #{isMultipleAllowed},</if>
<if test="isShortageAllowed != null">IS_SHORTAGE_ALLOWED = #{isShortageAllowed},</if>
<if test="isExcessAllowed != null">IS_EXCESS_ALLOWED = #{isExcessAllowed},</if>
<if test="isWholeOrderPost != null">IS_WHOLE_ORDER_POST = #{isWholeOrderPost},</if>
<if test="isManuallyCreate != null">IS_MANUALLY_CREATE = #{isManuallyCreate},</if>
<if test="isNoTask != null">IS_NO_TASK = #{isNoTask},</if>
<if test="isNegativeInv != null">IS_NEGATIVE_INV = #{isNegativeInv},</if>
<if test="isCheckSafetyStock != null">IS_CHECK_SAFETY_STOCK = #{isCheckSafetyStock},</if>
<if test="isRecordInboundTime != null">IS_RECORD_INBOUND_TIME = #{isRecordInboundTime},</if>
<if test="remark != null">REMARK = #{remark},</if>
</trim>
where TYPE_ID = #{typeId}
</update>
<delete id="deleteWmsBusinessTypeByTypeId" parameterType="String">
update from WMS_BUSINESS_TYPE
where TYPE_ID = #{typeId}
</delete>
<delete id="deleteWmsBusinessTypeByTypeIds" parameterType="String">
update WMS_BUSINESS_TYPE set IS_DELETE = 1 where TYPE_ID in
<foreach item="typeId" collection="array" open="(" separator="," close=")">
#{typeId}
</foreach>
</delete>
</mapper>

127
ktg-mes/src/main/resources/mapper/qc/InventoryTaskMapper.xml Normal file
View File

@ -0,0 +1,127 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ktg.mes.qc.mapper.InventoryTaskMapper">
<resultMap type="InventoryTask" id="InventoryTaskResult">
<result property="wmsInventoryID" column="WMS_INVENTORY_ID" />
<result property="wmsInventoryCode" column="WMS_UNVENTORY_CODE" />
<result property="uomId" column="M_UOM_ID" />
<result property="productId" column="M_PRODUCT_ID" />
<result property="name" column="NAME" />
<result property="mrlModel" column="MRL_MODEL" />
<result property="mrlPeriod" column="MRL_PERIOD" />
<result property="planPeriod" column="PLAN_PERIOD" />
<result property="startTime" column="START_TIME" />
<result property="finishTime" column="FINISH_TIME" />
<result property="remark" column="REMARK" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="superiorTime" column="SUPERIOR_TIME"/>
<result property="belowTime" column="BELOW_TIME"/>
<result property="mrlWarning" column="MRL_WARNING"/>
<result property="updatebby" column="UPDATEBBY"/>
<result property="isDelete" column="IS_DELETE"/>
<result property="isDelete" column="IS_ACTIVE"/>
</resultMap>
<sql id="selectInvenroryTaskVo">
select WMS_INVENTORY_ID,WMS_UNVENTORY_CODE,M_UOM_ID,NAME,MRL_MODEL,M_PRODUCT_ID,MRL_PERIOD,PLAN_PERIOD,START_TIME,FINISH_TIME ,REMARK,create_by,create_time,update_by,update_time,SUPERIOR_TIME,BELOW_TIME,MRL_WARNING from WMS_INVENTORY
</sql>
<insert id="insertInventoryTask">
insert into wms_inventory
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="wmsInventoryCode != null and wmsInventoryCode != ''">WMS_UNVENTORY_CODE,</if>
<if test="name != null and name != ''">NAME ,</if>
<if test="uomId != null and uomId != ''">M_UOM_ID,</if>
<if test="productId != null and productId != ''">M_PRODUCT_ID,</if>
<if test="mrlModel != null and mrlModel != ''">MRL_MODEL,</if>
<if test="mrlPeriod != null and mrlPeriod != ''">MRL_PERIOD,</if>
<if test="planPeriod != null and planPeriod != ''">PLAN_PERIOD,</if>
<if test="startTime != null">START_TIME,</if>
<if test="finishTime != null">FINISH_TIME,</if>
<if test="superiorTime != null">SUPERIOR_TIME,</if>
<if test="belowTime != null">BELOW_TIME,</if>
<if test="mrlWarning != null">MRL_WARNING,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="wmsInventoryCode != null and wmsInventoryCode != ''">#{wmsInventoryCode},</if>
<if test="name != null and name != ''">#{name},</if>
<if test="uomId != null and uomId != ''">#{uomId},</if>
<if test="productId != null and productId != ''">#{productId},</if>
<if test="mrlModel != null and mrlModel != ''">#{mrlModel},</if>
<if test="mrlPeriod != null and mrlPeriod != ''">#{mrlPeriod},</if>
<if test="planPeriod != null and planPeriod != ''">#{planPeriod},</if>
<if test="startTime != null">#{startTime},</if>
<if test="finishTime != null">#{finishTime},</if>
<if test="superiorTime != null">#{superiorTime},</if>
<if test="belowTime != null">#{belowTime},</if>
<if test="mrlWarning != null">#{mrlWarning},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
</trim>
</insert>
<update id="updateInventoryTask" parameterType="InventoryTask">
update wms_inventory
<trim prefix="SET" suffixOverrides=",">
<if test="wmsInventoryCode != null and wmsInventoryCode != ''">WMS_UNVENTORY_CODE = #{wmsInventoryCode},</if>
<if test="uomId != null and uomId != ''">m_uom_id = #{uomId},</if>
<if test="productId != null and productId != ''">m_product_id = #{productId},</if>
<if test="name != null and name != ''">name = #{name},</if>
<if test="mrlModel != null and mrlModel != ''">mrl_model = #{mrlModel},</if>
<if test="mrlPeriod != null and mrlPeriod != ''">mrl_period = #{mrlPeriod},</if>
<if test="planPeriod != null and planPeriod != ''">plan_period = #{planPeriod},</if>
<if test="startTime != null">start_time = #{startTime},</if>
<if test="finishTime != null">finish_time = #{finishTime},</if>
<if test="superiorTime != null">superior_time = #{superiorTime},</if>
<if test="belowTime != null">below_time = #{belowTime},</if>
<if test="mrlWarning != null">mrl_warning = #{mrlWarning},</if>
<if test="updatebby != null">updatebby = #{updatebby},</if>
<if test="isDelete >= 0">is_delete = #{isDelete},</if>
<if test="isActive >= 0">is_active = #{isActive},</if>
<if test="createBy != null">create_by=#{createBy},</if>
<if test="createTime != null">create_time=#{createTime},</if>
<if test="updateBy != null">update_by=#{updateBy},</if>
<if test="updateTime != null">update_by=#{updateTime},</if>
</trim>
where wms_inventory_id = #{wmsInventoryID}
</update>
<update id="delById">
update wms_inventory set is_delete = 1 where WMS_INVENTORY_ID = #{Id}
</update>
<update id="delByIds">
update wms_inventory
set is_delete = 1
where wms_inventory_id in
<foreach item="id" collection="list" open="(" separator="," close=")">
#{id}
</foreach>
</update>
<select id="getList" resultType="com.ktg.mes.qc.domain.InventoryTask" resultMap="com.ktg.mes.qc.mapper.InventoryTaskMapper.InventoryTaskResult">
<include refid="selectInvenroryTaskVo"/>
<where>
<if test="wmsInventoryCode != null and wmsInventoryCode != ''">
AND WMS_UNVENTORY_CODE LIKE CONCAT('%', #{wmsInventoryCode}, '%')
</if>
<if test="name != null and name != ''">
AND NAME LIKE CONCAT('%', #{name}, '%')
</if>
and IS_DELETE = 0
</where>
</select>
<select id="selectInventoryTaskById" resultType="com.ktg.mes.qc.domain.InventoryTask" resultMap="com.ktg.mes.qc.mapper.InventoryTaskMapper.InventoryTaskResult">
<include refid="selectInvenroryTaskVo"></include>
where WMS_INVENTORY_ID = #{Id}
</select>
</mapper>

3
ktg-mes/src/main/resources/mapper/qc/QcTemplateMapper.xml
View File

@ -62,6 +62,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and t.qc_types like concat('%',#{qcType},'%') and t.qc_types like concat('%',#{qcType},'%')
limit 1 limit 1
</select> </select>
<select id="getAll" resultType="com.ktg.mes.qc.domain.QcTemplate" resultMap="QcTemplateResult">
select t.template_id, template_code, template_name, qc_types, enable_flag, t.remark from qc_template t
</select>
<insert id="insertQcTemplate" parameterType="QcTemplate" useGeneratedKeys="true" keyProperty="templateId"> <insert id="insertQcTemplate" parameterType="QcTemplate" useGeneratedKeys="true" keyProperty="templateId">
insert into qc_template insert into qc_template