mes/mes-lxsm
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: mes:7bb4f1ad9b166a03aee64b855c6e9c236fb43c97
Branches Tags
mes:master
..
compare: mes:4dd6e5be8a2a9251912eabc8fa90119f64e2a201
Branches Tags
mes:master

No commits in common. "7bb4f1ad9b166a03aee64b855c6e9c236fb43c97" and "4dd6e5be8a2a9251912eabc8fa90119f64e2a201" have entirely different histories.
7bb4f1ad9b ... 4dd6e5be8a

83 changed files with 90 additions and 861 deletions
Show Stats Expand all files Collapse all files

1
README.md
View File

@ -24,7 +24,6 @@
- 当前开发进度请参考doc->开发进度->进度甘特图.xlsx
- 第一版售前PPT请查看doc->售前资料->《苦糖果MES系统产品介绍（A4横板）.pptx》
- 操作手册/软件说明书请参考doc->售前资料->《苦糖果生产执行管理系统-【软件说明书】.docx》
- 完整数据库脚本请直接导入doc->实施文档->ktgmes****.sql.gz最新日期的压缩包。
欢迎交流沟通：QQ：411641505

8
ktg-admin/src/main/java/com/ktg/web/controller/system/SysDeptController.java
View File

@ -116,9 +116,8 @@ public class SysDeptController extends BaseController
{
return AjaxResult.error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
}
if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptCodeUnique(dept))) {
return AjaxResult.error("新增部门'" + dept.getDeptCode() + "'失败，部门编码已存在");
}
String s = autoCodeUtil.genSerialCode("DEPT_CODE", null);
dept.setDeptCode(s);
dept.setCreateBy(getUsername());
return toAjax(deptService.insertDept(dept));
}
@ -133,9 +132,6 @@ public class SysDeptController extends BaseController
{
Long deptId = dept.getDeptId();
deptService.checkDeptDataScope(deptId);
if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptCodeUnique(dept))) {
return AjaxResult.error("新增部门'" + dept.getDeptCode() + "'失败，部门编码已存在");
}
if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
{
return AjaxResult.error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");

11
ktg-mes/src/main/java/com/ktg/mes/dv/controller/DvCheckPlanController.java
View File

@ -7,7 +7,6 @@ import cn.hutool.core.collection.CollUtil;
import com.ktg.common.constant.UserConstants;
import com.ktg.mes.dv.domain.DvCheckMachinery;
import com.ktg.mes.dv.domain.DvCheckSubject;
import com.ktg.mes.dv.domain.dto.DvCheckPlanDTO;
import com.ktg.mes.dv.service.IDvCheckMachineryService;
import com.ktg.mes.dv.service.IDvCheckSubjectService;
import org.springframework.security.access.prepost.PreAuthorize;
@ -151,14 +150,4 @@ public class DvCheckPlanController extends BaseController
return toAjax(dvCheckPlanService.deleteDvCheckPlanByPlanIds(planIds));
}
/**
* 根据设备编码和计划类型查询设备点检计划头列表
* @return
*/
@PreAuthorize("@ss.hasPermi('mes:dv:checkplan:list')")
@GetMapping("/getCheckPlan")
public AjaxResult getCheckPlan(DvCheckPlanDTO checkPlanDTO) {
return dvCheckPlanService.getCheckPlan(checkPlanDTO);
}
}

10
ktg-mes/src/main/java/com/ktg/mes/dv/controller/DvRepairController.java
View File

@ -4,7 +4,6 @@ import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.ktg.common.constant.UserConstants;
import com.ktg.mes.dv.domain.dto.DvRepairDTO;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -110,13 +109,4 @@ public class DvRepairController extends BaseController
{
return toAjax(dvRepairService.deleteDvRepairByRepairIds(repairIds));
}
/**
* 根据设备编码查询设备维修单列表
*/
@PreAuthorize("@ss.hasPermi('mes:dv:repair:list')")
@GetMapping("/getRepairList")
public AjaxResult getRepairList(DvRepairDTO repairDTO) {
return dvRepairService.getRepairList(repairDTO);
}
}

12
ktg-mes/src/main/java/com/ktg/mes/dv/domain/dto/DvCheckPlanDTO.java
View File

@ -1,12 +0,0 @@
package com.ktg.mes.dv.domain.dto;
import lombok.Data;
@Data
public class DvCheckPlanDTO {
private String planType;
private String machineryCode;
}

10
ktg-mes/src/main/java/com/ktg/mes/dv/domain/dto/DvRepairDTO.java
View File

@ -1,10 +0,0 @@
package com.ktg.mes.dv.domain.dto;
import lombok.Data;
@Data
public class DvRepairDTO {
private String machineryCode;
}

8
ktg-mes/src/main/java/com/ktg/mes/dv/mapper/DvCheckMachineryMapper.java
View File

@ -2,7 +2,6 @@ package com.ktg.mes.dv.mapper;
import java.util.List;
import com.ktg.mes.dv.domain.DvCheckMachinery;
import org.apache.ibatis.annotations.Param;
/**
* 点检设备Mapper接口
@ -68,11 +67,4 @@ public interface DvCheckMachineryMapper
* @return
*/
public int deleteByPlanId(Long planId);
/**
* 根据设备编码获取相关计划id
* @param machineryCode
* @return
*/
List<Long> getPlanId(@Param("machineryCode") String machineryCode);
}

4
ktg-mes/src/main/java/com/ktg/mes/dv/mapper/DvCheckPlanMapper.java
View File

@ -2,8 +2,6 @@ package com.ktg.mes.dv.mapper;
import java.util.List;
import com.ktg.mes.dv.domain.DvCheckPlan;
import org.apache.ibatis.annotations.Param;
import org.springframework.security.core.parameters.P;
/**
* 设备点检计划头Mapper接口
@ -62,6 +60,4 @@ public interface DvCheckPlanMapper
* @return 结果
*/
public int deleteDvCheckPlanByPlanIds(Long[] planIds);
List<DvCheckPlan> getByIds(@Param("planIds") List<Long> planIds,@Param("planType") String planType);
}

10
ktg-mes/src/main/java/com/ktg/mes/dv/mapper/DvRepairMapper.java
View File

@ -1,9 +1,7 @@
package com.ktg.mes.dv.mapper;
import java.util.List;
import com.ktg.mes.dv.domain.DvRepair;
import org.apache.ibatis.annotations.Param;
/**
* 设备维修单Mapper接口
@ -63,12 +61,4 @@ public interface DvRepairMapper
* @return 结果
*/
public int deleteDvRepairByRepairIds(Long[] repairIds);
/**
* 根据设备编码查询设备维修单列表
*
* @param machineryCode
* @return
*/
List<DvRepair> getRepairList(@Param("machineryCode") String machineryCode);
}

7
ktg-mes/src/main/java/com/ktg/mes/dv/service/IDvCheckMachineryService.java
View File

@ -67,11 +67,4 @@ public interface IDvCheckMachineryService
* @return
*/
public int deleteByPlanId(Long planId);
/**
* 根据设备编码获取相关计划id
* @param machineryCode
* @return
*/
List<Long> getPlanId(String machineryCode);
}

10
ktg-mes/src/main/java/com/ktg/mes/dv/service/IDvCheckPlanService.java
View File

@ -1,10 +1,7 @@
package com.ktg.mes.dv.service;
import java.util.List;
import com.ktg.common.core.domain.AjaxResult;
import com.ktg.mes.dv.domain.DvCheckPlan;
import com.ktg.mes.dv.domain.dto.DvCheckPlanDTO;
/**
* 设备点检计划头Service接口
@ -68,11 +65,4 @@ public interface IDvCheckPlanService
* @return 结果
*/
public int deleteDvCheckPlanByPlanId(Long planId);
/**
* 根据设备编码和计划类型查询设备点检计划头列表
* @return
*/
AjaxResult getCheckPlan(DvCheckPlanDTO checkPlanDTO);
}

10
ktg-mes/src/main/java/com/ktg/mes/dv/service/IDvRepairService.java
View File

@ -1,10 +1,7 @@
package com.ktg.mes.dv.service;
import java.util.List;
import com.ktg.common.core.domain.AjaxResult;
import com.ktg.mes.dv.domain.DvRepair;
import com.ktg.mes.dv.domain.dto.DvRepairDTO;
/**
* 设备维修单Service接口
@ -68,11 +65,4 @@ public interface IDvRepairService
* @return 结果
*/
public int deleteDvRepairByRepairId(Long repairId);
/**
* 根据设备编码查询设备维修单列表
* @param repairDTO
* @return
*/
AjaxResult getRepairList(DvRepairDTO repairDTO);
}

5
ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvCheckMachineryServiceImpl.java
View File

@ -111,9 +111,4 @@ public class DvCheckMachineryServiceImpl implements IDvCheckMachineryService
public int deleteByPlanId(Long planId) {
return dvCheckMachineryMapper.deleteByPlanId(planId);
}
@Override
public List<Long> getPlanId(String machineryCode) {
return dvCheckMachineryMapper.getPlanId(machineryCode);
}
}

23
ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvCheckPlanServiceImpl.java
View File

@ -3,12 +3,8 @@ package com.ktg.mes.dv.service.impl;
import java.util.List;
import com.ktg.common.constant.UserConstants;
import com.ktg.common.core.domain.AjaxResult;
import com.ktg.common.utils.DateUtils;
import com.ktg.common.utils.StringUtils;
import com.ktg.mes.dv.domain.dto.DvCheckPlanDTO;
import com.ktg.mes.dv.service.IDvCheckMachineryService;
import org.aspectj.weaver.loadtime.Aj;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ktg.mes.dv.mapper.DvCheckPlanMapper;
@ -27,9 +23,6 @@ public class DvCheckPlanServiceImpl implements IDvCheckPlanService
@Autowired
private DvCheckPlanMapper dvCheckPlanMapper;
@Autowired
private IDvCheckMachineryService dvCheckMachineryService;
/**
* 查询设备点检计划头
*
@ -113,20 +106,4 @@ public class DvCheckPlanServiceImpl implements IDvCheckPlanService
{
return dvCheckPlanMapper.deleteDvCheckPlanByPlanId(planId);
}
/**
* 根据设备编码和计划类型查询设备点检计划头列表
* @return
*/
@Override
public AjaxResult getCheckPlan(DvCheckPlanDTO checkPlanDTO) {
// 根据设备编码获取相关计划id
List<Long> planIds = dvCheckMachineryService.getPlanId(checkPlanDTO.getMachineryCode());
if (planIds != null && planIds.size() > 0) {
// 根据设备编码和计划类型获取相关设备点检计划头列表
List<DvCheckPlan> list = dvCheckPlanMapper.getByIds(planIds, checkPlanDTO.getPlanType());
return AjaxResult.success(list);
}
return AjaxResult.success();
}
}

13
ktg-mes/src/main/java/com/ktg/mes/dv/service/impl/DvRepairServiceImpl.java
View File

@ -3,10 +3,8 @@ package com.ktg.mes.dv.service.impl;
import java.util.List;
import com.ktg.common.constant.UserConstants;
import com.ktg.common.core.domain.AjaxResult;
import com.ktg.common.utils.DateUtils;
import com.ktg.common.utils.StringUtils;
import com.ktg.mes.dv.domain.dto.DvRepairDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ktg.mes.dv.mapper.DvRepairMapper;
@ -108,15 +106,4 @@ public class DvRepairServiceImpl implements IDvRepairService
{
return dvRepairMapper.deleteDvRepairByRepairId(repairId);
}
/**
* 根据设备编码查询设备维修单列表
* @param repairDTO
* @return
*/
@Override
public AjaxResult getRepairList(DvRepairDTO repairDTO) {
List<DvRepair> list = dvRepairMapper.getRepairList(repairDTO.getMachineryCode());
return AjaxResult.success(list);
}
}

12
ktg-mes/src/main/java/com/ktg/mes/md/domain/MdProductBom.java
View File

