diff --git a/ABAP_AS_WITH_POOL.jcoDestination b/ABAP_AS_WITH_POOL.jcoDestination new file mode 100644 index 000000000..611139708 --- /dev/null +++ b/ABAP_AS_WITH_POOL.jcoDestination @@ -0,0 +1,11 @@ +#for test only! +#Mon Nov 06 18:11:07 CST 2023 +jco.destination.pool_capacity=true +jco.client.lang=zh +jco.client.ashost=192.168.0.54 +jco.client.saprouter= +jco.client.user=MES +jco.client.sysnr=0 +jco.destination.peak_limit=20 +jco.client.passwd=123456 +jco.client.client=800 diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/quality/QcCheckTaskIncomeDto.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/quality/QcCheckTaskIncomeDto.java new file mode 100644 index 000000000..a6cd94bda --- /dev/null +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/quality/QcCheckTaskIncomeDto.java @@ -0,0 +1,374 @@ +package com.op.system.api.domain.dto.quality; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 来料检验对象 qc_check_task_income + * + * @author Open Platform + * @date 2023-10-19 + */ +public class QcCheckTaskIncomeDto extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** id */ + private String recordId; + + /** 检验任务编号 */ + @Excel(name = "检验任务编号") + private String checkNo; + + /** 来料批次号 */ + @Excel(name = "来料批次号") + private String incomeBatchNo; + + /** 订单号 */ + @Excel(name = "订单号") + private String orderNo; + + /** 物料号 */ + @Excel(name = "物料号") + private String materialCode; + + /** 物料名称 */ + @Excel(name = "物料名称") + private String materialName; + + /** 收货数量 */ + @Excel(name = "收货数量") + private BigDecimal quality; + + /** 单位 */ + @Excel(name = "单位") + private String unit; + + /** 供应商编码 */ + @Excel(name = "供应商编码") + private String supplierCode; + + /** 供应商名称 */ + @Excel(name = "供应商名称") + private String supplierName; + + /** 来料时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "来料时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date incomeTime; + + /** 检测地点 */ + @Excel(name = "检测地点") + private String checkLoc; + + /** 检测状态 */ + @Excel(name = "检测状态") + private String checkStatus; + + /** 检测人工号 */ + @Excel(name = "检测人工号") + private String checkManCode; + + /** 检测人姓名 */ + @Excel(name = "检测人姓名") + private String checkManName; + + /** 检验时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "检验时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date checkTime; + + /** 检验结果Y合格 */ + @Excel(name = "检验结果Y合格") + private String checkResult; + + /** 是否启用1启用0停用 */ + @Excel(name = "是否启用1启用0停用") + private String status; + + /** 预留字段1 */ + //@Excel(name = "预留字段1") + private String attr1; + + /** 预留字段2 */ + //@Excel(name = "预留字段2") + private String attr2; + + /** 预留字段3 */ + //@Excel(name = "预留字段3") + private String attr3; + + /** 预留字段4 */ + //@Excel(name = "预留字段4") + private String attr4; + + /** 工厂编码 */ + @Excel(name = "工厂编码") + private String factoryCode; + + /** 删除标识1删除0正常 */ + private String delFlag; + + private String incomeTimeStart; + private String incomeTimeEnd; + private String checkTimeStart; + private String checkTimeEnd; + private String typeCode; + private String checkType; + + public String getCheckType() { + return checkType; + } + + public void setCheckType(String checkType) { + this.checkType = checkType; + } + + public String getTypeCode() { + return typeCode; + } + + public void setTypeCode(String typeCode) { + this.typeCode = typeCode; + } + + public String getIncomeTimeStart() { + return incomeTimeStart; + } + + public void setIncomeTimeStart(String incomeTimeStart) { + this.incomeTimeStart = incomeTimeStart; + } + + public String getIncomeTimeEnd() { + return incomeTimeEnd; + } + + public void setIncomeTimeEnd(String incomeTimeEnd) { + this.incomeTimeEnd = incomeTimeEnd; + } + + public String getCheckTimeStart() { + return checkTimeStart; + } + + public void setCheckTimeStart(String checkTimeStart) { + this.checkTimeStart = checkTimeStart; + } + + public String getCheckTimeEnd() { + return checkTimeEnd; + } + + public void setCheckTimeEnd(String checkTimeEnd) { + this.checkTimeEnd = checkTimeEnd; + } + + public void setRecordId(String recordId) { + this.recordId = recordId; + } + + public String getRecordId() { + return recordId; + } + public void setCheckNo(String checkNo) { + this.checkNo = checkNo; + } + + public String getCheckNo() { + return checkNo; + } + public void setIncomeBatchNo(String incomeBatchNo) { + this.incomeBatchNo = incomeBatchNo; + } + + public String getIncomeBatchNo() { + return incomeBatchNo; + } + public void setOrderNo(String orderNo) { + this.orderNo = orderNo; + } + + public String getOrderNo() { + return orderNo; + } + public void setMaterialCode(String materialCode) { + this.materialCode = materialCode; + } + + public String getMaterialCode() { + return materialCode; + } + public void setMaterialName(String materialName) { + this.materialName = materialName; + } + + public String getMaterialName() { + return materialName; + } + public void setQuality(BigDecimal quality) { + this.quality = quality; + } + + public BigDecimal getQuality() { + return quality; + } + public void setUnit(String unit) { + this.unit = unit; + } + + public String getUnit() { + return unit; + } + public void setSupplierCode(String supplierCode) { + this.supplierCode = supplierCode; + } + + public String getSupplierCode() { + return supplierCode; + } + public void setSupplierName(String supplierName) { + this.supplierName = supplierName; + } + + public String getSupplierName() { + return supplierName; + } + public void setIncomeTime(Date incomeTime) { + this.incomeTime = incomeTime; + } + + public Date getIncomeTime() { + return incomeTime; + } + public void setCheckLoc(String checkLoc) { + this.checkLoc = checkLoc; + } + + public String getCheckLoc() { + return checkLoc; + } + public void setCheckStatus(String checkStatus) { + this.checkStatus = checkStatus; + } + + public String getCheckStatus() { + return checkStatus; + } + public void setCheckManCode(String checkManCode) { + this.checkManCode = checkManCode; + } + + public String getCheckManCode() { + return checkManCode; + } + public void setCheckManName(String checkManName) { + this.checkManName = checkManName; + } + + public String getCheckManName() { + return checkManName; + } + public void setCheckTime(Date checkTime) { + this.checkTime = checkTime; + } + + public Date getCheckTime() { + return checkTime; + } + public void setCheckResult(String checkResult) { + this.checkResult = checkResult; + } + + public String getCheckResult() { + return checkResult; + } + public void setStatus(String status) { + this.status = status; + } + + public String getStatus() { + return status; + } + public void setAttr1(String attr1) { + this.attr1 = attr1; + } + + public String getAttr1() { + return attr1; + } + public void setAttr2(String attr2) { + this.attr2 = attr2; + } + + public String getAttr2() { + return attr2; + } + public void setAttr3(String attr3) { + this.attr3 = attr3; + } + + public String getAttr3() { + return attr3; + } + public void setAttr4(String attr4) { + this.attr4 = attr4; + } + + public String getAttr4() { + return attr4; + } + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getFactoryCode() { + return factoryCode; + } + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public String getDelFlag() { + return delFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("recordId", getRecordId()) + .append("checkNo", getCheckNo()) + .append("incomeBatchNo", getIncomeBatchNo()) + .append("orderNo", getOrderNo()) + .append("materialCode", getMaterialCode()) + .append("materialName", getMaterialName()) + .append("quality", getQuality()) + .append("unit", getUnit()) + .append("supplierCode", getSupplierCode()) + .append("supplierName", getSupplierName()) + .append("incomeTime", getIncomeTime()) + .append("checkLoc", getCheckLoc()) + .append("checkStatus", getCheckStatus()) + .append("checkManCode", getCheckManCode()) + .append("checkManName", getCheckManName()) + .append("checkTime", getCheckTime()) + .append("checkResult", getCheckResult()) + .append("status", getStatus()) + .append("attr1", getAttr1()) + .append("attr2", getAttr2()) + .append("attr3", getAttr3()) + .append("attr4", getAttr4()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("factoryCode", getFactoryCode()) + .append("delFlag", getDelFlag()) + .toString(); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/controller/SparePartsInOutStorageController.java b/op-modules/op-device/src/main/java/com/op/device/controller/SparePartsInOutStorageController.java new file mode 100644 index 000000000..f9f5f329c --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/controller/SparePartsInOutStorageController.java @@ -0,0 +1,97 @@ +package com.op.device.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.op.common.log.annotation.Log; +import com.op.common.log.enums.BusinessType; +import com.op.common.security.annotation.RequiresPermissions; +import com.op.device.domain.SparePartsInStorage; +import com.op.device.service.ISparePartsInOutStorageService; +import com.op.common.core.web.controller.BaseController; +import com.op.common.core.web.domain.AjaxResult; +import com.op.common.core.utils.poi.ExcelUtil; +import com.op.common.core.web.page.TableDataInfo; + +/** + * 备品备件出入库Controller + * + * @author Open Platform + * @date 2023-10-17 + */ +@RestController +@RequestMapping("/sparepartsInOutStorage") +public class SparePartsInOutStorageController extends BaseController { + @Autowired + private ISparePartsInOutStorageService sparePartsInOutStorageService; + + /** + * 查询备品备件出入库列表 + */ + @RequiresPermissions("device:sparepartsInOutStorage:list") + @GetMapping("/list") + public TableDataInfo list(SparePartsInStorage sparePartsInStorage) { + startPage(); + List list = sparePartsInOutStorageService.selectSparePartsInStorageList(sparePartsInStorage); + return getDataTable(list); + } + + /** + * 导出备品备件出入库列表 + */ + @RequiresPermissions("device:sparepartsInOutStorage:export") + @Log(title = "备品备件出入库", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, SparePartsInStorage sparePartsInStorage) { + List list = sparePartsInOutStorageService.selectSparePartsInStorageList(sparePartsInStorage); + ExcelUtil util = new ExcelUtil(SparePartsInStorage.class); + util.exportExcel(response, list, "备品备件出入库数据"); + } + + /** + * 获取备品备件出入库详细信息 + */ + @RequiresPermissions("device:sparepartsInOutStorage:query") + @GetMapping(value = "/{rawOrderInSnId}") + public AjaxResult getInfo(@PathVariable("rawOrderInSnId") String rawOrderInSnId) { + return success(sparePartsInOutStorageService.selectSparePartsInStorageByRawOrderInSnId(rawOrderInSnId)); + } + + /** + * 新增备品备件出入库 + */ + @RequiresPermissions("device:sparepartsInOutStorage:add") + @Log(title = "备品备件出入库", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SparePartsInStorage sparePartsInStorage) { + return toAjax(sparePartsInOutStorageService.insertSparePartsInStorage(sparePartsInStorage)); + } + + /** + * 修改备品备件出入库 + */ + @RequiresPermissions("device:sparepartsInOutStorage:edit") + @Log(title = "备品备件出入库", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SparePartsInStorage sparePartsInStorage) { + return toAjax(sparePartsInOutStorageService.updateSparePartsInStorage(sparePartsInStorage)); + } + + /** + * 删除备品备件出入库 + */ + @RequiresPermissions("device:sparepartsInOutStorage:remove") + @Log(title = "备品备件出入库", businessType = BusinessType.DELETE) + @DeleteMapping("/{rawOrderInSnIds}") + public AjaxResult remove(@PathVariable String[] rawOrderInSnIds) { + return toAjax(sparePartsInOutStorageService.deleteSparePartsInStorageByRawOrderInSnIds(rawOrderInSnIds)); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/SparePartsInStorage.java b/op-modules/op-device/src/main/java/com/op/device/domain/SparePartsInStorage.java new file mode 100644 index 000000000..83edcdcce --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/domain/SparePartsInStorage.java @@ -0,0 +1,352 @@ +package com.op.device.domain; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.op.common.core.annotation.Excel; +import com.op.common.core.web.domain.BaseEntity; + +/** + * 备品备件出入库对象 wms_raw_order_in_sn + * + * @author Open Platform + * @date 2023-10-17 + */ +public class SparePartsInStorage extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** 唯一序列号 */ + private String rawOrderInSnId; + + /** 仓库编码 */ + @Excel(name = "仓库编码") + private String whCode; + + /** 库区编码 */ + @Excel(name = "库区编码") + private String waCode; + + /** 库位编码 */ + @Excel(name = "库位编码") + private String wlCode; + + /** 入库单号 */ + @Excel(name = "入库单号") + private String orderNo; + + /** 采购订单号 */ + @Excel(name = "采购订单号") + private String poNo; + + /** 采购订单行项目 */ + @Excel(name = "采购订单行项目") + private String poLine; + + /** 物料号 */ + @Excel(name = "物料号") + private String materialCode; + + /** 物料描述 */ + @Excel(name = "物料描述") + private String materialDesc; + + /** sn/LPN */ + @Excel(name = "sn/LPN") + private String sn; + + /** 数量 */ + @Excel(name = "数量") + private BigDecimal amount; + + /** 备用1 */ + @Excel(name = "备用1") + private String userDefined1; + + /** 备用2 */ + @Excel(name = "备用2") + private String userDefined2; + + /** 备用3 */ + @Excel(name = "备用3") + private String userDefined3; + + /** 备用4 */ + @Excel(name = "备用4") + private String userDefined4; + + /** 备用5 */ + @Excel(name = "备用5") + private String userDefined5; + + /** 备用6 */ + @Excel(name = "备用6") + private String userDefined6; + + /** 备用7 */ + @Excel(name = "备用7") + private String userDefined7; + + /** 备用8 */ + @Excel(name = "备用8") + private String userDefined8; + + /** 备用9 */ + @Excel(name = "备用9") + private String userDefined9; + + /** 备用10 */ + @Excel(name = "备用10") + private String userDefined10; + + /** 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date gmtCreate; + + /** 最后更新人 */ + @Excel(name = "最后更新人") + private String lastModifiedBy; + + /** 最后更新时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最后更新时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date gmtModified; + + /** 有效标记 */ + @Excel(name = "有效标记") + private String activeFlag; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String factoryCode; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private String sapFactoryCode; + + public void setRawOrderInSnId(String rawOrderInSnId) { + this.rawOrderInSnId = rawOrderInSnId; + } + + public String getRawOrderInSnId() { + return rawOrderInSnId; + } + public void setWhCode(String whCode) { + this.whCode = whCode; + } + + public String getWhCode() { + return whCode; + } + public void setWaCode(String waCode) { + this.waCode = waCode; + } + + public String getWaCode() { + return waCode; + } + public void setWlCode(String wlCode) { + this.wlCode = wlCode; + } + + public String getWlCode() { + return wlCode; + } + public void setOrderNo(String orderNo) { + this.orderNo = orderNo; + } + + public String getOrderNo() { + return orderNo; + } + public void setPoNo(String poNo) { + this.poNo = poNo; + } + + public String getPoNo() { + return poNo; + } + public void setPoLine(String poLine) { + this.poLine = poLine; + } + + public String getPoLine() { + return poLine; + } + public void setMaterialCode(String materialCode) { + this.materialCode = materialCode; + } + + public String getMaterialCode() { + return materialCode; + } + public void setMaterialDesc(String materialDesc) { + this.materialDesc = materialDesc; + } + + public String getMaterialDesc() { + return materialDesc; + } + public void setSn(String sn) { + this.sn = sn; + } + + public String getSn() { + return sn; + } + public void setAmount(BigDecimal amount) { + this.amount = amount; + } + + public BigDecimal getAmount() { + return amount; + } + public void setUserDefined1(String userDefined1) { + this.userDefined1 = userDefined1; + } + + public String getUserDefined1() { + return userDefined1; + } + public void setUserDefined2(String userDefined2) { + this.userDefined2 = userDefined2; + } + + public String getUserDefined2() { + return userDefined2; + } + public void setUserDefined3(String userDefined3) { + this.userDefined3 = userDefined3; + } + + public String getUserDefined3() { + return userDefined3; + } + public void setUserDefined4(String userDefined4) { + this.userDefined4 = userDefined4; + } + + public String getUserDefined4() { + return userDefined4; + } + public void setUserDefined5(String userDefined5) { + this.userDefined5 = userDefined5; + } + + public String getUserDefined5() { + return userDefined5; + } + public void setUserDefined6(String userDefined6) { + this.userDefined6 = userDefined6; + } + + public String getUserDefined6() { + return userDefined6; + } + public void setUserDefined7(String userDefined7) { + this.userDefined7 = userDefined7; + } + + public String getUserDefined7() { + return userDefined7; + } + public void setUserDefined8(String userDefined8) { + this.userDefined8 = userDefined8; + } + + public String getUserDefined8() { + return userDefined8; + } + public void setUserDefined9(String userDefined9) { + this.userDefined9 = userDefined9; + } + + public String getUserDefined9() { + return userDefined9; + } + public void setUserDefined10(String userDefined10) { + this.userDefined10 = userDefined10; + } + + public String getUserDefined10() { + return userDefined10; + } + public void setGmtCreate(Date gmtCreate) { + this.gmtCreate = gmtCreate; + } + + public Date getGmtCreate() { + return gmtCreate; + } + public void setLastModifiedBy(String lastModifiedBy) { + this.lastModifiedBy = lastModifiedBy; + } + + public String getLastModifiedBy() { + return lastModifiedBy; + } + public void setGmtModified(Date gmtModified) { + this.gmtModified = gmtModified; + } + + public Date getGmtModified() { + return gmtModified; + } + public void setActiveFlag(String activeFlag) { + this.activeFlag = activeFlag; + } + + public String getActiveFlag() { + return activeFlag; + } + public void setFactoryCode(String factoryCode) { + this.factoryCode = factoryCode; + } + + public String getFactoryCode() { + return factoryCode; + } + public void setSapFactoryCode(String sapFactoryCode) { + this.sapFactoryCode = sapFactoryCode; + } + + public String getSapFactoryCode() { + return sapFactoryCode; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("rawOrderInSnId", getRawOrderInSnId()) + .append("whCode", getWhCode()) + .append("waCode", getWaCode()) + .append("wlCode", getWlCode()) + .append("orderNo", getOrderNo()) + .append("poNo", getPoNo()) + .append("poLine", getPoLine()) + .append("materialCode", getMaterialCode()) + .append("materialDesc", getMaterialDesc()) + .append("sn", getSn()) + .append("amount", getAmount()) + .append("userDefined1", getUserDefined1()) + .append("userDefined2", getUserDefined2()) + .append("userDefined3", getUserDefined3()) + .append("userDefined4", getUserDefined4()) + .append("userDefined5", getUserDefined5()) + .append("userDefined6", getUserDefined6()) + .append("userDefined7", getUserDefined7()) + .append("userDefined8", getUserDefined8()) + .append("userDefined9", getUserDefined9()) + .append("userDefined10", getUserDefined10()) + .append("createBy", getCreateBy()) + .append("gmtCreate", getGmtCreate()) + .append("lastModifiedBy", getLastModifiedBy()) + .append("gmtModified", getGmtModified()) + .append("activeFlag", getActiveFlag()) + .append("factoryCode", getFactoryCode()) + .append("sapFactoryCode", getSapFactoryCode()) + .toString(); + } +} diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/SparePartsInOutStorageMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/SparePartsInOutStorageMapper.java new file mode 100644 index 000000000..3c04e3698 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/SparePartsInOutStorageMapper.java @@ -0,0 +1,61 @@ +package com.op.device.mapper; + +import java.util.List; + +import com.op.device.domain.SparePartsInStorage; + +/** + * 备品备件出入库Mapper接口 + * + * @author Open Platform + * @date 2023-10-17 + */ +public interface SparePartsInOutStorageMapper { + /** + * 查询备品备件出入库 + * + * @param rawOrderInSnId 备品备件出入库主键 + * @return 备品备件出入库 + */ + public SparePartsInStorage selectSparePartsInStorageByRawOrderInSnId(String rawOrderInSnId); + + /** + * 查询备品备件出入库列表 + * + * @param sparePartsInStorage 备品备件出入库 + * @return 备品备件出入库集合 + */ + public List selectSparePartsInStorageList(SparePartsInStorage sparePartsInStorage); + + /** + * 新增备品备件出入库 + * + * @param sparePartsInStorage 备品备件出入库 + * @return 结果 + */ + public int insertSparePartsInStorage(SparePartsInStorage sparePartsInStorage); + + /** + * 修改备品备件出入库 + * + * @param sparePartsInStorage 备品备件出入库 + * @return 结果 + */ + public int updateSparePartsInStorage(SparePartsInStorage sparePartsInStorage); + + /** + * 删除备品备件出入库 + * + * @param rawOrderInSnId 备品备件出入库主键 + * @return 结果 + */ + public int deleteSparePartsInStorageByRawOrderInSnId(String rawOrderInSnId); + + /** + * 批量删除备品备件出入库 + * + * @param rawOrderInSnIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSparePartsInStorageByRawOrderInSnIds(String[] rawOrderInSnIds); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/ISparePartsInOutStorageService.java b/op-modules/op-device/src/main/java/com/op/device/service/ISparePartsInOutStorageService.java new file mode 100644 index 000000000..db0055079 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/ISparePartsInOutStorageService.java @@ -0,0 +1,60 @@ +package com.op.device.service; + +import java.util.List; +import com.op.device.domain.SparePartsInStorage; + +/** + * 备品备件出入库Service接口 + * + * @author Open Platform + * @date 2023-10-17 + */ +public interface ISparePartsInOutStorageService { + /** + * 查询备品备件出入库 + * + * @param rawOrderInSnId 备品备件出入库主键 + * @return 备品备件出入库 + */ + public SparePartsInStorage selectSparePartsInStorageByRawOrderInSnId(String rawOrderInSnId); + + /** + * 查询备品备件出入库列表 + * + * @param sparePartsInStorage 备品备件出入库 + * @return 备品备件出入库集合 + */ + public List selectSparePartsInStorageList(SparePartsInStorage sparePartsInStorage); + + /** + * 新增备品备件出入库 + * + * @param sparePartsInStorage 备品备件出入库 + * @return 结果 + */ + public int insertSparePartsInStorage(SparePartsInStorage sparePartsInStorage); + + /** + * 修改备品备件出入库 + * + * @param sparePartsInStorage 备品备件出入库 + * @return 结果 + */ + public int updateSparePartsInStorage(SparePartsInStorage sparePartsInStorage); + + /** + * 批量删除备品备件出入库 + * + * @param rawOrderInSnIds 需要删除的备品备件出入库主键集合 + * @return 结果 + */ + public int deleteSparePartsInStorageByRawOrderInSnIds(String[] rawOrderInSnIds); + + /** + * 删除备品备件出入库信息 + * + * @param rawOrderInSnId 备品备件出入库主键 + * @return 结果 + */ + public int deleteSparePartsInStorageByRawOrderInSnId(String rawOrderInSnId); +} diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/SparePartsInOutStorageServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/SparePartsInOutStorageServiceImpl.java new file mode 100644 index 000000000..1685a2439 --- /dev/null +++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/SparePartsInOutStorageServiceImpl.java @@ -0,0 +1,95 @@ +package com.op.device.service.impl; + +import java.util.List; + +import com.baomidou.dynamic.datasource.annotation.DS; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.op.device.mapper.SparePartsInOutStorageMapper; +import com.op.device.domain.SparePartsInStorage; +import com.op.device.service.ISparePartsInOutStorageService; + +/** + * 备品备件出入库Service业务层处理 + * + * @author Open Platform + * @date 2023-10-17 + */ +@Service +public class SparePartsInOutStorageServiceImpl implements ISparePartsInOutStorageService { + @Autowired + private SparePartsInOutStorageMapper sparePartsInOutStorageMapper; + + /** + * 查询备品备件出入库 + * + * @param rawOrderInSnId 备品备件出入库主键 + * @return 备品备件出入库 + */ + @Override + @DS("#header.poolName") + public SparePartsInStorage selectSparePartsInStorageByRawOrderInSnId(String rawOrderInSnId) { + return sparePartsInOutStorageMapper.selectSparePartsInStorageByRawOrderInSnId(rawOrderInSnId); + } + + /** + * 查询备品备件出入库列表 + * + * @param sparePartsInStorage 备品备件出入库 + * @return 备品备件出入库 + */ + @Override + @DS("#header.poolName") + public List selectSparePartsInStorageList(SparePartsInStorage sparePartsInStorage) { + return sparePartsInOutStorageMapper.selectSparePartsInStorageList(sparePartsInStorage); + } + + /** + * 新增备品备件出入库 + * + * @param sparePartsInStorage 备品备件出入库 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int insertSparePartsInStorage(SparePartsInStorage sparePartsInStorage) { + + return sparePartsInOutStorageMapper.insertSparePartsInStorage(sparePartsInStorage); + } + + /** + * 修改备品备件出入库 + * + * @param sparePartsInStorage 备品备件出入库 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int updateSparePartsInStorage(SparePartsInStorage sparePartsInStorage) { + return sparePartsInOutStorageMapper.updateSparePartsInStorage(sparePartsInStorage); + } + + /** + * 批量删除备品备件出入库 + * + * @param rawOrderInSnIds 需要删除的备品备件出入库主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteSparePartsInStorageByRawOrderInSnIds(String[] rawOrderInSnIds) { + return sparePartsInOutStorageMapper.deleteSparePartsInStorageByRawOrderInSnIds(rawOrderInSnIds); + } + + /** + * 删除备品备件出入库信息 + * + * @param rawOrderInSnId 备品备件出入库主键 + * @return 结果 + */ + @Override + @DS("#header.poolName") + public int deleteSparePartsInStorageByRawOrderInSnId(String rawOrderInSnId) { + return sparePartsInOutStorageMapper.deleteSparePartsInStorageByRawOrderInSnId(rawOrderInSnId); + } +} diff --git a/op-modules/op-device/src/main/resources/mapper/device/SparePartsInOutStorageMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/SparePartsInOutStorageMapper.xml new file mode 100644 index 000000000..2d7903eef --- /dev/null +++ b/op-modules/op-device/src/main/resources/mapper/device/SparePartsInOutStorageMapper.xml @@ -0,0 +1,187 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select raw_order_in_sn_id, wh_code, wa_code, wl_code, order_no, po_no, po_line, material_code, material_desc, sn, amount, user_defined1, user_defined2, user_defined3, user_defined4, user_defined5, user_defined6, user_defined7, user_defined8, user_defined9, user_defined10, create_by, gmt_create, last_modified_by, gmt_modified, active_flag, factory_code, sap_factory_code from wms_raw_order_in_sn + + + + + + + + insert into wms_raw_order_in_sn + + raw_order_in_sn_id, + wh_code, + wa_code, + wl_code, + order_no, + po_no, + po_line, + material_code, + material_desc, + sn, + amount, + user_defined1, + user_defined2, + user_defined3, + user_defined4, + user_defined5, + user_defined6, + user_defined7, + user_defined8, + user_defined9, + user_defined10, + create_by, + gmt_create, + last_modified_by, + gmt_modified, + active_flag, + factory_code, + sap_factory_code, + + + #{rawOrderInSnId}, + #{whCode}, + #{waCode}, + #{wlCode}, + #{orderNo}, + #{poNo}, + #{poLine}, + #{materialCode}, + #{materialDesc}, + #{sn}, + #{amount}, + #{userDefined1}, + #{userDefined2}, + #{userDefined3}, + #{userDefined4}, + #{userDefined5}, + #{userDefined6}, + #{userDefined7}, + #{userDefined8}, + #{userDefined9}, + #{userDefined10}, + #{createBy}, + #{gmtCreate}, + #{lastModifiedBy}, + #{gmtModified}, + #{activeFlag}, + #{factoryCode}, + #{sapFactoryCode}, + + + + + update wms_raw_order_in_sn + + wh_code = #{whCode}, + wa_code = #{waCode}, + wl_code = #{wlCode}, + order_no = #{orderNo}, + po_no = #{poNo}, + po_line = #{poLine}, + material_code = #{materialCode}, + material_desc = #{materialDesc}, + sn = #{sn}, + amount = #{amount}, + user_defined1 = #{userDefined1}, + user_defined2 = #{userDefined2}, + user_defined3 = #{userDefined3}, + user_defined4 = #{userDefined4}, + user_defined5 = #{userDefined5}, + user_defined6 = #{userDefined6}, + user_defined7 = #{userDefined7}, + user_defined8 = #{userDefined8}, + user_defined9 = #{userDefined9}, + user_defined10 = #{userDefined10}, + create_by = #{createBy}, + gmt_create = #{gmtCreate}, + last_modified_by = #{lastModifiedBy}, + gmt_modified = #{gmtModified}, + active_flag = #{activeFlag}, + factory_code = #{factoryCode}, + sap_factory_code = #{sapFactoryCode}, + + where raw_order_in_sn_id = #{rawOrderInSnId} + + + + delete from wms_raw_order_in_sn where raw_order_in_sn_id = #{rawOrderInSnId} + + + + delete from wms_raw_order_in_sn where raw_order_in_sn_id in + + #{rawOrderInSnId} + + + \ No newline at end of file diff --git a/op-modules/op-sap/src/main/java/com/op/sap/domain/vo/SapBackflushMPQuery.java b/op-modules/op-sap/src/main/java/com/op/sap/domain/vo/SapBackflushMPQuery.java new file mode 100644 index 000000000..7cc1e30b8 --- /dev/null +++ b/op-modules/op-sap/src/main/java/com/op/sap/domain/vo/SapBackflushMPQuery.java @@ -0,0 +1,117 @@ +package com.op.sap.domain.vo; + +/** + * 反冲类型的领料过账接口 + * auth YangWL + * + * MATNR CHAR 18 0 物料号 必填 + * PLANT CHAR 4 0 工厂 必填 + * GR_RCPT CHAR 12 0 收货方/运达方 选填 + * LGORT CHAR 4 0 库存地点 必填 + * UMLGO CHAR 4 0 收货/发货库存地点 选填 + * QUANTITY QUAN 13 3 数量 必填 + * MEINS UNIT 3 0 条目单位 必填 + * BATCH CHAR 10 0 批号 必填 + * MOVE_BATCH CHAR 10 0 收货/发货批量 选填 + */ + + +public class SapBackflushMPQuery { + + private String matnr; + private String plant; + private String gr_rcpt; + private String lgort; + private String umlgo; + private String quantity; + private String meins; + private String batch; + private String move_batch; + + public String getMatnr() { + return matnr; + } + + public void setMatnr(String matnr) { + this.matnr = matnr; + } + + public String getPlant() { + return plant; + } + + public void setPlant(String plant) { + this.plant = plant; + } + + public String getGr_rcpt() { + return gr_rcpt; + } + + public void setGr_rcpt(String gr_rcpt) { + this.gr_rcpt = gr_rcpt; + } + + public String getLgort() { + return lgort; + } + + public void setLgort(String lgort) { + this.lgort = lgort; + } + + public String getUmlgo() { + return umlgo; + } + + public void setUmlgo(String umlgo) { + this.umlgo = umlgo; + } + + public String getQuantity() { + return quantity; + } + + public void setQuantity(String quantity) { + this.quantity = quantity; + } + + public String getMeins() { + return meins; + } + + public void setMeins(String meins) { + this.meins = meins; + } + + public String getBatch() { + return batch; + } + + public void setBatch(String batch) { + this.batch = batch; + } + + public String getMove_batch() { + return move_batch; + } + + public void setMove_batch(String move_batch) { + this.move_batch = move_batch; + } + + @Override + public String toString() { + return "SapBackflushMPQuery{" + + "matnr='" + matnr + '\'' + + ", plant='" + plant + '\'' + + ", gr_rcpt='" + gr_rcpt + '\'' + + ", lgort='" + lgort + '\'' + + ", umlgo='" + umlgo + '\'' + + ", quantity='" + quantity + '\'' + + ", meins='" + meins + '\'' + + ", batch='" + batch + '\'' + + ", move_batch='" + move_batch + '\'' + + '}'; + } +} diff --git a/op-modules/op-sap/src/main/java/com/op/sap/domain/vo/SapMaterialPosting.java b/op-modules/op-sap/src/main/java/com/op/sap/domain/vo/SapMaterialPosting.java new file mode 100644 index 000000000..bb5c9577b --- /dev/null +++ b/op-modules/op-sap/src/main/java/com/op/sap/domain/vo/SapMaterialPosting.java @@ -0,0 +1,127 @@ +package com.op.sap.domain.vo; + +//智慧工厂-订单物料领料过账、原材料补料、订单物料退料过账(MB1A) + +/** + AUFNR CHAR 12 0 订单号 必填 + BWART CHAR 3 0 移动类型(库存管理) 必填 + PLANT CHAR 4 0 工厂 必填 + GL_ACCOUNT CHAR 10 0 总帐科目编号 选填 + COSTCENTER CHAR 10 0 成本中心 选填 + GR_RCPT CHAR 12 0 收货方/运达方 选填 + LGORT CHAR 4 0 库存地点 必填 + MATNR CHAR 18 0 物料号 必填 + QUANTITY QUAN 13 3 数量 必填 + MEINS UNIT 3 0 基本计量单位 必填 + BATCH CHAR 10 0 批号 选填 + + */ +public class SapMaterialPosting { + + + + /** + * 订单物料领料过账、原材料补料的移动类型值为261 + * 订单物料退料过账为262 + * + */ + private String aufnr; + private String bwart; + private String plant; + private String gl_account; + private String costcenter; + private String gr_rcpt; + private String lgort; + private String matnr; + private String quantity; + private String meins; + private String batch; + + public String getGl_account() { + return gl_account; + } + + public void setGl_account(String gl_account) { + this.gl_account = gl_account; + } + + public String getCostcenter() { + return costcenter; + } + + public void setCostcenter(String costcenter) { + this.costcenter = costcenter; + } + + public String getGr_rcpt() { + return gr_rcpt; + } + + public void setGr_rcpt(String gr_rcpt) { + this.gr_rcpt = gr_rcpt; + } + + public String getAufnr() { + return aufnr; + } + + public void setAufnr(String aufnr) { + this.aufnr = aufnr; + } + + public String getBwart() { + return bwart; + } + + public void setBwart(String bwart) { + this.bwart = bwart; + } + + public String getPlant() { + return plant; + } + + public void setPlant(String plant) { + this.plant = plant; + } + + public String getLgort() { + return lgort; + } + + public void setLgort(String lgort) { + this.lgort = lgort; + } + + public String getMatnr() { + return matnr; + } + + public void setMatnr(String matnr) { + this.matnr = matnr; + } + + public String getQuantity() { + return quantity; + } + + public void setQuantity(String quantity) { + this.quantity = quantity; + } + + public String getMeins() { + return meins; + } + + public void setMeins(String meins) { + this.meins = meins; + } + + public String getBatch() { + return batch; + } + + public void setBatch(String batch) { + this.batch = batch; + } +} diff --git a/op-modules/op-sap/src/main/java/com/op/sap/domain/vo/SapPurchaseOrderQuery.java b/op-modules/op-sap/src/main/java/com/op/sap/domain/vo/SapPurchaseOrderQuery.java new file mode 100644 index 000000000..281d431df --- /dev/null +++ b/op-modules/op-sap/src/main/java/com/op/sap/domain/vo/SapPurchaseOrderQuery.java @@ -0,0 +1,162 @@ +package com.op.sap.domain.vo; + + +public class SapPurchaseOrderQuery { + /** + * S_EBELN 采购订单号 + * S_EBELP 行项目 + * S_MATNR 物料号 + * S_PWERK 工厂 + */ + /** + * EBELN 采购凭证号 + * EBELP 采购凭证的项目编号 + * MATNR 物料号 + * MAKTX 物料描述(短文本) + * MENGE 采购订单数量 + * MEINS 采购订单的计量单位 + * ZMENGE 交货数量 + * ZMEINS 基本计量单位 + * LIFNR 供应商帐户号 + * WERKS 工厂 + * LGORT 库存地点 + * EINDT 项目交货日期 + * ELIKZ 交货已完成标识 + * BEIZHU 注释 + */ + private String ebeln; + private String ebelp; + private String matnr; + private String pwerk; + private String maktx; + private String menge; + private String meins; + private String zmenge; + private String zmeins; + private String lifnr; + private String werks; + private String lgort; + private String eindt; + private String elikz; + private String beizhu; + + public String getMaktx() { + return maktx; + } + + public void setMaktx(String maktx) { + this.maktx = maktx; + } + + public String getMenge() { + return menge; + } + + public void setMenge(String menge) { + this.menge = menge; + } + + public String getMeins() { + return meins; + } + + public void setMeins(String meins) { + this.meins = meins; + } + + public String getZmenge() { + return zmenge; + } + + public void setZmenge(String zmenge) { + this.zmenge = zmenge; + } + + public String getZmeins() { + return zmeins; + } + + public void setZmeins(String zmeins) { + this.zmeins = zmeins; + } + + public String getLifnr() { + return lifnr; + } + + public void setLifnr(String lifnr) { + this.lifnr = lifnr; + } + + public String getWerks() { + return werks; + } + + public void setWerks(String werks) { + this.werks = werks; + } + + public String getLgort() { + return lgort; + } + + public void setLgort(String lgort) { + this.lgort = lgort; + } + + public String getEindt() { + return eindt; + } + + public void setEindt(String eindt) { + this.eindt = eindt; + } + + public String getElikz() { + return elikz; + } + + public void setElikz(String elikz) { + this.elikz = elikz; + } + + public String getBeizhu() { + return beizhu; + } + + public void setBeizhu(String beizhu) { + this.beizhu = beizhu; + } + + public String getEbeln() { + return ebeln; + } + + public void setEbeln(String ebeln) { + this.ebeln = ebeln; + } + + public String getEbelp() { + return ebelp; + } + + public void setEbelp(String ebelp) { + this.ebelp = ebelp; + } + + public String getMatnr() { + return matnr; + } + + public void setMatnr(String matnr) { + this.matnr = matnr; + } + + public String getPwerk() { + return pwerk; + } + + public void setPwerk(String pwerk) { + this.pwerk = pwerk; + } +}