@ -43,9 +43,6 @@ public class MdProductBom extends BaseEntity
@Excel(name = "BOM物料单位")
private String unitOfMeasure;
/** BOM物料单位名称 */
private String unitName;
/** 产品物料标识 */
@Excel(name = "产品物料标识")
private String itemOrProduct;
@ -70,14 +67,6 @@ public class MdProductBom extends BaseEntity
/** 预留字段4 */
private Long attr4;
public String getUnitName() {
return unitName;
}
public void setUnitName(String unitName) {
this.unitName = unitName;
}
public void setBomId(Long bomId)
{
this.bomId = bomId;
@ -215,7 +204,6 @@ public class MdProductBom extends BaseEntity
.append("bomItemName", getBomItemName())
.append("bomItemSpec", getBomItemSpec())
.append("unitOfMeasure", getUnitOfMeasure())
.append("unitName", getUnitName())
.append("itemOrProduct", getItemOrProduct())
.append("quantity", getQuantity())
.append("enableFlag", getEnableFlag())

12
ktg-mes/src/main/java/com/ktg/mes/md/domain/MdWorkshop.java
View File

@ -35,9 +35,6 @@ public class MdWorkshop extends BaseEntity
@Excel(name = "负责人")
private String charge;
/** 负责人id */
private Long chargeId;
/** 是否启用 */
@Excel(name = "是否启用")
private String enableFlag;
@ -54,14 +51,6 @@ public class MdWorkshop extends BaseEntity
/** 预留字段4 */
private Long attr4;
public Long getChargeId() {
return chargeId;
}
public void setChargeId(Long chargeId) {
this.chargeId = chargeId;
}
public void setWorkshopId(Long workshopId)
{
this.workshopId = workshopId;
@ -161,7 +150,6 @@ public class MdWorkshop extends BaseEntity
.append("workshopName", getWorkshopName())
.append("area", getArea())
.append("charge", getCharge())
.append("chargeId", getChargeId())
.append("enableFlag", getEnableFlag())
.append("remark", getRemark())
.append("attr1", getAttr1())

1
ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProWorkorderController.java
View File

@ -228,7 +228,6 @@ public class ProWorkorderController extends BaseController
theBom.setBomItemCode(bom.getItemCode());
theBom.setItemOrProduct(bom.getItemOrProduct());
theBom.setUnitOfMeasure(bom.getUnitOfMeasure());
theBom.setUnitName(bom.getUnitName());
theBom.setBomItemSpec(bom.getItemSpc());
theBom.setQuantity(bom.getQuantity());
result.addAll(getBoms(theBom,bom.getQuantity(),0));

11
ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProCard.java
View File

@ -62,9 +62,6 @@ public class ProCard extends BaseEntity
@Excel(name = "单位")
private String unitOfMeasure;
/** 单位名称 */
private String unitName;
/** 赋码地址 */
@Excel(name = "赋码地址")
private String barcodeUrl;
@ -100,13 +97,6 @@ public class ProCard extends BaseEntity
@JsonFormat(pattern = "yyyy-MM-dd")
private Date inputTime;
public String getUnitName() {
return unitName;
}
public void setUnitName(String unitName) {
this.unitName = unitName;
}
public void setCardId(Long cardId)
{
@ -301,7 +291,6 @@ public class ProCard extends BaseEntity
.append("itemName", getItemName())
.append("specification", getSpecification())
.append("unitOfMeasure", getUnitOfMeasure())
.append("unitName", getUnitName())
.append("barcodeUrl", getBarcodeUrl())
.append("quantityTransfered", getQuantityTransfered())
.append("status", getStatus())

12
ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProRouteProduct.java
View File

@ -43,9 +43,6 @@ public class ProRouteProduct extends BaseEntity
@Excel(name = "单位")
private String unitOfMeasure;
/** 单位名称 */
private String unitName;
/** 生产数量 */
@Excel(name = "生产数量")
private Long quantity;
@ -70,14 +67,6 @@ public class ProRouteProduct extends BaseEntity
/** 预留字段4 */
private Long attr4;
public String getUnitName() {
return unitName;
}
public void setUnitName(String unitName) {
this.unitName = unitName;
}
public void setRecordId(Long recordId)
{
this.recordId = recordId;
@ -215,7 +204,6 @@ public class ProRouteProduct extends BaseEntity
.append("itemName", getItemName())
.append("specification", getSpecification())
.append("unitOfMeasure", getUnitOfMeasure())
.append("unitName", getUnitName())
.append("quantity", getQuantity())
.append("productionTime", getProductionTime())
.append("timeUnitType", getTimeUnitType())

12
ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProWorkorder.java
View File

@ -63,9 +63,6 @@ public class ProWorkorder extends TreeEntity
@Excel(name = "单位")
private String unitOfMeasure;
/** 单位名称 */
private String unitName;
/** 批次号 */
@Excel(name = "批次号")
private String batchCode;
@ -139,14 +136,6 @@ public class ProWorkorder extends TreeEntity
private List<ProTask> tasks;
public String getUnitName() {
return unitName;
}
public void setUnitName(String unitName) {
this.unitName = unitName;
}
public void setWorkorderId(Long workorderId)
{
this.workorderId = workorderId;
@ -427,7 +416,6 @@ public class ProWorkorder extends TreeEntity
", productName='" + productName + '\'' +
", productSpc='" + productSpc + '\'' +
", unitOfMeasure='" + unitOfMeasure + '\'' +
", unitName='" + unitName + '\'' +
", batchCode='" + batchCode + '\'' +
", quantity=" + quantity +
", quantityProduced=" + quantityProduced +

12
ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProWorkorderBom.java
View File

@ -43,9 +43,6 @@ public class ProWorkorderBom extends BaseEntity
@Excel(name = "单位")
private String unitOfMeasure;
/** 单位名称 */
private String unitName;
/** 物料产品标识 */
@Excel(name = "物料产品标识")
private String itemOrProduct;
@ -66,14 +63,6 @@ public class ProWorkorderBom extends BaseEntity
/** 预留字段4 */
private Long attr4;
public String getUnitName() {
return unitName;
}
public void setUnitName(String unitName) {
this.unitName = unitName;
}
public void setLineId(Long lineId)
{
this.lineId = lineId;
@ -202,7 +191,6 @@ public class ProWorkorderBom extends BaseEntity
.append("itemName", getItemName())
.append("itemSpc", getItemSpc())
.append("unitOfMeasure", getUnitOfMeasure())
.append("unitName", getUnitName())
.append("itemOrProduct", getItemOrProduct())
.append("quantity", getQuantity())
.append("remark", getRemark())

12
ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcIpqc.java
View File

@ -115,9 +115,6 @@ public class QcIpqc extends BaseEntity
@Excel(name = "单位")
private String unitOfMeasure;
/** 单位名称 */
private String unitName;
/** 检测数量 */
@Excel(name = "检测数量")
private BigDecimal quantityCheck;
@ -183,14 +180,6 @@ public class QcIpqc extends BaseEntity
/** 预留字段4 */
private Long attr4;
public String getUnitName() {
return unitName;
}
public void setUnitName(String unitName) {
this.unitName = unitName;
}
public void setIpqcId(Long ipqcId)
{
this.ipqcId = ipqcId;
@ -601,7 +590,6 @@ public class QcIpqc extends BaseEntity
.append("itemName", getItemName())
.append("specification", getSpecification())
.append("unitOfMeasure", getUnitOfMeasure())
.append("unitName=", getUnitName())
.append("quantityCheck", getQuantityCheck())
.append("quantityUnqualified", getQuantityUnqualified())
.append("quantityQualified", getQuantityQualified())

12
ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcIqc.java
View File

@ -84,9 +84,6 @@ public class QcIqc extends BaseEntity
@Excel(name = "单位")
private String unitOfMeasure;
/** 单位名称 */
private String unitName;
/** 最低检测数 */
@Excel(name = "最低检测数")
private BigDecimal quantityMinCheck;
@ -173,14 +170,6 @@ public class QcIqc extends BaseEntity
/** 预留字段4 */
private Long attr4;
public String getUnitName() {
return unitName;
}
public void setUnitName(String unitName) {
this.unitName = unitName;
}
public void setIqcId(Long iqcId)
{
this.iqcId = iqcId;
@ -555,7 +544,6 @@ public class QcIqc extends BaseEntity
", itemName='" + itemName + '\'' +
", specification='" + specification + '\'' +
", unitOfMeasure='" + unitOfMeasure + '\'' +
", unitName='" + unitName + "\'" +
", quantityMinCheck=" + quantityMinCheck +
", quantityMaxUnqualified=" + quantityMaxUnqualified +
", quantityRecived=" + quantityRecived +

12
ktg-mes/src/main/java/com/ktg/mes/qc/domain/QcTemplateProduct.java
View File

@ -43,9 +43,6 @@ public class QcTemplateProduct extends BaseEntity
@Excel(name = "单位")
private String unitOfMeasure;
/** 单位名称 */
private String unitName;
/** 最低检测数 */
@Excel(name = "最低检测数")
private Long quantityCheck;
@ -78,14 +75,6 @@ public class QcTemplateProduct extends BaseEntity
/** 预留字段4 */
private Long attr4;
public String getUnitName() {
return unitName;
}
public void setUnitName(String unitName) {
this.unitName = unitName;
}
public void setRecordId(Long recordId)
{
this.recordId = recordId;
@ -241,7 +230,6 @@ public class QcTemplateProduct extends BaseEntity
.append("itemName", getItemName())
.append("specification", getSpecification())
.append("unitOfMeasure", getUnitOfMeasure())
.append("unitName", getUnitName())
.append("quantityCheck", getQuantityCheck())
.append("quantityUnqualified", getQuantityUnqualified())
.append("crRate", getCrRate())

4
ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmStorageAreaController.java
View File

@ -106,6 +106,8 @@ public class WmStorageAreaController extends BaseController
@DeleteMapping("/{areaIds}")
public AjaxResult remove(@PathVariable Long[] areaIds)
{
return wmStorageAreaService.deleteWmStorageAreaByAreaIds(areaIds);
//TODO:库位删除之前的逻辑校验
return toAjax(wmStorageAreaService.deleteWmStorageAreaByAreaIds(areaIds));
}
}

6
ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmStorageLocationController.java
View File

@ -112,6 +112,12 @@ public class WmStorageLocationController extends BaseController
@DeleteMapping("/{locationIds}")
public AjaxResult remove(@PathVariable Long[] locationIds)
{
// //TODO:库区删除之前的逻辑校验
//
// for (Long locationId: locationIds
// ) {
// wmStorageAreaService.deleteByLocationId(locationId);
// }
return wmStorageLocationService.deleteWmStorageLocationByLocationIds(locationIds);
}

11
ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmWarehouseController.java
View File

@ -139,6 +139,15 @@ public class WmWarehouseController extends BaseController
@DeleteMapping("/{warehouseIds}")
public AjaxResult remove(@PathVariable Long[] warehouseIds)
{
return wmWarehouseService.deleteWmWarehouseByWarehouseIds(warehouseIds);
//TODO:仓库删除之前的逻辑校验
for (Long wahouseId: warehouseIds
) {
wmStorageLocationService.deleteByWarehouseId(wahouseId);
wmStorageAreaService.deleteByWarehouseId(wahouseId);
}
return toAjax(wmWarehouseService.deleteWmWarehouseByWarehouseIds(warehouseIds));
}
}

11
ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmArrivalNoticeLine.java
View File

@ -43,9 +43,6 @@ public class WmArrivalNoticeLine extends BaseEntity
@Excel(name = "单位")
private String unitOfMeasure;
/** 单位名称 */
private String unitName;
/** 到货数量 */
@Excel(name = "到货数量")
private BigDecimal quantityArrival;
@ -78,14 +75,6 @@ public class WmArrivalNoticeLine extends BaseEntity
/** 预留字段4 */
private Long attr4;
public String getUnitName() {
return unitName;
}
public void setUnitName(String unitName) {
this.unitName = unitName;
}
public void setLineId(Long lineId)
{
this.lineId = lineId;

12
ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmIssueLine.java
View File

@ -45,9 +45,6 @@ public class WmIssueLine extends BaseEntity
@Excel(name = "单位")
private String unitOfMeasure;
/** 单位名称 */
private String unitName;
/** 领料数量 */
@Excel(name = "领料数量")
private BigDecimal quantityIssued;
@ -104,14 +101,6 @@ public class WmIssueLine extends BaseEntity
/** 预留字段4 */
private Long attr4;
public String getUnitName() {
return unitName;
}
public void setUnitName(String unitName) {
this.unitName = unitName;
}
public void setLineId(Long lineId)
{
this.lineId = lineId;
@ -329,7 +318,6 @@ public class WmIssueLine extends BaseEntity
.append("itemName", getItemName())
.append("specification", getSpecification())
.append("unitOfMeasure", getUnitOfMeasure())
.append("unitName", getUnitName())
.append("quantityIssued", getQuantityIssued())
.append("batchCode", getBatchCode())
.append("warehouseId", getWarehouseId())

12
ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmItemRecptLine.java
View File

@ -50,9 +50,6 @@ public class WmItemRecptLine extends BaseEntity
@Excel(name = "单位")
private String unitOfMeasure;
/** 单位名称 */
private String unitName;
/** 入库数量 */
@Excel(name = "入库数量")
private BigDecimal quantityRecived;
@ -129,14 +126,6 @@ public class WmItemRecptLine extends BaseEntity
/** 预留字段4 */
private Long attr4;
public String getUnitName() {
return unitName;
}
public void setUnitName(String unitName) {
this.unitName = unitName;
}
public void setLineId(Long lineId)
{
this.lineId = lineId;
@ -380,7 +369,6 @@ public class WmItemRecptLine extends BaseEntity
", itemName='" + itemName + '\'' +
", specification='" + specification + '\'' +
", unitOfMeasure='" + unitOfMeasure + '\'' +
", unitName='" + unitName + '\'' +
", quantityRecived=" + quantityRecived +
", batchCode='" + batchCode + '\'' +
", warehouseId=" + warehouseId +

12
ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmOutsourceIssueLine.java
View File

@ -47,9 +47,6 @@ public class WmOutsourceIssueLine extends BaseEntity
@Excel(name = "单位")
private String unitOfMeasure;
/** 单位名称 */
private String unitName;
/** 领料数量 */
@Excel(name = "领料数量")
private BigDecimal quantityIssued;
@ -106,14 +103,6 @@ public class WmOutsourceIssueLine extends BaseEntity
/** 预留字段4 */
private Long attr4;
public String getUnitName() {
return unitName;
}
public void setUnitName(String unitName) {
this.unitName = unitName;
}
public void setLineId(Long lineId)
{
this.lineId = lineId;
@ -333,7 +322,6 @@ public class WmOutsourceIssueLine extends BaseEntity
.append("itemName", getItemName())
.append("specification", getSpecification())
.append("unitOfMeasure", getUnitOfMeasure())
.append("unitName", getUnitName())
.append("quantityIssued", getQuantityIssued())
.append("batchCode", getBatchCode())
.append("warehouseId", getWarehouseId())

12
ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmOutsourceRecptLine.java
View File

@ -45,9 +45,6 @@ public class WmOutsourceRecptLine extends BaseEntity
@Excel(name = "单位")
private String unitOfMeasure;
/** 单位名称 */
private String unitName;
/** 入库数量 */
@Excel(name = "入库数量")
private BigDecimal quantityRecived;
@ -121,14 +118,6 @@ public class WmOutsourceRecptLine extends BaseEntity
/** 预留字段4 */
private Long attr4;
public String getUnitName() {
return unitName;
}
public void setUnitName(String unitName) {
this.unitName = unitName;
}
public void setLineId(Long lineId)
{
this.lineId = lineId;
@ -374,7 +363,6 @@ public class WmOutsourceRecptLine extends BaseEntity
.append("itemName", getItemName())
.append("specification", getSpecification())
.append("unitOfMeasure", getUnitOfMeasure())
.append("unitName", getUnitName())
.append("quantityRecived", getQuantityRecived())
.append("batchCode", getBatchCode())
.append("warehouseId", getWarehouseId())

12
ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmPackageLine.java
View File

@ -49,9 +49,6 @@ public class WmPackageLine extends BaseEntity
@Excel(name = "单位")
private String unitOfMeasure;
/** 单位名称 */
private String unitName;
/** 装箱数量 */
@Excel(name = "装箱数量")
private BigDecimal quantityPackage;
@ -121,14 +118,6 @@ public class WmPackageLine extends BaseEntity
/** 预留字段4 */
private Long attr4;
public String getUnitName() {
return unitName;
}
public void setUnitName(String unitName) {
this.unitName = unitName;
}
public void setLineId(Long lineId)
{
this.lineId = lineId;
@ -375,7 +364,6 @@ public class WmPackageLine extends BaseEntity
.append("itemName", getItemName())
.append("specification", getSpecification())
.append("unitOfMeasure", getUnitOfMeasure())
.append("unitName", getUnitName())
.append("quantityPackage", getQuantityPackage())
.append("workorderId", getWorkorderId())
.append("workorderCode", getWorkorderCode())

12
ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmProductRecptLine.java
View File

@ -50,9 +50,6 @@ public class WmProductRecptLine extends BaseEntity
@Excel(name = "单位")
private String unitOfMeasure;
/** 单位名称 */
private String unitName;
/** 入库数量 */
@Excel(name = "入库数量")
private BigDecimal quantityRecived;
@ -114,14 +111,6 @@ public class WmProductRecptLine extends BaseEntity
/** 预留字段4 */
private Long attr4;
public String getUnitName() {
return unitName;
}
public void setUnitName(String unitName) {
this.unitName = unitName;
}
public void setLineId(Long lineId)
{
this.lineId = lineId;
@ -350,7 +339,6 @@ public class WmProductRecptLine extends BaseEntity
", itemName='" + itemName + '\'' +
", specification='" + specification + '\'' +
", unitOfMeasure='" + unitOfMeasure + '\'' +
", unitName='" + unitName + '\'' +
", quantityRecived=" + quantityRecived +
", batchCode='" + batchCode + '\'' +
", warehouseId=" + warehouseId +

12
ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmProductSalseLine.java
View File

@ -47,9 +47,6 @@ public class WmProductSalseLine extends BaseEntity
@Excel(name = "单位")
private String unitOfMeasure;
/** 单位名称 */
private String unitName;
/** 出库数量 */
@Excel(name = "出库数量")
private BigDecimal quantitySalse;
@ -121,14 +118,6 @@ public class WmProductSalseLine extends BaseEntity
/** 预留字段4 */
private Long attr4;
public String getUnitName() {
return unitName;
}
public void setUnitName(String unitName) {
this.unitName = unitName;
}
public void setLineId(Long lineId)
{
this.lineId = lineId;
@ -373,7 +362,6 @@ public class WmProductSalseLine extends BaseEntity
", itemName='" + itemName + '\'' +
", specification='" + specification + '\'' +
", unitOfMeasure='" + unitOfMeasure + '\'' +
", unitName='" + unitName + '\'' +
", quantitySalse=" + quantitySalse +
", batchCode='" + batchCode + '\'' +
", warehouseId=" + warehouseId +

12
ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmRtIssueLine.java
View File

@ -47,9 +47,6 @@ public class WmRtIssueLine extends BaseEntity
@Excel(name = "单位")
private String unitOfMeasure;
/** 单位名称 */
private String unitName;
/** 退料数量 */
@Excel(name = "退料数量")
private BigDecimal quantityRt;
@ -106,14 +103,6 @@ public class WmRtIssueLine extends BaseEntity
/** 预留字段4 */
private Long attr4;
public String getUnitName() {
return unitName;
}
public void setUnitName(String unitName) {
this.unitName = unitName;
}
public void setLineId(Long lineId)
{
this.lineId = lineId;
@ -333,7 +322,6 @@ public class WmRtIssueLine extends BaseEntity
.append("itemName", getItemName())
.append("specification", getSpecification())
.append("unitOfMeasure", getUnitOfMeasure())
.append("unitName", getUnitName())
.append("quantityRt", getQuantityRt())
.append("batchCode", getBatchCode())
.append("warehouseId", getWarehouseId())

12
ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmRtSalseLine.java
View File

@ -45,9 +45,6 @@ public class WmRtSalseLine extends BaseEntity
@Excel(name = "单位")
private String unitOfMeasure;
/** 单位名称 */
private String unitName;
/** 退货数量 */
@Excel(name = "退货数量")
private BigDecimal quantityRted;
@ -109,14 +106,6 @@ public class WmRtSalseLine extends BaseEntity
/** 预留字段4 */
private Long attr4;
public String getUnitName() {
return unitName;
}
public void setUnitName(String unitName) {
this.unitName = unitName;
}
public void setLineId(Long lineId)
{
this.lineId = lineId;
@ -335,7 +324,6 @@ public class WmRtSalseLine extends BaseEntity
.append("itemName", getItemName())
.append("specification", getSpecification())
.append("unitOfMeasure", getUnitOfMeasure())
.append("unitName", getUnitName())
.append("quantityRted", getQuantityRted())
.append("batchCode", getBatchCode())
.append("warehouseId", getWarehouseId())

12
ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmRtVendorLine.java
View File

@ -45,9 +45,6 @@ public class WmRtVendorLine extends BaseEntity
@Excel(name = "单位")
private String unitOfMeasure;
/** 单位名称 */
private String unitName;
/** 退货数量 */
@Excel(name = "退货数量")
private BigDecimal quantityRted;
@ -104,14 +101,6 @@ public class WmRtVendorLine extends BaseEntity
/** 预留字段4 */
private Long attr4;
public String getUnitName() {
return unitName;
}
public void setUnitName(String unitName) {
this.unitName = unitName;
}
public void setLineId(Long lineId)
{
this.lineId = lineId;
@ -331,7 +320,6 @@ public class WmRtVendorLine extends BaseEntity
", itemName='" + itemName + '\'' +
", specification='" + specification + '\'' +
", unitOfMeasure='" + unitOfMeasure + '\'' +
", unitName='" + unitName + '\'' +
", quantityRted=" + quantityRted +
", batchCode='" + batchCode + '\'' +
", warehouseId=" + warehouseId +

12
ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmSn.java
View File

@ -45,9 +45,6 @@ public class WmSn extends BaseEntity
@Excel(name = "单位")
private String unitOfMeasure;
/** 单位名称 */
private String unitName;
/** 批次号 */
@Excel(name = "批次号")
private String batchCode;
@ -83,14 +80,6 @@ public class WmSn extends BaseEntity
/** 预留字段4 */
private Long attr4;
public String getUnitName() {
return unitName;
}
public void setUnitName(String unitName) {
this.unitName = unitName;
}
public void setSnId(Long snId)
{
this.snId = snId;
@ -260,7 +249,6 @@ public class WmSn extends BaseEntity
", itemName='" + itemName + '\'' +
", specification='" + specification + '\'' +
", unitOfMeasure='" + unitOfMeasure + '\'' +
", unitName='" + unitName + '\'' +
", batchCode='" + batchCode + '\'' +
", snNum=" + snNum +
", genDate=" + genDate +

12
ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmTransferLine.java
View File

@ -49,9 +49,6 @@ public class WmTransferLine extends BaseEntity
@Excel(name = "单位")
private String unitOfMeasure;
/** 单位名称 */
private String unitName;
/** 装箱数量 */
@Excel(name = "装箱数量")
private BigDecimal quantityTransfer;
@ -173,14 +170,6 @@ public class WmTransferLine extends BaseEntity
/** 预留字段4 */
private Long attr4;
public String getUnitName() {
return unitName;
}
public void setUnitName(String unitName) {
this.unitName = unitName;
}
public void setLineId(Long lineId)
{
this.lineId = lineId;
@ -544,7 +533,6 @@ public class WmTransferLine extends BaseEntity
.append("itemName", getItemName())
.append("specification", getSpecification())
.append("unitOfMeasure", getUnitOfMeasure())
.append("unitName", getUnitName())
.append("quantityTransfer", getQuantityTransfer())
.append("workorderId", getWorkorderId())
.append("workorderCode", getWorkorderCode())

17
ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmMaterialStockMapper.java
View File

@ -1,7 +1,6 @@
package com.ktg.mes.wm.mapper;
import com.ktg.mes.wm.domain.WmMaterialStock;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -71,20 +70,4 @@ public interface WmMaterialStockMapper
* @return 结果
*/
public int deleteWmMaterialStockByMaterialStockIds(Long[] materialStockIds);
/**
* 根据库位id查询相关库存现有量数据
* @param areaId
* @return
*/
List<WmMaterialStock> getByAreaId(@Param("areaId") Long areaId);
/**
* 根据库区id查询相关库存现有量
* @param locationId
* @return
*/
List<WmMaterialStock> getLocationId(@Param("locationId") Long locationId);
List<WmMaterialStock> getByWarehouseId(@Param("warehouseId") Long warehouseId);
}

5
ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmStorageAreaMapper.java
View File

@ -2,7 +2,6 @@ package com.ktg.mes.wm.mapper;
import java.util.List;
import com.ktg.mes.wm.domain.WmStorageArea;
import org.apache.ibatis.annotations.Param;
/**
* 库位设置Mapper接口
@ -91,8 +90,4 @@ public interface WmStorageAreaMapper
* @return
*/
public int deleteByLocationId(Long locationId);
List<WmStorageArea> selectByAreaIds(@Param("ids") Long[] areaIds);
int deleteByLocationIds(@Param("ids") Long[] locationIds);
}

7
ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmWarehouseMapper.java
View File

@ -2,7 +2,6 @@ package com.ktg.mes.wm.mapper;
import java.util.List;
import com.ktg.mes.wm.domain.WmWarehouse;
import org.apache.ibatis.annotations.Param;
/**
* 仓库设置Mapper接口
@ -73,10 +72,4 @@ public interface WmWarehouseMapper
*/
public int deleteWmWarehouseByWarehouseIds(Long[] warehouseIds);
/**
* 根据仓库id查询相关仓库数据
* @param warehouseIds
* @return
*/
List<WmWarehouse> selectByWarehouseId(@Param("ids") Long[] warehouseIds);
}

21
ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmMaterialStockService.java
View File

@ -71,25 +71,4 @@ public interface IWmMaterialStockService
* @return 结果
*/
public int deleteWmMaterialStockByMaterialStockId(Long materialStockId);
/**
* 根据库位id查询相关库存现有量数据
* @param areaId
* @return
*/
List<WmMaterialStock> getByAreaId(Long areaId);
/**
* 根据库区id查询相关库存现有量
* @param locationId
* @return
*/
List<WmMaterialStock> getLocationId(Long locationId);
/**
* 根据仓库id查询相关库存现有量
* @param warehouseId
* @return
*/
List<WmMaterialStock> getByWarehouseId(Long warehouseId);
}

12
ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmStorageAreaService.java
View File

@ -1,8 +1,6 @@
package com.ktg.mes.wm.service;
import java.util.List;
import com.ktg.common.core.domain.AjaxResult;
import com.ktg.mes.wm.domain.WmStorageArea;
/**
@ -73,7 +71,7 @@ public interface IWmStorageAreaService
* @param areaIds 需要删除的库位设置主键集合
* @return 结果
*/
public AjaxResult deleteWmStorageAreaByAreaIds(Long[] areaIds);
public int deleteWmStorageAreaByAreaIds(Long[] areaIds);
/**
* 删除库位设置信息
@ -96,12 +94,4 @@ public interface IWmStorageAreaService
* @return
*/
public int deleteByLocationId(Long locationId);
/**
* 根据库区ids删除相关的库位数据
*
* @param locationIds
* @return
*/
int deleteByLocationIds(Long[] locationIds);
}

4
ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmWarehouseService.java
View File

@ -1,8 +1,6 @@
package com.ktg.mes.wm.service;
import java.util.List;
import com.ktg.common.core.domain.AjaxResult;
import com.ktg.mes.wm.domain.WmWarehouse;
/**
@ -74,7 +72,7 @@ public interface IWmWarehouseService
* @param warehouseIds 需要删除的仓库设置主键集合
* @return 结果
*/
public AjaxResult deleteWmWarehouseByWarehouseIds(Long[] warehouseIds);
public int deleteWmWarehouseByWarehouseIds(Long[] warehouseIds);
/**
* 删除仓库设置信息

30
ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmMaterialStockServiceImpl.java
View File

@ -100,34 +100,4 @@ public class WmMaterialStockServiceImpl implements IWmMaterialStockService
{
return wmMaterialStockMapper.deleteWmMaterialStockByMaterialStockId(materialStockId);
}
/**
* 根据库位id查询相关库存现有量数据
* @param areaId
* @return
*/
@Override
public List<WmMaterialStock> getByAreaId(Long areaId) {
return wmMaterialStockMapper.getByAreaId(areaId);
}
/**
* 根据库区id查询相关库存现有量
* @param locationId
* @return
*/
@Override
public List<WmMaterialStock> getLocationId(Long locationId) {
return wmMaterialStockMapper.getLocationId(locationId);
}
/**
* 根据仓库id查询相关库存现有量
* @param warehouseId
* @return
*/
@Override
public List<WmMaterialStock> getByWarehouseId(Long warehouseId) {
return wmMaterialStockMapper.getByWarehouseId(warehouseId);
}
}

44
ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmStorageAreaServiceImpl.java
View File

@ -1,14 +1,7 @@
package com.ktg.mes.wm.service.impl;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import com.ktg.common.core.domain.AjaxResult;
import com.ktg.common.utils.DateUtils;
import com.ktg.mes.wm.domain.WmMaterialStock;
import com.ktg.mes.wm.service.IWmMaterialStockService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ktg.mes.wm.mapper.WmStorageAreaMapper;
@ -27,9 +20,6 @@ public class WmStorageAreaServiceImpl implements IWmStorageAreaService
@Autowired
private WmStorageAreaMapper wmStorageAreaMapper;
@Autowired
private IWmMaterialStockService wmMaterialStockService;
/**
* 查询库位设置
*
@ -108,34 +98,9 @@ public class WmStorageAreaServiceImpl implements IWmStorageAreaService
* @return 结果
*/
@Override
public AjaxResult deleteWmStorageAreaByAreaIds(Long[] areaIds)
public int deleteWmStorageAreaByAreaIds(Long[] areaIds)
{
// 查询所有删除数据
List<WmStorageArea> areaList = wmStorageAreaMapper.selectByAreaIds(areaIds);
for (WmStorageArea item : areaList) {
String areaCode = item.getAreaCode();
if (areaCode.contains("VIRTUAL")) {
return AjaxResult.error("虚拟库位不能删除");
}
}
// 校验库位中是否存在物料
for (Long areaId : areaIds) {
// 根据库位查询相关数据
List<WmMaterialStock> list = wmMaterialStockService.getByAreaId(areaId);
if (list != null && list.size() > 0) {
Map<Long, List<WmMaterialStock>> collect = list.stream()
.collect(Collectors.groupingBy(WmMaterialStock::getItemId));
for (Long l : collect.keySet()) {
List<WmMaterialStock> wmMaterialStocks = collect.get(l);
BigDecimal reduce = wmMaterialStocks.stream().map(WmMaterialStock::getQuantityOnhand).reduce(BigDecimal.ZERO, BigDecimal::add);
if (!(reduce.compareTo(BigDecimal.ZERO) == 0)) {
return AjaxResult.error("库位中还有库存不能删除");
}
}
}
}
return AjaxResult.success(wmStorageAreaMapper.deleteWmStorageAreaByAreaIds(areaIds));
return wmStorageAreaMapper.deleteWmStorageAreaByAreaIds(areaIds);
}
/**
@ -159,9 +124,4 @@ public class WmStorageAreaServiceImpl implements IWmStorageAreaService
public int deleteByLocationId(Long locationId) {
return wmStorageAreaMapper.deleteByLocationId(locationId);
}
@Override
public int deleteByLocationIds(Long[] locationIds) {
return wmStorageAreaMapper.deleteByLocationIds(locationIds);
}
}

33
ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmStorageLocationServiceImpl.java
View File

@ -1,23 +1,17 @@
package com.ktg.mes.wm.service.impl;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import com.ktg.common.constant.UserConstants;
import com.ktg.common.core.domain.AjaxResult;
import com.ktg.common.utils.DateUtils;
import com.ktg.common.utils.StringUtils;
import com.ktg.mes.wm.domain.WmMaterialStock;
import com.ktg.mes.wm.service.IWmMaterialStockService;
import com.ktg.mes.wm.service.IWmStorageAreaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ktg.mes.wm.mapper.WmStorageLocationMapper;
import com.ktg.mes.wm.domain.WmStorageLocation;
import com.ktg.mes.wm.service.IWmStorageLocationService;
import org.springframework.transaction.annotation.Transactional;
/**
* 库区设置Service业务层处理
@ -34,9 +28,6 @@ public class WmStorageLocationServiceImpl implements IWmStorageLocationService
@Autowired
private IWmStorageAreaService wmStorageAreaService;
@Autowired
private IWmMaterialStockService wmMaterialStockService;
/**
* 查询库区设置
*
@ -119,7 +110,6 @@ public class WmStorageLocationServiceImpl implements IWmStorageLocationService
* @return 结果
*/
@Override
@Transactional
public AjaxResult deleteWmStorageLocationByLocationIds(Long[] locationIds)
{
// 查询所有需要删除的数据
@ -127,27 +117,14 @@ public class WmStorageLocationServiceImpl implements IWmStorageLocationService
for (WmStorageLocation item : list) {
String locationCode = item.getLocationCode();
if (locationCode.contains("VIRTUAL")) {
return AjaxResult.error("虚拟库区不能被删除");
return AjaxResult.error("线边库库区不能被删除");
}
}
// 校验库区中是否存在物料
for (Long locationId : locationIds) {
// 根据库区查询相关数据
List<WmMaterialStock> materialStocks = wmMaterialStockService.getLocationId(locationId);
if (materialStocks != null && materialStocks.size() > 0) {
Map<Long, List<WmMaterialStock>> collect = materialStocks.stream()
.collect(Collectors.groupingBy(WmMaterialStock::getItemId));
for (Long l : collect.keySet()) {
List<WmMaterialStock> wmMaterialStocks = collect.get(l);
BigDecimal reduce = wmMaterialStocks.stream().map(WmMaterialStock::getQuantityOnhand).reduce(BigDecimal.ZERO, BigDecimal::add);
if (!(reduce.compareTo(BigDecimal.ZERO) == 0)) {
return AjaxResult.error("库区中还有库存不能删除");
for (Long locationId: locationIds
) {
wmStorageAreaService.deleteByLocationId(locationId);
}
}
}
}
// 关联删除相关库位
wmStorageAreaService.deleteByLocationIds(locationIds);
wmStorageLocationMapper.deleteWmStorageLocationByLocationIds(locationIds);
return AjaxResult.success();
}

53
ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmWarehouseServiceImpl.java
View File

@ -1,28 +1,21 @@
package com.ktg.mes.wm.service.impl;
import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import com.ktg.common.constant.UserConstants;
import com.ktg.common.core.domain.AjaxResult;
import com.ktg.common.utils.DateUtils;
import com.ktg.common.utils.StringUtils;
import com.ktg.mes.wm.domain.WmMaterialStock;
import com.ktg.mes.wm.domain.WmStorageArea;
import com.ktg.mes.wm.domain.WmStorageLocation;
import com.ktg.mes.wm.mapper.WmStorageAreaMapper;
import com.ktg.mes.wm.mapper.WmStorageLocationMapper;
import com.ktg.mes.wm.service.IWmMaterialStockService;
import com.ktg.mes.wm.service.IWmStorageAreaService;
import com.ktg.mes.wm.service.IWmStorageLocationService;
import org.apache.catalina.User;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ktg.mes.wm.mapper.WmWarehouseMapper;
import com.ktg.mes.wm.domain.WmWarehouse;
import com.ktg.mes.wm.service.IWmWarehouseService;
import org.springframework.transaction.annotation.Transactional;
/**
* 仓库设置Service业务层处理
@ -42,15 +35,6 @@ public class WmWarehouseServiceImpl implements IWmWarehouseService
@Autowired
private WmStorageAreaMapper wmStorageAreaMapper;
@Autowired
private IWmMaterialStockService wmMaterialStockService;
@Autowired
private IWmStorageLocationService wmStorageLocationService;
@Autowired
private IWmStorageAreaService wmStorageAreaService;
/**
* 查询仓库设置
*
@ -138,38 +122,9 @@ public class WmWarehouseServiceImpl implements IWmWarehouseService
* @return 结果
*/
@Override
@Transactional
public AjaxResult deleteWmWarehouseByWarehouseIds(Long[] warehouseIds)
public int deleteWmWarehouseByWarehouseIds(Long[] warehouseIds)
{
// 查询所有需要删除的数据
List<WmWarehouse> warehouseList = wmWarehouseMapper.selectByWarehouseId(warehouseIds);
for (WmWarehouse item : warehouseList) {
String warehouseCode = item.getWarehouseCode();
if (warehouseCode.contains("VIRTUAL")) {
return AjaxResult.error("虚拟仓库不能被删除");
}
}
// 校验仓库中是否存在物料
for (Long warehouseId : warehouseIds) {
// 根据仓库id查询相关数据
List<WmMaterialStock> materialStocks = wmMaterialStockService.getByWarehouseId(warehouseId);
if (materialStocks != null && materialStocks.size() > 0) {
Map<Long, List<WmMaterialStock>> collect = materialStocks.stream()
.collect(Collectors.groupingBy(WmMaterialStock::getItemId));
for (Long l : collect.keySet()) {
List<WmMaterialStock> wmMaterialStocks = collect.get(l);
BigDecimal reduce = wmMaterialStocks.stream().map(WmMaterialStock::getQuantityOnhand).reduce(BigDecimal.ZERO, BigDecimal::add);
if (!(reduce.compareTo(BigDecimal.ZERO) == 0)) {
return AjaxResult.error("库区中还有库存不能删除");
}
}
}
}
for (Long wahouseId: warehouseIds) {
wmStorageAreaService.deleteByWarehouseId(wahouseId);
wmStorageLocationService.deleteByWarehouseId(wahouseId);
}
return AjaxResult.success(wmWarehouseMapper.deleteWmWarehouseByWarehouseIds(warehouseIds));
return wmWarehouseMapper.deleteWmWarehouseByWarehouseIds(warehouseIds);
}
/**

4
ktg-mes/src/main/resources/mapper/dv/DvCheckMachineryMapper.xml
View File

@ -55,10 +55,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where plan_id = #{planId}
) limit 1
</select>
<select id="getPlanId" resultType="java.lang.Long">
select plan_id from dv_check_machinery
where machinery_code = #{machineryCode}
</select>
<insert id="insertDvCheckMachinery" parameterType="DvCheckMachinery" useGeneratedKeys="true" keyProperty="recordId">
insert into dv_check_machinery

8
ktg-mes/src/main/resources/mapper/dv/DvCheckPlanMapper.xml
View File

@ -52,14 +52,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectDvCheckPlanVo"/>
where plan_code = #{planCode}
</select>
<select id="getByIds" resultType="com.ktg.mes.dv.domain.DvCheckPlan" resultMap="DvCheckPlanResult">
<include refid="selectDvCheckPlanVo"/>
where plan_type = #{planType}
and plan_id in
<foreach collection="planIds" item="item" separator="," open="(" close=")">
#{item}
</foreach>
</select>
<insert id="insertDvCheckPlan" parameterType="DvCheckPlan" useGeneratedKeys="true" keyProperty="planId">
insert into dv_check_plan

4
ktg-mes/src/main/resources/mapper/dv/DvRepairMapper.xml
View File

@ -66,10 +66,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectDvRepairVo"/>
where repair_code = #{repairCode} limit 1
</select>
<select id="getRepairList" resultType="com.ktg.mes.dv.domain.DvRepair" resultMap="DvRepairResult">
<include refid="selectDvRepairVo"/>
where machinery_code = #{machineryCode}
</select>
<insert id="insertDvRepair" parameterType="DvRepair" useGeneratedKeys="true" keyProperty="repairId">
insert into dv_repair

7
ktg-mes/src/main/resources/mapper/md/MdProductBomMapper.xml
View File

@ -12,7 +12,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="bomItemName" column="bom_item_name" />
<result property="bomItemSpec" column="bom_item_spec" />
<result property="unitOfMeasure" column="unit_of_measure" />
<result property="unitName" column="unit_name" />
<result property="itemOrProduct" column="item_or_product" />
<result property="quantity" column="quantity" />
<result property="enableFlag" column="enable_flag" />
@ -28,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectMdProductBomVo">
select bom_id, item_id, bom_item_id, bom_item_code, bom_item_name, bom_item_spec, unit_of_measure, unit_name, item_or_product, quantity, enable_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from md_product_bom
select bom_id, item_id, bom_item_id, bom_item_code, bom_item_name, bom_item_spec, unit_of_measure, item_or_product, quantity, enable_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from md_product_bom
</sql>
<select id="selectMdProductBomList" parameterType="MdProductBom" resultMap="MdProductBomResult">
@ -40,7 +39,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="bomItemName != null and bomItemName != ''"> and bom_item_name like concat('%', #{bomItemName}, '%')</if>
<if test="bomItemSpec != null and bomItemSpec != ''"> and bom_item_spec = #{bomItemSpec}</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
<if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
<if test="itemOrProduct != null and itemOrProduct != ''"> and item_or_product = #{itemOrProduct}</if>
<if test="quantity != null "> and quantity = #{quantity}</if>
<if test="enableFlag != null and enableFlag != ''"> and enable_flag = #{enableFlag}</if>
@ -64,7 +62,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="bomItemName != null and bomItemName != ''">bom_item_name,</if>
<if test="bomItemSpec != null">bom_item_spec,</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''">unit_of_measure,</if>
<if test="unitName != null and unitName != ''">unit_name,</if>
<if test="itemOrProduct != null and itemOrProduct != ''">item_or_product,</if>
<if test="quantity != null">quantity,</if>
<if test="enableFlag != null and enableFlag != ''">enable_flag,</if>
@ -85,7 +82,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="bomItemName != null and bomItemName != ''">#{bomItemName},</if>
<if test="bomItemSpec != null">#{bomItemSpec},</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''">#{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">#{unitName},</if>
<if test="itemOrProduct != null and itemOrProduct != ''">#{itemOrProduct},</if>
<if test="quantity != null">#{quantity},</if>
<if test="enableFlag != null and enableFlag != ''">#{enableFlag},</if>
@ -110,7 +106,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="bomItemName != null and bomItemName != ''">bom_item_name = #{bomItemName},</if>
<if test="bomItemSpec != null">bom_item_spec = #{bomItemSpec},</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''">unit_of_measure = #{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">unit_name = #{unitName}</if>
<if test="itemOrProduct != null and itemOrProduct != ''">item_or_product = #{itemOrProduct},</if>
<if test="quantity != null">quantity = #{quantity},</if>
<if test="enableFlag != null and enableFlag != ''">enable_flag = #{enableFlag},</if>

2
ktg-mes/src/main/resources/mapper/md/MdWorkshopMapper.xml
View File

@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectMdWorkshopVo">
select workshop_id, workshop_code, workshop_name, area, charge, charge_id, enable_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from md_workshop
select workshop_id, workshop_code, workshop_name, area, charge, enable_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from md_workshop
</sql>
<select id="selectMdWorkshopList" parameterType="MdWorkshop" resultMap="MdWorkshopResult">

9
ktg-mes/src/main/resources/mapper/pro/ProCardMapper.xml
View File

@ -16,7 +16,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="itemName" column="item_name" />
<result property="specification" column="specification" />
<result property="unitOfMeasure" column="unit_of_measure" />
<result property="unitName" column="unit_name" />
<result property="barcodeUrl" column="barcode_url" />
<result property="quantityTransfered" column="quantity_transfered" />
<result property="status" column="status" />
@ -33,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectProCardVo">
select card_id, card_code, workorder_id, workorder_code, workorder_name, batch_code, item_id, item_code, item_name, specification, unit_of_measure, unit_name, barcode_url, quantity_transfered, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_card
select card_id, card_code, workorder_id, workorder_code, workorder_name, batch_code, item_id, item_code, item_name, specification, unit_of_measure, barcode_url, quantity_transfered, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_card
</sql>
<select id="selectProCardList" parameterType="ProCard" resultMap="ProCardResult">
@ -49,7 +48,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
<if test="specification != null and specification != ''"> and specification = #{specification}</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
<if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
<if test="barcodeUrl != null and barcodeUrl != ''"> and barcode_url = #{barcodeUrl}</if>
<if test="quantityTransfered != null "> and quantity_transfered = #{quantityTransfered}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
@ -67,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="getStationList" parameterType="ProCard" resultMap="ProCardResult">
select pc.card_id,pc.card_code,pc.workorder_id,pc.workorder_code,pc.workorder_name,pc.item_id,pc.item_code,pc.item_name,pc.specification, pc.unit_of_measure,pc.unit_name,pc.quantity_transfered,
select pc.card_id,pc.card_code,pc.workorder_id,pc.workorder_code,pc.workorder_name,pc.item_id,pc.item_code,pc.item_name,pc.specification, pc.unit_of_measure,pc.quantity_transfered,
pcp.record_id,pcp.workstation_id,pcp.input_time
from pro_card pc
left join pro_card_process pcp
@ -96,7 +94,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''">item_name,</if>
<if test="specification != null">specification,</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''">unit_of_measure,</if>
<if test="unitName != null and unitName != ''">unit_name,</if>
<if test="barcodeUrl != null">barcode_url,</if>
<if test="quantityTransfered != null">quantity_transfered,</if>
<if test="status != null">status,</if>
@ -121,7 +118,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''">#{itemName},</if>
<if test="specification != null">#{specification},</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''">#{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">#{unitName},</if>
<if test="barcodeUrl != null">#{barcodeUrl},</if>
<if test="quantityTransfered != null">#{quantityTransfered},</if>
<if test="status != null">#{status},</if>
@ -150,7 +146,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''">item_name = #{itemName},</if>
<if test="specification != null">specification = #{specification},</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''">unit_of_measure = #{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
<if test="barcodeUrl != null">barcode_url = #{barcodeUrl},</if>
<if test="quantityTransfered != null">quantity_transfered = #{quantityTransfered},</if>
<if test="status != null">status = #{status},</if>

7
ktg-mes/src/main/resources/mapper/pro/ProRouteProductMapper.xml
View File

@ -12,7 +12,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="itemName" column="item_name" />
<result property="specification" column="specification" />
<result property="unitOfMeasure" column="unit_of_measure" />
<result property="unitName" column="unit_name" />
<result property="quantity" column="quantity" />
<result property="productionTime" column="production_time" />
<result property="timeUnitType" column="time_unit_type" />
@ -28,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectProRouteProductVo">
select record_id, route_id, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity, production_time, time_unit_type, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_route_product
select record_id, route_id, item_id, item_code, item_name, specification, unit_of_measure, quantity, production_time, time_unit_type, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_route_product
</sql>
@ -41,7 +40,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
<if test="specification != null and specification != ''"> and specification = #{specification}</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
<if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
<if test="quantity != null "> and quantity = #{quantity}</if>
<if test="productionTime != null "> and production_time = #{productionTime}</if>
<if test="timeUnitType != null and timeUnitType != ''"> and time_unit_type = #{timeUnitType}</if>
@ -74,7 +72,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''">item_name,</if>
<if test="specification != null">specification,</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''">unit_of_measure,</if>
<if test="unitName != null and unitName != ''">unit_name,</if>
<if test="quantity != null">quantity,</if>
<if test="productionTime != null">production_time,</if>
<if test="timeUnitType != null">time_unit_type,</if>
@ -95,7 +92,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''">#{itemName},</if>
<if test="specification != null">#{specification},</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''">#{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">#{unitName},</if>
<if test="quantity != null">#{quantity},</if>
<if test="productionTime != null">#{productionTime},</if>
<if test="timeUnitType != null">#{timeUnitType},</if>
@ -120,7 +116,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''">item_name = #{itemName},</if>
<if test="specification != null">specification = #{specification},</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''">unit_of_measure = #{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
<if test="quantity != null">quantity = #{quantity},</if>
<if test="productionTime != null">production_time = #{productionTime},</if>
<if test="timeUnitType != null">time_unit_type = #{timeUnitType},</if>

7
ktg-mes/src/main/resources/mapper/pro/ProWorkorderBomMapper.xml
View File

@ -12,7 +12,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="itemName" column="item_name" />
<result property="itemSpc" column="item_spc" />
<result property="unitOfMeasure" column="unit_of_measure" />
<result property="unitName" column="unit_name" />
<result property="itemOrProduct" column="item_or_product" />
<result property="quantity" column="quantity" />
<result property="remark" column="remark" />
@ -27,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectProWorkorderBomVo">
select line_id, workorder_id, item_id, item_code, item_name, item_spc, unit_of_measure, unit_name, item_or_product, quantity, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_workorder_bom
select line_id, workorder_id, item_id, item_code, item_name, item_spc, unit_of_measure, item_or_product, quantity, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_workorder_bom
</sql>
<select id="selectProWorkorderBomList" parameterType="ProWorkorderBom" resultMap="ProWorkorderBomResult">
@ -39,7 +38,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
<if test="itemSpc != null and itemSpc != ''"> and item_spc = #{itemSpc}</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
<if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
<if test="itemOrProduct != null and itemOrProduct != ''"> and item_or_product = #{itemOrProduct}</if>
<if test="quantity != null "> and quantity = #{quantity}</if>
</where>
@ -59,7 +57,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''">item_name,</if>
<if test="itemSpc != null">item_spc,</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''">unit_of_measure,</if>
<if test="unitName != null and unitName != ''">unit_name,</if>
<if test="itemOrProduct != null and itemOrProduct != ''">item_or_product,</if>
<if test="quantity != null">quantity,</if>
<if test="remark != null">remark,</if>
@ -79,7 +76,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''">#{itemName},</if>
<if test="itemSpc != null">#{itemSpc},</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''">#{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">#{unitName},</if>
<if test="itemOrProduct != null and itemOrProduct != ''">#{itemOrProduct},</if>
<if test="quantity != null">#{quantity},</if>
<if test="remark != null">#{remark},</if>
@ -103,7 +99,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''">item_name = #{itemName},</if>
<if test="itemSpc != null">item_spc = #{itemSpc},</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''">unit_of_measure = #{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
<if test="itemOrProduct != null and itemOrProduct != ''">item_or_product = #{itemOrProduct},</if>
<if test="quantity != null">quantity = #{quantity},</if>
<if test="remark != null">remark = #{remark},</if>

7
ktg-mes/src/main/resources/mapper/pro/ProWorkorderMapper.xml
View File

@ -16,7 +16,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="productName" column="product_name" />
<result property="productSpc" column="product_spc" />
<result property="unitOfMeasure" column="unit_of_measure" />
<result property="unitName" column="unit_name" />
<result property="batchCode" column="batch_code"></result>
<result property="quantity" column="quantity" />
<result property="quantityProduced" column="quantity_produced" />
@ -45,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectProWorkorderVo">
select workorder_id, workorder_code, workorder_name, workorder_type, order_source, source_code, product_id, product_code, product_name, product_spc, unit_of_measure, unit_name, batch_code, quantity,quantity_produced, client_id, client_code, client_name, vendor_id, vendor_code, vendor_name, request_date, parent_id, ancestors, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_workorder
select workorder_id, workorder_code, workorder_name, workorder_type, order_source, source_code, product_id, product_code, product_name, product_spc, unit_of_measure,batch_code, quantity,quantity_produced, client_id, client_code, client_name, vendor_id, vendor_code, vendor_name, request_date, parent_id, ancestors, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from pro_workorder
</sql>
<select id="selectProWorkorderList" parameterType="ProWorkorder" resultMap="ProWorkorderResult">
@ -61,7 +60,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="productName != null and productName != ''"> and product_name like concat('%', #{productName}, '%')</if>
<if test="productSpc != null and productSpc != ''"> and product_spc = #{productSpc}</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
<if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
<if test="batchCode !=null and batchCode !=''" >and batch_code = #{batchCode}</if>
<if test="quantity != null "> and quantity = #{quantity}</if>
<if test="quantityProduced != null "> and quantity_produced = #{quantityProduced}</if>
@ -110,7 +108,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="productName != null and productName != ''">product_name,</if>
<if test="productSpc != null">product_spc,</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''">unit_of_measure,</if>
<if test="unitName != null and unitName != ''">unit_name,</if>
<if test="batchCode !=null and batchCode !=''" >batch_code,</if>
<if test="quantity != null">quantity,</if>
<if test="quantityProduced != null">quantity_produced,</if>
@ -148,7 +145,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="productName != null and productName != ''">#{productName},</if>
<if test="productSpc != null">#{productSpc},</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''">#{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">#{unitName},</if>
<if test="batchCode !=null and batchCode !=''" >#{batchCode},</if>
<if test="quantity != null">#{quantity},</if>
<if test="quantityProduced != null">#{quantityProduced},</if>
@ -190,7 +186,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="productName != null and productName != ''">product_name = #{productName},</if>
<if test="productSpc != null">product_spc = #{productSpc},</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''">unit_of_measure = #{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
<if test="batchCode !=null and batchCode !=''" >batch_code = #{batchCode},</if>
<if test="quantity != null">quantity = #{quantity},</if>
<if test="quantityProduced != null">quantity_produced = #{quantityProduced},</if>

7
ktg-mes/src/main/resources/mapper/qc/QcIpqcMapper.xml
View File

@ -31,7 +31,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="itemName" column="item_name" />
<result property="specification" column="specification" />
<result property="unitOfMeasure" column="unit_of_measure" />
<result property="unitName" column="unit_name" />
<result property="quantityCheck" column="quantity_check" />
<result property="quantityUnqualified" column="quantity_unqualified" />
<result property="quantityQualified" column="quantity_qualified" />
@ -57,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectQcIpqcVo">
select ipqc_id, ipqc_code, ipqc_name, ipqc_type, template_id, source_doc_id,source_doc_type, source_doc_code, source_line_id, workorder_id, workorder_code, workorder_name, task_id, task_code, task_name, workstation_id, workstation_code, workstation_name, process_id, process_code, process_name, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_check, quantity_unqualified, quantity_qualified, cr_rate, maj_rate, min_rate, cr_quantity, maj_quantity, min_quantity, check_result, inspect_date, inspector, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from qc_ipqc
select ipqc_id, ipqc_code, ipqc_name, ipqc_type, template_id, source_doc_id,source_doc_type, source_doc_code, source_line_id, workorder_id, workorder_code, workorder_name, task_id, task_code, task_name, workstation_id, workstation_code, workstation_name, process_id, process_code, process_name, item_id, item_code, item_name, specification, unit_of_measure, quantity_check, quantity_unqualified, quantity_qualified, cr_rate, maj_rate, min_rate, cr_quantity, maj_quantity, min_quantity, check_result, inspect_date, inspector, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from qc_ipqc
</sql>
<select id="selectQcIpqcList" parameterType="QcIpqc" resultMap="QcIpqcResult">
@ -88,7 +87,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
<if test="specification != null and specification != ''"> and specification = #{specification}</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
<if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
<if test="quantityCheck != null "> and quantity_check = #{quantityCheck}</if>
<if test="quantityUnqualified != null "> and quantity_unqualified = #{quantityUnqualified}</if>
<if test="quantityQualified != null "> and quantity_qualified = #{quantityQualified}</if>
@ -162,7 +160,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name,</if>
<if test="specification != null">specification,</if>
<if test="unitOfMeasure != null">unit_of_measure,</if>
<if test="unitName != null and unitName != ''">unit_name,</if>
<if test="quantityCheck != null">quantity_check,</if>
<if test="quantityUnqualified != null">quantity_unqualified,</if>
<if test="quantityQualified != null">quantity_qualified,</if>
@ -212,7 +209,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">#{itemName},</if>
<if test="specification != null">#{specification},</if>
<if test="unitOfMeasure != null">#{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">#{unitName},</if>
<if test="quantityCheck != null">#{quantityCheck},</if>
<if test="quantityUnqualified != null">#{quantityUnqualified},</if>
<if test="quantityQualified != null">#{quantityQualified},</if>
@ -266,7 +262,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name = #{itemName},</if>
<if test="specification != null">specification = #{specification},</if>
<if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
<if test="quantityCheck != null">quantity_check = #{quantityCheck},</if>
<if test="quantityUnqualified != null">quantity_unqualified = #{quantityUnqualified},</if>
<if test="quantityQualified != null">quantity_qualified = #{quantityQualified},</if>

7
ktg-mes/src/main/resources/mapper/qc/QcIqcMapper.xml
View File

@ -23,7 +23,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="itemName" column="item_name" />
<result property="specification" column="specification" />
<result property="unitOfMeasure" column="unit_of_measure" />
<result property="unitName" column="unit_name" />
<result property="quantityMinCheck" column="quantity_min_check" />
<result property="quantityMaxUnqualified" column="quantity_max_unqualified" />
<result property="quantityRecived" column="quantity_recived" />
@ -54,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectQcIqcVo">
select iqc_id, iqc_code, iqc_name, template_id, source_doc_id,source_doc_type, source_doc_code, source_line_id, vendor_id, vendor_code, vendor_name, vendor_nick, vendor_batch, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_min_check, quantity_max_unqualified, quantity_recived, quantity_check, quantity_qualified,quantity_unqualified, cr_rate, maj_rate, min_rate, cr_quantity, maj_quantity, min_quantity, check_result, recive_date, inspect_date, inspector,u.nick_name as inspector_name, q.status, q.remark, attr1, attr2, attr3, attr4, q.create_by, q.create_time, q.update_by, q.update_time from qc_iqc q left join sys_user u on u.user_name = q.inspector
select iqc_id, iqc_code, iqc_name, template_id, source_doc_id,source_doc_type, source_doc_code, source_line_id, vendor_id, vendor_code, vendor_name, vendor_nick, vendor_batch, item_id, item_code, item_name, specification, unit_of_measure, quantity_min_check, quantity_max_unqualified, quantity_recived, quantity_check, quantity_qualified,quantity_unqualified, cr_rate, maj_rate, min_rate, cr_quantity, maj_quantity, min_quantity, check_result, recive_date, inspect_date, inspector,u.nick_name as inspector_name, q.status, q.remark, attr1, attr2, attr3, attr4, q.create_by, q.create_time, q.update_by, q.update_time from qc_iqc q left join sys_user u on u.user_name = q.inspector
</sql>
<select id="selectQcIqcList" parameterType="QcIqc" resultMap="QcIqcResult">
@ -77,7 +76,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
<if test="specification != null and specification != ''"> and specification = #{specification}</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
<if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
<if test="quantityMinCheck != null "> and quantity_min_check = #{quantityMinCheck}</if>
<if test="quantityMaxUnqualified != null "> and quantity_max_unqualified = #{quantityMaxUnqualified}</if>
<if test="quantityRecived != null "> and quantity_recived = #{quantityRecived}</if>
@ -130,7 +128,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name,</if>
<if test="specification != null">specification,</if>
<if test="unitOfMeasure != null">unit_of_measure,</if>
<if test="unitName != null and unitName != ''">unit_name,</if>
<if test="quantityMinCheck != null">quantity_min_check,</if>
<if test="quantityMaxUnqualified != null">quantity_max_unqualified,</if>
<if test="quantityRecived != null">quantity_recived,</if>
@ -176,7 +173,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">#{itemName},</if>
<if test="specification != null">#{specification},</if>
<if test="unitOfMeasure != null">#{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">#{unitName},</if>
<if test="quantityMinCheck != null">#{quantityMinCheck},</if>
<if test="quantityMaxUnqualified != null">#{quantityMaxUnqualified},</if>
<if test="quantityRecived != null">#{quantityRecived},</if>
@ -247,7 +243,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name = #{itemName},</if>
<if test="specification != null">specification = #{specification},</if>
<if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
<if test="quantityMinCheck != null">quantity_min_check = #{quantityMinCheck},</if>
<if test="quantityMaxUnqualified != null">quantity_max_unqualified = #{quantityMaxUnqualified},</if>
<if test="quantityRecived != null">quantity_recived = #{quantityRecived},</if>

7
ktg-mes/src/main/resources/mapper/qc/QcTemplateProductMapper.xml
View File

@ -12,7 +12,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="itemName" column="item_name" />
<result property="specification" column="specification" />
<result property="unitOfMeasure" column="unit_of_measure" />
<result property="unitName" column="unit_name" />
<result property="quantityCheck" column="quantity_check" />
<result property="quantityUnqualified" column="quantity_unqualified" />
<result property="crRate" column="cr_rate" />
@ -30,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectQcTemplateProductVo">
select record_id, template_id, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_check, quantity_unqualified, cr_rate, maj_rate, min_rate, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from qc_template_product
select record_id, template_id, item_id, item_code, item_name, specification, unit_of_measure, quantity_check, quantity_unqualified, cr_rate, maj_rate, min_rate, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from qc_template_product
</sql>
<select id="selectQcTemplateProductList" parameterType="QcTemplateProduct" resultMap="QcTemplateProductResult">
@ -42,7 +41,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
<if test="specification != null and specification != ''"> and specification = #{specification}</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
<if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
<if test="quantityCheck != null "> and quantity_check = #{quantityCheck}</if>
<if test="quantityUnqualified != null "> and quantity_unqualified = #{quantityUnqualified}</if>
<if test="crRate != null "> and cr_rate = #{crRate}</if>
@ -70,7 +68,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name,</if>
<if test="specification != null">specification,</if>
<if test="unitOfMeasure != null">unit_of_measure,</if>
<if test="unitName != null and unitName != ''">unit_name,</if>
<if test="quantityCheck != null">quantity_check,</if>
<if test="quantityUnqualified != null">quantity_unqualified,</if>
<if test="crRate != null">cr_rate,</if>
@ -93,7 +90,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">#{itemName},</if>
<if test="specification != null">#{specification},</if>
<if test="unitOfMeasure != null">#{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">#{unitName},</if>
<if test="quantityCheck != null">#{quantityCheck},</if>
<if test="quantityUnqualified != null">#{quantityUnqualified},</if>
<if test="crRate != null">#{crRate},</if>
@ -120,7 +116,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name = #{itemName},</if>
<if test="specification != null">specification = #{specification},</if>
<if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
<if test="quantityCheck != null">quantity_check = #{quantityCheck},</if>
<if test="quantityUnqualified != null">quantity_unqualified = #{quantityUnqualified},</if>
<if test="crRate != null">cr_rate = #{crRate},</if>

7
ktg-mes/src/main/resources/mapper/wm/WmArrivalNoticeLineMapper.xml
View File

@ -12,7 +12,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="itemName" column="item_name" />
<result property="specification" column="specification" />
<result property="unitOfMeasure" column="unit_of_measure" />
<result property="unitName" column="unit_name" />
<result property="quantityArrival" column="quantity_arrival" />
<result property="quantityQuanlified" column="quantity_quanlified" />
<result property="iqcCheck" column="iqc_check" />
@ -30,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectWmArrivalNoticeLineVo">
select line_id, notice_id, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_arrival, quantity_quanlified, iqc_check, iqc_id, iqc_code, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_arrival_notice_line
select line_id, notice_id, item_id, item_code, item_name, specification, unit_of_measure, quantity_arrival, quantity_quanlified, iqc_check, iqc_id, iqc_code, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_arrival_notice_line
</sql>
<select id="selectWmArrivalNoticeLineList" parameterType="WmArrivalNoticeLine" resultMap="WmArrivalNoticeLineResult">
@ -42,7 +41,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
<if test="specification != null and specification != ''"> and specification = #{specification}</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
<if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
<if test="quantityArrival != null "> and quantity_arrival = #{quantityArrival}</if>
<if test="quantityQuanlified != null "> and quantity_quanlified = #{quantityQuanlified}</if>
<if test="iqcCheck != null and iqcCheck != ''"> and iqc_check = #{iqcCheck}</if>
@ -72,7 +70,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name,</if>
<if test="specification != null">specification,</if>
<if test="unitOfMeasure != null">unit_of_measure,</if>
<if test="unitName != null and unitName != ''">unit_name,</if>
<if test="quantityArrival != null">quantity_arrival,</if>
<if test="quantityQuanlified != null">quantity_quanlified,</if>
<if test="iqcCheck != null">iqc_check,</if>
@ -95,7 +92,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">#{itemName},</if>
<if test="specification != null">#{specification},</if>
<if test="unitOfMeasure != null">#{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">#{unitName},</if>
<if test="quantityArrival != null">#{quantityArrival},</if>
<if test="quantityQuanlified != null">#{quantityQuanlified},</if>
<if test="iqcCheck != null">#{iqcCheck},</if>
@ -122,7 +118,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name = #{itemName},</if>
<if test="specification != null">specification = #{specification},</if>
<if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">unit_name = #{unitName}</if>
<if test="quantityArrival != null">quantity_arrival = #{quantityArrival},</if>
<if test="quantityQuanlified != null">quantity_quanlified = #{quantityQuanlified},</if>
<if test="iqcCheck != null">iqc_check = #{iqcCheck},</if>

7
ktg-mes/src/main/resources/mapper/wm/WmIssueLineMapper.xml
View File

@ -13,7 +13,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="itemName" column="item_name" />
<result property="specification" column="specification" />
<result property="unitOfMeasure" column="unit_of_measure" />
<result property="unitName" column="unit_name" />
<result property="quantityIssued" column="quantity_issued" />
<result property="batchCode" column="batch_code" />
<result property="warehouseId" column="warehouse_id" />
@ -37,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectWmIssueLineVo">
select line_id, issue_id,material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_issued, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_issue_line
select line_id, issue_id,material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, quantity_issued, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_issue_line
</sql>
<select id="selectWmIssueLineList" parameterType="WmIssueLine" resultMap="WmIssueLineResult">
@ -50,7 +49,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
<if test="specification != null and specification != ''"> and specification = #{specification}</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
<if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
<if test="quantityIssued != null "> and quantity_issued = #{quantityIssued}</if>
<if test="batchCode != null and batchCode != ''"> and batch_code = #{batchCode}</if>
<if test="warehouseId != null "> and warehouse_id = #{warehouseId}</if>
@ -81,7 +79,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name,</if>
<if test="specification != null">specification,</if>
<if test="unitOfMeasure != null">unit_of_measure,</if>
<if test="unitName != null and unitName != ''">unit_name,</if>
<if test="quantityIssued != null">quantity_issued,</if>
<if test="batchCode != null">batch_code,</if>
<if test="warehouseId != null">warehouse_id,</if>
@ -111,7 +108,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">#{itemName},</if>
<if test="specification != null">#{specification},</if>
<if test="unitOfMeasure != null">#{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">#{unitName},</if>
<if test="quantityIssued != null">#{quantityIssued},</if>
<if test="batchCode != null">#{batchCode},</if>
<if test="warehouseId != null">#{warehouseId},</if>
@ -145,7 +141,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name = #{itemName},</if>
<if test="specification != null">specification = #{specification},</if>
<if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
<if test="quantityIssued != null">quantity_issued = #{quantityIssued},</if>
<if test="batchCode != null">batch_code = #{batchCode},</if>
<if test="warehouseId != null">warehouse_id = #{warehouseId},</if>

7
ktg-mes/src/main/resources/mapper/wm/WmItemRecptLineMapper.xml
View File

@ -13,7 +13,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="itemName" column="item_name" />
<result property="specification" column="specification" />
<result property="unitOfMeasure" column="unit_of_measure" />
<result property="unitName" column="unit_name" />
<result property="quantityRecived" column="quantity_recived" />
<result property="batchCode" column="batch_code" />
<result property="warehouseId" column="warehouse_id" />
@ -41,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectWmItemRecptLineVo">
select line_id, recpt_id, notice_line_id, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_recived, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, expire_date,iqc_check,iqc_id,iqc_code, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_item_recpt_line
select line_id, recpt_id, notice_line_id, item_id, item_code, item_name, specification, unit_of_measure, quantity_recived, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, expire_date,iqc_check,iqc_id,iqc_code, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_item_recpt_line
</sql>
<select id="selectWmItemRecptLineList" parameterType="WmItemRecptLine" resultMap="WmItemRecptLineResult">
@ -54,7 +53,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
<if test="specification != null and specification != ''"> and specification = #{specification}</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
<if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
<if test="quantityRecived != null "> and quantity_recived = #{quantityRecived}</if>
<if test="batchCode != null and batchCode != ''"> and batch_code = #{batchCode}</if>
<if test="warehouseId != null "> and warehouse_id = #{warehouseId}</if>
@ -86,7 +84,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name,</if>
<if test="specification != null">specification,</if>
<if test="unitOfMeasure != null">unit_of_measure,</if>
<if test="unitName != null and unitName != ''">unit_name,</if>
<if test="quantityRecived != null">quantity_recived,</if>
<if test="batchCode != null">batch_code,</if>
<if test="warehouseId != null">warehouse_id,</if>
@ -120,7 +117,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">#{itemName},</if>
<if test="specification != null">#{specification},</if>
<if test="unitOfMeasure != null">#{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">#{unitName},</if>
<if test="quantityRecived != null">#{quantityRecived},</if>
<if test="batchCode != null">#{batchCode},</if>
<if test="warehouseId != null">#{warehouseId},</if>
@ -158,7 +154,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name = #{itemName},</if>
<if test="specification != null">specification = #{specification},</if>
<if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
<if test="quantityRecived != null">quantity_recived = #{quantityRecived},</if>
<if test="batchCode != null">batch_code = #{batchCode},</if>
<if test="warehouseId != null">warehouse_id = #{warehouseId},</if>

12
ktg-mes/src/main/resources/mapper/wm/WmMaterialStockMapper.xml
View File

@ -144,18 +144,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
and 1=1 limit 1
</select>
<select id="getByAreaId" resultType="com.ktg.mes.wm.domain.WmMaterialStock" resultMap="WmMaterialStockResult">
select * from wm_material_stock
where area_id = #{areaId}
</select>
<select id="getLocationId" resultType="com.ktg.mes.wm.domain.WmMaterialStock" resultMap="WmMaterialStockResult">
select * from wm_material_stock
where location_id = #{locationId}
</select>
<select id="getByWarehouseId" resultType="com.ktg.mes.wm.domain.WmMaterialStock" resultMap="WmMaterialStockResult">
select * from wm_material_stock
where warehouse_id = #{warehouseId}
</select>
<insert id="insertWmMaterialStock" parameterType="WmMaterialStock" useGeneratedKeys="true" keyProperty="materialStockId">
insert into wm_material_stock

7
ktg-mes/src/main/resources/mapper/wm/WmOutsourceIssueLineMapper.xml
View File

@ -13,7 +13,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="itemName" column="item_name" />
<result property="specification" column="specification" />
<result property="unitOfMeasure" column="unit_of_measure" />
<result property="unitName" column="unit_name" />
<result property="quantityIssued" column="quantity_issued" />
<result property="batchCode" column="batch_code" />
<result property="warehouseId" column="warehouse_id" />
@ -37,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectWmOutsourceIssueLineVo">
select line_id, issue_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_issued, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_outsource_issue_line
select line_id, issue_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, quantity_issued, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_outsource_issue_line
</sql>
<select id="selectWmOutsourceIssueLineList" parameterType="WmOutsourceIssueLine" resultMap="WmOutsourceIssueLineResult">
@ -50,7 +49,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
<if test="specification != null and specification != ''"> and specification = #{specification}</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
<if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
<if test="quantityIssued != null "> and quantity_issued = #{quantityIssued}</if>
<if test="batchCode != null and batchCode != ''"> and batch_code = #{batchCode}</if>
<if test="warehouseId != null "> and warehouse_id = #{warehouseId}</if>
@ -85,7 +83,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name,</if>
<if test="specification != null">specification,</if>
<if test="unitOfMeasure != null">unit_of_measure,</if>
<if test="unitName != null and unitName != ''">unit_name,</if>
<if test="quantityIssued != null">quantity_issued,</if>
<if test="batchCode != null">batch_code,</if>
<if test="warehouseId != null">warehouse_id,</if>
@ -115,7 +112,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">#{itemName},</if>
<if test="specification != null">#{specification},</if>
<if test="unitOfMeasure != null">#{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">#{unitName},</if>
<if test="quantityIssued != null">#{quantityIssued},</if>
<if test="batchCode != null">#{batchCode},</if>
<if test="warehouseId != null">#{warehouseId},</if>
@ -149,7 +145,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name = #{itemName},</if>
<if test="specification != null">specification = #{specification},</if>
<if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
<if test="quantityIssued != null">quantity_issued = #{quantityIssued},</if>
<if test="batchCode != null">batch_code = #{batchCode},</if>
<if test="warehouseId != null">warehouse_id = #{warehouseId},</if>

7
ktg-mes/src/main/resources/mapper/wm/WmOutsourceRecptLineMapper.xml
View File

@ -12,7 +12,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="itemName" column="item_name" />
<result property="specification" column="specification" />
<result property="unitOfMeasure" column="unit_of_measure" />
<result property="unitName" column="unit_name" />
<result property="quantityRecived" column="quantity_recived" />
<result property="batchCode" column="batch_code" />
<result property="warehouseId" column="warehouse_id" />
@ -40,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectWmOutsourceRecptLineVo">
select line_id, recpt_id, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_recived, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, expire_date, iqc_check, iqc_id, iqc_code, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_outsource_recpt_line
select line_id, recpt_id, item_id, item_code, item_name, specification, unit_of_measure, quantity_recived, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, expire_date, iqc_check, iqc_id, iqc_code, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_outsource_recpt_line
</sql>
<select id="selectWmOutsourceRecptLineList" parameterType="WmOutsourceRecptLine" resultMap="WmOutsourceRecptLineResult">
@ -52,7 +51,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
<if test="specification != null and specification != ''"> and specification = #{specification}</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
<if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
<if test="quantityRecived != null "> and quantity_recived = #{quantityRecived}</if>
<if test="batchCode != null and batchCode != ''"> and batch_code = #{batchCode}</if>
<if test="warehouseId != null "> and warehouse_id = #{warehouseId}</if>
@ -90,7 +88,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name,</if>
<if test="specification != null">specification,</if>
<if test="unitOfMeasure != null">unit_of_measure,</if>
<if test="unitName != null and unitName != ''">unit_name,</if>
<if test="quantityRecived != null">quantity_recived,</if>
<if test="batchCode != null">batch_code,</if>
<if test="warehouseId != null">warehouse_id,</if>
@ -123,7 +120,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">#{itemName},</if>
<if test="specification != null">#{specification},</if>
<if test="unitOfMeasure != null">#{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">#{unitName},</if>
<if test="quantityRecived != null">#{quantityRecived},</if>
<if test="batchCode != null">#{batchCode},</if>
<if test="warehouseId != null">#{warehouseId},</if>
@ -160,7 +156,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name = #{itemName},</if>
<if test="specification != null">specification = #{specification},</if>
<if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
<if test="quantityRecived != null">quantity_recived = #{quantityRecived},</if>
<if test="batchCode != null">batch_code = #{batchCode},</if>
<if test="warehouseId != null">warehouse_id = #{warehouseId},</if>

7
ktg-mes/src/main/resources/mapper/wm/WmPackageLineMapper.xml
View File

@ -13,7 +13,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="itemName" column="item_name" />
<result property="specification" column="specification" />
<result property="unitOfMeasure" column="unit_of_measure" />
<result property="unitName" column="unit_name" />
<result property="quantityPackage" column="quantity_package" />
<result property="workorderId" column="workorder_id" />
<result property="workorderCode" column="workorder_code" />
@ -40,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectWmPackageLineVo">
select line_id, package_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_package, workorder_id, workorder_code, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, expire_date, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_package_line
select line_id, package_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, quantity_package, workorder_id, workorder_code, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, expire_date, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_package_line
</sql>
<select id="selectWmPackageLineList" parameterType="WmPackageLine" resultMap="WmPackageLineResult">
@ -55,7 +54,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
<if test="specification != null and specification != ''"> and specification = #{specification}</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
<if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
<if test="quantityPackage != null "> and quantity_package = #{quantityPackage}</if>
<if test="workorderId != null "> and workorder_id = #{workorderId}</if>
<if test="workorderCode != null and workorderCode != ''"> and workorder_code = #{workorderCode}</if>
@ -88,7 +86,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name,</if>
<if test="specification != null">specification,</if>
<if test="unitOfMeasure != null">unit_of_measure,</if>
<if test="unitName != null and unitName != ''">unit_name,</if>
<if test="quantityPackage != null">quantity_package,</if>
<if test="workorderId != null">workorder_id,</if>
<if test="workorderCode != null">workorder_code,</if>
@ -121,7 +118,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">#{itemName},</if>
<if test="specification != null">#{specification},</if>
<if test="unitOfMeasure != null">#{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">#{unitName},</if>
<if test="quantityPackage != null">#{quantityPackage},</if>
<if test="workorderId != null">#{workorderId},</if>
<if test="workorderCode != null">#{workorderCode},</if>
@ -158,7 +154,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name = #{itemName},</if>
<if test="specification != null">specification = #{specification},</if>
<if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
<if test="quantityPackage != null">quantity_package = #{quantityPackage},</if>
<if test="workorderId != null">workorder_id = #{workorderId},</if>
<if test="workorderCode != null">workorder_code = #{workorderCode},</if>

7
ktg-mes/src/main/resources/mapper/wm/WmProductRecptLineMapper.xml
View File

@ -13,7 +13,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="itemName" column="item_name" />
<result property="specification" column="specification" />
<result property="unitOfMeasure" column="unit_of_measure" />
<result property="unitName" column="unit_name" />
<result property="quantityRecived" column="quantity_recived" />
<result property="batchCode" column="batch_code" />
<result property="warehouseId" column="warehouse_id" />
@ -37,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectWmProductRecptLineVo">
select line_id, recpt_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_recived, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_product_recpt_line
select line_id, recpt_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, quantity_recived, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_product_recpt_line
</sql>
<select id="selectWmProductRecptLineList" parameterType="WmProductRecptLine" resultMap="WmProductRecptLineResult">
@ -50,7 +49,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
<if test="specification != null and specification != ''"> and specification = #{specification}</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
<if test="unitName != null and unitName != ''"> and unit_name = #{unitName}</if>
<if test="quantityRecived != null "> and quantity_recived = #{quantityRecived}</if>
<if test="batchCode != null and batchCode != ''"> and batch_code = #{batchCode}</if>
<if test="warehouseId != null "> and warehouse_id = #{warehouseId}</if>
@ -80,7 +78,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name,</if>
<if test="specification != null">specification,</if>
<if test="unitOfMeasure != null">unit_of_measure,</if>
<if test="unitName != null and unitName != ''">unit_name,</if>
<if test="quantityRecived != null">quantity_recived,</if>
<if test="batchCode != null">batch_code,</if>
<if test="warehouseId != null">warehouse_id,</if>
@ -110,7 +107,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">#{itemName},</if>
<if test="specification != null">#{specification},</if>
<if test="unitOfMeasure != null">#{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">#{unitName},</if>
<if test="quantityRecived != null">#{quantityRecived},</if>
<if test="batchCode != null">#{batchCode},</if>
<if test="warehouseId != null">#{warehouseId},</if>
@ -144,7 +140,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name = #{itemName},</if>
<if test="specification != null">specification = #{specification},</if>
<if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
<if test="quantityRecived != null">quantity_recived = #{quantityRecived},</if>
<if test="batchCode != null">batch_code = #{batchCode},</if>
<if test="warehouseId != null">warehouse_id = #{warehouseId},</if>

7
ktg-mes/src/main/resources/mapper/wm/WmProductSalseLineMapper.xml
View File

@ -13,7 +13,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="itemName" column="item_name" />
<result property="specification" column="specification" />
<result property="unitOfMeasure" column="unit_of_measure" />
<result property="unitName" column="unit_name" />
<result property="quantitySalse" column="quantity_salse" />
<result property="batchCode" column="batch_code" />
<result property="warehouseId" column="warehouse_id" />
@ -40,7 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectWmProductSalseLineVo">
select line_id, salse_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_salse, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, oqc_check,oqc_id,oqc_code, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_product_salse_line
select line_id, salse_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, quantity_salse, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, oqc_check,oqc_id,oqc_code, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_product_salse_line
</sql>
<select id="selectWmProductSalseLineList" parameterType="WmProductSalseLine" resultMap="WmProductSalseLineResult">
@ -53,7 +52,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
<if test="specification != null and specification != ''"> and specification = #{specification}</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
<if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
<if test="quantitySalse != null "> and quantity_salse = #{quantitySalse}</if>
<if test="batchCode != null and batchCode != ''"> and batch_code = #{batchCode}</if>
<if test="warehouseId != null "> and warehouse_id = #{warehouseId}</if>
@ -84,7 +82,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name,</if>
<if test="specification != null">specification,</if>
<if test="unitOfMeasure != null">unit_of_measure,</if>
<if test="unitName != null and unitName != ''">unit_name,</if>
<if test="quantitySalse != null">quantity_salse,</if>
<if test="batchCode != null">batch_code,</if>
<if test="warehouseId != null">warehouse_id,</if>
@ -117,7 +114,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">#{itemName},</if>
<if test="specification != null">#{specification},</if>
<if test="unitOfMeasure != null">#{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">#{unitName},</if>
<if test="quantitySalse != null">#{quantitySalse},</if>
<if test="batchCode != null">#{batchCode},</if>
<if test="warehouseId != null">#{warehouseId},</if>
@ -154,7 +150,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name = #{itemName},</if>
<if test="specification != null">specification = #{specification},</if>
<if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
<if test="quantitySalse != null">quantity_salse = #{quantitySalse},</if>
<if test="batchCode != null">batch_code = #{batchCode},</if>
<if test="warehouseId != null">warehouse_id = #{warehouseId},</if>

7
ktg-mes/src/main/resources/mapper/wm/WmRtIssueLineMapper.xml
View File

@ -13,7 +13,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="itemName" column="item_name" />
<result property="specification" column="specification" />
<result property="unitOfMeasure" column="unit_of_measure" />
<result property="unitName" column="unit_name" />
<result property="quantityRt" column="quantity_rt" />
<result property="batchCode" column="batch_code" />
<result property="warehouseId" column="warehouse_id" />
@ -37,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectWmRtIssueLineVo">
select line_id, rt_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_rt, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_rt_issue_line
select line_id, rt_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, quantity_rt, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_rt_issue_line
</sql>
<select id="selectWmRtIssueLineList" parameterType="WmRtIssueLine" resultMap="WmRtIssueLineResult">
@ -50,7 +49,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
<if test="specification != null and specification != ''"> and specification = #{specification}</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
<if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
<if test="quantityRt != null "> and quantity_rt = #{quantityRt}</if>
<if test="batchCode != null and batchCode != ''"> and batch_code = #{batchCode}</if>
<if test="warehouseId != null "> and warehouse_id = #{warehouseId}</if>
@ -81,7 +79,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name,</if>
<if test="specification != null">specification,</if>
<if test="unitOfMeasure != null">unit_of_measure,</if>
<if test="unitName != null and unitName != ''">unit_name,</if>
<if test="quantityRt != null">quantity_rt,</if>
<if test="batchCode != null">batch_code,</if>
<if test="warehouseId != null">warehouse_id,</if>
@ -111,7 +108,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">#{itemName},</if>
<if test="specification != null">#{specification},</if>
<if test="unitOfMeasure != null">#{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">#{unitName},</if>
<if test="quantityRt != null">#{quantityRt},</if>
<if test="batchCode != null">#{batchCode},</if>
<if test="warehouseId != null">#{warehouseId},</if>
@ -145,7 +141,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name = #{itemName},</if>
<if test="specification != null">specification = #{specification},</if>
<if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
<if test="quantityRt != null">quantity_rt = #{quantityRt},</if>
<if test="batchCode != null">batch_code = #{batchCode},</if>
<if test="warehouseId != null">warehouse_id = #{warehouseId},</if>

7
ktg-mes/src/main/resources/mapper/wm/WmRtSalseLineMapper.xml
View File

@ -12,7 +12,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="itemName" column="item_name" />
<result property="specification" column="specification" />
<result property="unitOfMeasure" column="unit_of_measure" />
<result property="unitName" column="unit_name" />
<result property="quantityRted" column="quantity_rted" />
<result property="batchCode" column="batch_code" />
<result property="warehouseId" column="warehouse_id" />
@ -37,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectWmRtSalseLineVo">
select line_id, rt_id, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_rted, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, expire_date, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_rt_salse_line
select line_id, rt_id, item_id, item_code, item_name, specification, unit_of_measure, quantity_rted, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, expire_date, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_rt_salse_line
</sql>
<select id="selectWmRtSalseLineList" parameterType="WmRtSalseLine" resultMap="WmRtSalseLineResult">
@ -49,7 +48,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
<if test="specification != null and specification != ''"> and specification = #{specification}</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
<if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
<if test="quantityRted != null "> and quantity_rted = #{quantityRted}</if>
<if test="batchCode != null and batchCode != ''"> and batch_code = #{batchCode}</if>
<if test="warehouseId != null "> and warehouse_id = #{warehouseId}</if>
@ -79,7 +77,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name,</if>
<if test="specification != null">specification,</if>
<if test="unitOfMeasure != null">unit_of_measure,</if>
<if test="unitName != null and unitName != ''">unit_name,</if>
<if test="quantityRted != null">quantity_rted,</if>
<if test="batchCode != null">batch_code,</if>
<if test="warehouseId != null">warehouse_id,</if>
@ -109,7 +106,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">#{itemName},</if>
<if test="specification != null">#{specification},</if>
<if test="unitOfMeasure != null">#{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">#{unitName},</if>
<if test="quantityRted != null">#{quantityRted},</if>
<if test="batchCode != null">#{batchCode},</if>
<if test="warehouseId != null">#{warehouseId},</if>
@ -143,7 +139,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name = #{itemName},</if>
<if test="specification != null">specification = #{specification},</if>
<if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">unit_name = #{unitName}</if>
<if test="quantityRted != null">quantity_rted = #{quantityRted},</if>
<if test="batchCode != null">batch_code = #{batchCode},</if>
<if test="warehouseId != null">warehouse_id = #{warehouseId},</if>

7
ktg-mes/src/main/resources/mapper/wm/WmRtVendorLineMapper.xml
View File

@ -13,7 +13,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="itemName" column="item_name" />
<result property="specification" column="specification" />
<result property="unitOfMeasure" column="unit_of_measure" />
<result property="unitName" column="unit_name" />
<result property="quantityRted" column="quantity_rted" />
<result property="batchCode" column="batch_code" />
<result property="warehouseId" column="warehouse_id" />
@ -37,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectWmRtVendorLineVo">
select line_id, rt_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_rted, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_rt_vendor_line
select line_id, rt_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, quantity_rted, batch_code, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_rt_vendor_line
</sql>
<select id="selectWmRtVendorLineList" parameterType="WmRtVendorLine" resultMap="WmRtVendorLineResult">
@ -50,7 +49,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
<if test="specification != null and specification != ''"> and specification = #{specification}</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
<if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
<if test="quantityRted != null "> and quantity_rted = #{quantityRted}</if>
<if test="batchCode != null and batchCode != ''"> and batch_code = #{batchCode}</if>
<if test="warehouseId != null "> and warehouse_id = #{warehouseId}</if>
@ -81,7 +79,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name,</if>
<if test="specification != null">specification,</if>
<if test="unitOfMeasure != null">unit_of_measure,</if>
<if test="unitName != null and unitName != ''">unit_name,</if>
<if test="quantityRted != null">quantity_rted,</if>
<if test="batchCode != null">batch_code,</if>
<if test="warehouseId != null">warehouse_id,</if>
@ -111,7 +108,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">#{itemName},</if>
<if test="specification != null">#{specification},</if>
<if test="unitOfMeasure != null">#{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">#{unitName},</if>
<if test="quantityRted != null">#{quantityRted},</if>
<if test="batchCode != null">#{batchCode},</if>
<if test="warehouseId != null">#{warehouseId},</if>
@ -145,7 +141,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name = #{itemName},</if>
<if test="specification != null">specification = #{specification},</if>
<if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
<if test="quantityRted != null">quantity_rted = #{quantityRted},</if>
<if test="batchCode != null">batch_code = #{batchCode},</if>
<if test="warehouseId != null">warehouse_id = #{warehouseId},</if>

18
ktg-mes/src/main/resources/mapper/wm/WmSnMapper.xml
View File

@ -12,7 +12,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="itemName" column="item_name" />
<result property="specification" column="specification" />
<result property="unitOfMeasure" column="unit_of_measure" />
<result property="unitName" column="unit_name" />
<result property="batchCode" column="batch_code" />
<result property="snNum" column="snNum"></result>
<result property="workorderId" column="workorder_id"></result>
@ -39,7 +38,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="itemName" column="item_name" />
<result property="specification" column="specification" />
<result property="unitOfMeasure" column="unit_of_measure" />
<result property="unitName" column="unit_name" />
<result property="batchCode" column="batch_code" />
<result property="snNum" column="snNum"></result>
<result property="workorderId" column="workorder_id"></result>
@ -58,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectWmSnVo">
select sn_id, sn_code, item_id, item_code, item_name, specification, unit_of_measure, unit_name, batch_code, workorder_id, gen_date, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_sn
select sn_id, sn_code, item_id, item_code, item_name, specification, unit_of_measure, batch_code, workorder_id, gen_date, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_sn
</sql>
<select id="selectWmSnList" parameterType="WmSn" resultMap="WmSnVOResult">
@ -70,7 +68,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
<if test="specification != null and specification != ''"> and specification = #{specification}</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
<if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
<if test="batchCode != null and batchCode != ''"> and batch_code = #{batchCode}</if>
<if test="workorderId != null and workorderId != ''"> and workorder_id = #{workorderId}</if>
</where>
@ -82,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectSnList" parameterType="WmSn" resultMap="WmSnResult">
select item_id, item_code, item_name, specification, unit_of_measure, unit_name, batch_code,gen_date , count(*) as snNum
select item_id, item_code, item_name, specification, unit_of_measure, batch_code,gen_date , count(*) as snNum
from wm_sn
<where>
<if test="snCode != null and snCode != ''"> and sn_code = #{snCode}</if>
@ -91,15 +88,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
<if test="specification != null and specification != ''"> and specification = #{specification}</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
<if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
<if test="batchCode != null and batchCode != ''"> and batch_code = #{batchCode}</if>
</where>
group by item_id, item_code, item_name, specification, unit_of_measure, unit_name, batch_code, gen_date
group by item_id, item_code, item_name, specification, unit_of_measure, batch_code, gen_date
order by item_id,batch_code desc
</select>
<select id="getStationList" parameterType="WmSn" resultMap="WmSnResult">
select sn.sn_id,sn.sn_code,sn.workorder_id,wo.workorder_code, sn.item_id,sn.item_code,sn.item_name,sn.specification,sn.unit_of_measure,sn.unit_name,ps.input_time
select sn.sn_id,sn.sn_code,sn.workorder_id,wo.workorder_code, sn.item_id,sn.item_code,sn.item_name,sn.specification,sn.unit_of_measure,ps.input_time
from wm_sn sn
left join pro_sn_process ps
on sn.sn_id = ps.sn_id
@ -110,7 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
order by ps.input_time desc
</select>
<select id="getWmSnList" parameterType="WmSn" resultMap="WmSnVOResult">
select group_concat(sn_id) as ids, item_id, item_code, item_name, specification, unit_of_measure, unit_name, batch_code,gen_date , count(*) as snNum
select group_concat(sn_id) as ids, item_id, item_code, item_name, specification, unit_of_measure, batch_code,gen_date , count(*) as snNum
from wm_sn
<where>
<if test="snCode != null and snCode != ''"> and sn_code = #{snCode}</if>
@ -119,7 +115,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
<if test="specification != null and specification != ''"> and specification = #{specification}</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
<if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
<if test="batchCode != null and batchCode != ''"> and batch_code = #{batchCode}</if>
</where>
group by item_id, item_code, item_name, specification, unit_of_measure, batch_code, gen_date
@ -136,7 +131,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name,</if>
<if test="specification != null">specification,</if>
<if test="unitOfMeasure != null">unit_of_measure,</if>
<if test="unitName != null and unitName != ''">unit_name,</if>
<if test="batchCode != null">batch_code,</if>
<if test="workorderId != null">workorder_id,</if>
<if test="genDate !=null">gen_date,</if>
@ -157,7 +151,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">#{itemName},</if>
<if test="specification != null">#{specification},</if>
<if test="unitOfMeasure != null">#{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">#{unitName},</if>
<if test="batchCode != null">#{batchCode},</if>
<if test="workorderId != null">#{workorderId},</if>
<if test="genDate !=null">#{genDate},</if>
@ -182,7 +175,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name = #{itemName},</if>
<if test="specification != null">specification = #{specification},</if>
<if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
<if test="batchCode != null">batch_code = #{batchCode},</if>
<if test="workorderId != null">workorder_id = #{workorderId},</if>
<if test="remark != null">remark = #{remark},</if>

14
ktg-mes/src/main/resources/mapper/wm/WmStorageAreaMapper.xml
View File

@ -60,13 +60,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectWmStorageAreaVo"/>
where area_code = #{areaCode}
</select>
<select id="selectByAreaIds" resultType="com.ktg.mes.wm.domain.WmStorageArea" resultMap="WmStorageAreaResult">
<include refid="selectWmStorageAreaVo"/>
where area_id in
<foreach collection="ids" item="item" separator="," open="(" close=")">
#{item}
</foreach>
</select>
<insert id="insertWmStorageArea" parameterType="WmStorageArea" useGeneratedKeys="true" keyProperty="areaId">
insert into wm_storage_area
@ -176,12 +169,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<delete id="deleteByLocationId" parameterType="Long">
delete from wm_storage_area where location_id = #{locationId}
</delete>
<delete id="deleteByLocationIds" parameterType="Long">
delete from wm_storage_area
where location_id in
<foreach collection="ids" item="item" separator="," open="(" close=")">
#{item}
</foreach>
</delete>
</mapper>

7
ktg-mes/src/main/resources/mapper/wm/WmTransferLineMapper.xml
View File

@ -13,7 +13,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="itemName" column="item_name" />
<result property="specification" column="specification" />
<result property="unitOfMeasure" column="unit_of_measure" />
<result property="unitName" column="unit_name" />
<result property="quantityTransfer" column="quantity_transfer" />
<result property="workorderId" column="workorder_id" />
<result property="workorderCode" column="workorder_code" />
@ -53,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectWmTransferLineVo">
select line_id, transfer_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, unit_name, quantity_transfer, workorder_id, workorder_code, batch_code, from_warehouse_id, from_warehouse_code, from_warehouse_name, from_location_id, from_location_code, from_location_name, from_area_id, from_area_code, from_area_name, to_warehouse_id, to_warehouse_code, to_warehouse_name, to_location_id, to_location_code, to_location_name, to_area_id, to_area_code, to_area_name, expire_date, vendor_id, vendor_code, vendor_name, vendor_nick, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_transfer_line
select line_id, transfer_id, material_stock_id, item_id, item_code, item_name, specification, unit_of_measure, quantity_transfer, workorder_id, workorder_code, batch_code, from_warehouse_id, from_warehouse_code, from_warehouse_name, from_location_id, from_location_code, from_location_name, from_area_id, from_area_code, from_area_name, to_warehouse_id, to_warehouse_code, to_warehouse_name, to_location_id, to_location_code, to_location_name, to_area_id, to_area_code, to_area_name, expire_date, vendor_id, vendor_code, vendor_name, vendor_nick, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_transfer_line
</sql>
<select id="selectWmTransferLineList" parameterType="WmTransferLine" resultMap="WmTransferLineResult">
@ -66,7 +65,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
<if test="specification != null and specification != ''"> and specification = #{specification}</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
<if test="unitName != null and unitName != ''">and unit_name = #{unitName}</if>
<if test="quantityTransfer != null "> and quantity_transfer = #{quantityTransfer}</if>
<if test="workorderId != null "> and workorder_id = #{workorderId}</if>
<if test="workorderCode != null and workorderCode != ''"> and workorder_code = #{workorderCode}</if>
@ -113,7 +111,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name,</if>
<if test="specification != null">specification,</if>
<if test="unitOfMeasure != null">unit_of_measure,</if>
<if test="unitName != null and unitName != ''">unit_name,</if>
<if test="quantityTransfer != null">quantity_transfer,</if>
<if test="workorderId != null">workorder_id,</if>
<if test="workorderCode != null">workorder_code,</if>
@ -159,7 +156,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">#{itemName},</if>
<if test="specification != null">#{specification},</if>
<if test="unitOfMeasure != null">#{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">#{unitName}</if>
<if test="quantityTransfer != null">#{quantityTransfer},</if>
<if test="workorderId != null">#{workorderId},</if>
<if test="workorderCode != null">#{workorderCode},</if>
@ -209,7 +205,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="itemName != null">item_name = #{itemName},</if>
<if test="specification != null">specification = #{specification},</if>
<if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
<if test="unitName != null and unitName != ''">unit_name = #{unitName},</if>
<if test="quantityTransfer != null">quantity_transfer = #{quantityTransfer},</if>
<if test="workorderId != null">workorder_id = #{workorderId},</if>
<if test="workorderCode != null">workorder_code = #{workorderCode},</if>

7
ktg-mes/src/main/resources/mapper/wm/WmWarehouseMapper.xml
View File

@ -90,13 +90,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectWmWarehouseVo"/>
where warehouse_name = #{warehouseName} limit 1
</select>
<select id="selectByWarehouseId" resultType="com.ktg.mes.wm.domain.WmWarehouse" resultMap="WmWarehouseResult">
<include refid="selectWmWarehouseVo"/>
where warehouse_id in
<foreach collection="ids" item="item" separator="," open="(" close=")">
#{item}
</foreach>
</select>
<insert id="insertWmWarehouse" parameterType="WmWarehouse" useGeneratedKeys="true" keyProperty="warehouseId">
insert into wm_warehouse

7
ktg-system/src/main/java/com/ktg/system/mapper/SysDeptMapper.java
View File

@ -121,11 +121,4 @@ public interface SysDeptMapper
* @return
*/
List<SysDept> selectAllDeptList();
/**
* 校验部门编码是否唯一
* @param deptCode
* @return
*/
SysDept checkDeptCodeUnique(@Param("deptCode") String deptCode);
}

7
ktg-system/src/main/java/com/ktg/system/service/ISysDeptService.java
View File

@ -119,11 +119,4 @@ public interface ISysDeptService
* @return
*/
List<SysDept> selectAllDeptList();
/**
* 校验部门编码是否唯一
* @param dept
* @return
*/
String checkDeptCodeUnique(SysDept dept);
}

11
ktg-system/src/main/java/com/ktg/system/service/impl/SysDeptServiceImpl.java
View File

@ -289,17 +289,6 @@ public class SysDeptServiceImpl implements ISysDeptService
return deptMapper.selectAllDeptList();
}
@Override
public String checkDeptCodeUnique(SysDept dept) {
Long deptId = StringUtils.isNull(dept.getDeptId()) ? -1L : dept.getDeptId();
SysDept info = deptMapper.checkDeptCodeUnique(dept.getDeptCode());
if (StringUtils.isNotNull(info) && info.getDeptId().longValue() != deptId.longValue())
{
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
}
/**
* 递归列表
*/

5
ktg-system/src/main/resources/mapper/system/SysDeptMapper.xml
View File

@ -88,11 +88,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectAllDeptList" resultType="com.ktg.common.core.domain.entity.SysDept" resultMap="SysDeptResult">
<include refid="selectDeptVo"/>
</select>
<select id="checkDeptCodeUnique" resultType="com.ktg.common.core.domain.entity.SysDept" resultMap="SysDeptResult">
<include refid="selectDeptVo"/>
where dept_code = #{deptCode}
limit 1
</select>
<insert id="insertDept" parameterType="SysDept">
insert into sys_dept(