diff --git a/src/main/java/com/spring/modules/material/controller/PoReceiveController.java b/src/main/java/com/spring/modules/material/controller/PoReceiveController.java new file mode 100644 index 0000000..4cab572 --- /dev/null +++ b/src/main/java/com/spring/modules/material/controller/PoReceiveController.java @@ -0,0 +1,27 @@ +package com.spring.modules.material.controller; + +import com.spring.common.utils.PageUtils; +import com.spring.common.utils.R; +import com.spring.modules.base.data.PartInformationVo; +import com.spring.modules.material.data.TransHeaderData; +import com.spring.modules.material.service.PoReceiveService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping(value = "/poReceive") +public class PoReceiveController { + + @Autowired + private PoReceiveService poReceiveService; + + @PostMapping(value="/searchTransHeader") + public R searchTransHeader(@RequestBody TransHeaderData data) { + PageUtils page = poReceiveService.searchTransHeader(data); + return R.ok().put("page", page); + } + +} diff --git a/src/main/java/com/spring/modules/material/dao/PoReceiveMapper.java b/src/main/java/com/spring/modules/material/dao/PoReceiveMapper.java new file mode 100644 index 0000000..503633d --- /dev/null +++ b/src/main/java/com/spring/modules/material/dao/PoReceiveMapper.java @@ -0,0 +1,17 @@ +package com.spring.modules.material.dao; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.spring.common.utils.PageUtils; +import com.spring.modules.base.data.PartInformationVo; +import com.spring.modules.material.data.TransHeaderData; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +@Mapper +@Repository +public interface PoReceiveMapper { + + IPage searchTransHeader(Page page, @Param("query") TransHeaderData data); +} diff --git a/src/main/java/com/spring/modules/material/data/TransHeaderData.java b/src/main/java/com/spring/modules/material/data/TransHeaderData.java new file mode 100644 index 0000000..1c82430 --- /dev/null +++ b/src/main/java/com/spring/modules/material/data/TransHeaderData.java @@ -0,0 +1,15 @@ +package com.spring.modules.material.data; + +import com.spring.modules.material.entity.TransHeader; +import lombok.Data; +import org.apache.ibatis.type.Alias; + +import java.util.Date; +@Data +@Alias("TransHeaderData") +public class TransHeaderData extends TransHeader { + + private Date startDate; + private Date endDate; +} + diff --git a/src/main/java/com/spring/modules/material/entity/TransDetail.java b/src/main/java/com/spring/modules/material/entity/TransDetail.java new file mode 100644 index 0000000..884208e --- /dev/null +++ b/src/main/java/com/spring/modules/material/entity/TransDetail.java @@ -0,0 +1,357 @@ +package com.spring.modules.material.entity; + +import java.util.Date; + +public class TransDetail { + /** + * + */ + private String transNo; + + /** + * + */ + private String site; + + /** + * + */ + private Double itemNo; + + /** + * + */ + private String partNo; + + /** + * + */ + private String locationID; + + /** + * + */ + private Double transQty; + + /** + * + */ + private String direction; + + /** + * + */ + private String batchNo; + + /** + * + */ + private Double standCost; + + /** + * + */ + private Double actualCost; + + /** + * + */ + private Double price; + + /** + * + */ + private Double freight; + + /** + * + */ + private Double duty; + + /** + * + */ + private String orderRef1; + + /** + * + */ + private String orderRef2; + + /** + * + */ + private String orderRef3; + + /** + * + */ + private String orderRef4; + + /** + * + */ + private String orderRef5; + + /** + * + */ + private String remark; + + /** + * + */ + private String vitualPartFlag; + + /** + * + */ + private Date manufactureDate; + + /** + * + */ + private Date expiredDate; + + /** + * + */ + private Double transQty2; + + /** + * + */ + private String costGroupID; + + /** + * + */ + private String orderRefTypeDb; + + /** + * + */ + private String orderRefType; + + /** + * + */ + private String wdrNo; + + public String getTransNo() { + return transNo; + } + + public void setTransNo(String transNo) { + this.transNo = transNo; + } + + public String getSite() { + return site; + } + + public void setSite(String site) { + this.site = site; + } + + public Double getItemNo() { + return itemNo; + } + + public void setItemNo(Double itemNo) { + this.itemNo = itemNo; + } + + public String getPartNo() { + return partNo; + } + + public void setPartNo(String partNo) { + this.partNo = partNo; + } + + public String getLocationID() { + return locationID; + } + + public void setLocationID(String locationID) { + this.locationID = locationID; + } + + public Double getTransQty() { + return transQty; + } + + public void setTransQty(Double transQty) { + this.transQty = transQty; + } + + public String getDirection() { + return direction; + } + + public void setDirection(String direction) { + this.direction = direction; + } + + public String getBatchNo() { + return batchNo; + } + + public void setBatchNo(String batchNo) { + this.batchNo = batchNo; + } + + public Double getStandCost() { + return standCost; + } + + public void setStandCost(Double standCost) { + this.standCost = standCost; + } + + public Double getActualCost() { + return actualCost; + } + + public void setActualCost(Double actualCost) { + this.actualCost = actualCost; + } + + public Double getPrice() { + return price; + } + + public void setPrice(Double price) { + this.price = price; + } + + public Double getFreight() { + return freight; + } + + public void setFreight(Double freight) { + this.freight = freight; + } + + public Double getDuty() { + return duty; + } + + public void setDuty(Double duty) { + this.duty = duty; + } + + public String getOrderRef1() { + return orderRef1; + } + + public void setOrderRef1(String orderRef1) { + this.orderRef1 = orderRef1; + } + + public String getOrderRef2() { + return orderRef2; + } + + public void setOrderRef2(String orderRef2) { + this.orderRef2 = orderRef2; + } + + public String getOrderRef3() { + return orderRef3; + } + + public void setOrderRef3(String orderRef3) { + this.orderRef3 = orderRef3; + } + + public String getOrderRef4() { + return orderRef4; + } + + public void setOrderRef4(String orderRef4) { + this.orderRef4 = orderRef4; + } + + public String getOrderRef5() { + return orderRef5; + } + + public void setOrderRef5(String orderRef5) { + this.orderRef5 = orderRef5; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getVitualPartFlag() { + return vitualPartFlag; + } + + public void setVitualPartFlag(String vitualPartFlag) { + this.vitualPartFlag = vitualPartFlag; + } + + public Date getManufactureDate() { + return manufactureDate; + } + + public void setManufactureDate(Date manufactureDate) { + this.manufactureDate = manufactureDate; + } + + public Date getExpiredDate() { + return expiredDate; + } + + public void setExpiredDate(Date expiredDate) { + this.expiredDate = expiredDate; + } + + public Double getTransQty2() { + return transQty2; + } + + public void setTransQty2(Double transQty2) { + this.transQty2 = transQty2; + } + + public String getCostGroupID() { + return costGroupID; + } + + public void setCostGroupID(String costGroupID) { + this.costGroupID = costGroupID; + } + + public String getOrderRefTypeDb() { + return orderRefTypeDb; + } + + public void setOrderRefTypeDb(String orderRefTypeDb) { + this.orderRefTypeDb = orderRefTypeDb; + } + + public String getOrderRefType() { + return orderRefType; + } + + public void setOrderRefType(String orderRefType) { + this.orderRefType = orderRefType; + } + + public String getWdrNo() { + return wdrNo; + } + + public void setWdrNo(String wdrNo) { + this.wdrNo = wdrNo; + } +} + diff --git a/src/main/java/com/spring/modules/material/entity/TransDetailsub.java b/src/main/java/com/spring/modules/material/entity/TransDetailsub.java new file mode 100644 index 0000000..c5affc8 --- /dev/null +++ b/src/main/java/com/spring/modules/material/entity/TransDetailsub.java @@ -0,0 +1,214 @@ +package com.spring.modules.material.entity; + +import java.math.BigDecimal; + +public class TransDetailsub { + /** + * + */ + private String transNo; + + /** + * + */ + private String site; + + /** + * + */ + private Float seqNo; + + /** + * + */ + private Float itemNo; + + /** + * + */ + private String locationID; + + /** + * + */ + private String batchNo; + + /** + * + */ + private String boxNo; + + /** + * + */ + private String rollNo; + + /** + * + */ + private BigDecimal rollQty; + + /** + * + */ + private String orderRef1; + + /** + * + */ + private String orderRef2; + + /** + * + */ + private String orderRef3; + + /** + * + */ + private String orderRef4; + + /** + * + */ + private String orderRef5; + + /** + * + */ + private String remark; + + /** + * + */ + private Integer id; + + public String getTransNo() { + return transNo; + } + + public void setTransNo(String transNo) { + this.transNo = transNo; + } + + public String getSite() { + return site; + } + + public void setSite(String site) { + this.site = site; + } + + public Float getSeqNo() { + return seqNo; + } + + public void setSeqNo(Float seqNo) { + this.seqNo = seqNo; + } + + public Float getItemNo() { + return itemNo; + } + + public void setItemNo(Float itemNo) { + this.itemNo = itemNo; + } + + public String getLocationID() { + return locationID; + } + + public void setLocationID(String locationID) { + this.locationID = locationID; + } + + public String getBatchNo() { + return batchNo; + } + + public void setBatchNo(String batchNo) { + this.batchNo = batchNo; + } + + public String getBoxNo() { + return boxNo; + } + + public void setBoxNo(String boxNo) { + this.boxNo = boxNo; + } + + public String getRollNo() { + return rollNo; + } + + public void setRollNo(String rollNo) { + this.rollNo = rollNo; + } + + public BigDecimal getRollQty() { + return rollQty; + } + + public void setRollQty(BigDecimal rollQty) { + this.rollQty = rollQty; + } + + public String getOrderRef1() { + return orderRef1; + } + + public void setOrderRef1(String orderRef1) { + this.orderRef1 = orderRef1; + } + + public String getOrderRef2() { + return orderRef2; + } + + public void setOrderRef2(String orderRef2) { + this.orderRef2 = orderRef2; + } + + public String getOrderRef3() { + return orderRef3; + } + + public void setOrderRef3(String orderRef3) { + this.orderRef3 = orderRef3; + } + + public String getOrderRef4() { + return orderRef4; + } + + public void setOrderRef4(String orderRef4) { + this.orderRef4 = orderRef4; + } + + public String getOrderRef5() { + return orderRef5; + } + + public void setOrderRef5(String orderRef5) { + this.orderRef5 = orderRef5; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } +} + diff --git a/src/main/java/com/spring/modules/material/entity/TransHeader.java b/src/main/java/com/spring/modules/material/entity/TransHeader.java new file mode 100644 index 0000000..0fbb0d1 --- /dev/null +++ b/src/main/java/com/spring/modules/material/entity/TransHeader.java @@ -0,0 +1,399 @@ +package com.spring.modules.material.entity; + +import cn.hutool.core.util.PageUtil; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.spring.common.utils.PageUtils; +import com.spring.common.utils.QueryPage; +import org.apache.ibatis.type.Alias; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +@Alias("TransHeader") +public class TransHeader extends QueryPage { + /** + * + */ + private String transNo; + + /** + * + */ + private String site; + + /** + * + */ + private String warehouseID; + + /** + * + */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date transDate; + + /** + * + */ + private String transTypeDb; + + /** + * + */ + private String transType; + + /** + * + */ + private String userName; + + /** + * + */ + private String receiver; + + /** + * + */ + private Double transYear; + + /** + * + */ + private Double transMonth; + + /** + * + */ + private String partnerID; + + /** + * + */ + private String partnerName; + + /** + * + */ + private String partnerType; + + /** + * + */ + private String authorizeFlag; + + /** + * + */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date authorizeDate; + + /** + * + */ + private String authorizor; + + /** + * + */ + private String transferFlag; + + /** + * + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date transferDate; + + /** + * + */ + private String transferGuys; + + /** + * + */ + private Date voucherDate; + + /** + * + */ + private String projectID; + + /** + * + */ + private String projectName; + + /** + * + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date enterDate; + + /** + * + */ + private String remark; + + /** + * + */ + private String useLocation; + + /** + * + */ + private String orderRef1; + + /** + * + */ + private String linkOrderFlag; + + /** + * + */ + private String delAddID; + + /** + * + */ + private String status; + + public String getTransNo() { + return transNo; + } + + public void setTransNo(String transNo) { + this.transNo = transNo; + } + + public String getSite() { + return site; + } + + public void setSite(String site) { + this.site = site; + } + + public String getWarehouseID() { + return warehouseID; + } + + public void setWarehouseID(String warehouseID) { + this.warehouseID = warehouseID; + } + + public Date getTransDate() { + return transDate; + } + + public void setTransDate(Date transDate) { + this.transDate = transDate; + } + + public String getTransTypeDb() { + return transTypeDb; + } + + public void setTransTypeDb(String transTypeDb) { + this.transTypeDb = transTypeDb; + } + + public String getTransType() { + return transType; + } + + public void setTransType(String transType) { + this.transType = transType; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getReceiver() { + return receiver; + } + + public void setReceiver(String receiver) { + this.receiver = receiver; + } + + public Double getTransYear() { + return transYear; + } + + public void setTransYear(Double transYear) { + this.transYear = transYear; + } + + public Double getTransMonth() { + return transMonth; + } + + public void setTransMonth(Double transMonth) { + this.transMonth = transMonth; + } + + public String getPartnerID() { + return partnerID; + } + + public void setPartnerID(String partnerID) { + this.partnerID = partnerID; + } + + public String getPartnerName() { + return partnerName; + } + + public void setPartnerName(String partnerName) { + this.partnerName = partnerName; + } + + public String getPartnerType() { + return partnerType; + } + + public void setPartnerType(String partnerType) { + this.partnerType = partnerType; + } + + public String getAuthorizeFlag() { + return authorizeFlag; + } + + public void setAuthorizeFlag(String authorizeFlag) { + this.authorizeFlag = authorizeFlag; + } + + public Date getAuthorizeDate() { + return authorizeDate; + } + + public void setAuthorizeDate(Date authorizeDate) { + this.authorizeDate = authorizeDate; + } + + public String getAuthorizor() { + return authorizor; + } + + public void setAuthorizor(String authorizor) { + this.authorizor = authorizor; + } + + public String getTransferFlag() { + return transferFlag; + } + + public void setTransferFlag(String transferFlag) { + this.transferFlag = transferFlag; + } + + public Date getTransferDate() { + return transferDate; + } + + public void setTransferDate(Date transferDate) { + this.transferDate = transferDate; + } + + public String getTransferGuys() { + return transferGuys; + } + + public void setTransferGuys(String transferGuys) { + this.transferGuys = transferGuys; + } + + public Date getVoucherDate() { + return voucherDate; + } + + public void setVoucherDate(Date voucherDate) { + this.voucherDate = voucherDate; + } + + public String getProjectID() { + return projectID; + } + + public void setProjectID(String projectID) { + this.projectID = projectID; + } + + public String getProjectName() { + return projectName; + } + + public void setProjectName(String projectName) { + this.projectName = projectName; + } + + public Date getEnterDate() { + return enterDate; + } + + public void setEnterDate(Date enterDate) { + this.enterDate = enterDate; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getUseLocation() { + return useLocation; + } + + public void setUseLocation(String useLocation) { + this.useLocation = useLocation; + } + + public String getOrderRef1() { + return orderRef1; + } + + public void setOrderRef1(String orderRef1) { + this.orderRef1 = orderRef1; + } + + public String getLinkOrderFlag() { + return linkOrderFlag; + } + + public void setLinkOrderFlag(String linkOrderFlag) { + this.linkOrderFlag = linkOrderFlag; + } + + public String getDelAddID() { + return delAddID; + } + + public void setDelAddID(String delAddID) { + this.delAddID = delAddID; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } +} + diff --git a/src/main/java/com/spring/modules/material/service/Impl/PoReceiveServiceImpl.java b/src/main/java/com/spring/modules/material/service/Impl/PoReceiveServiceImpl.java new file mode 100644 index 0000000..0acf258 --- /dev/null +++ b/src/main/java/com/spring/modules/material/service/Impl/PoReceiveServiceImpl.java @@ -0,0 +1,24 @@ +package com.spring.modules.material.service.Impl; + + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.spring.common.utils.PageUtils; +import com.spring.modules.base.data.PartInformationVo; +import com.spring.modules.material.dao.PoReceiveMapper; +import com.spring.modules.material.data.TransHeaderData; +import com.spring.modules.material.service.PoReceiveService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class PoReceiveServiceImpl implements PoReceiveService { + @Autowired + private PoReceiveMapper poReceiveMapper; + + @Override + public PageUtils searchTransHeader(TransHeaderData data) { + IPage resultList = this.poReceiveMapper.searchTransHeader(new Page(data.getPage(), data.getLimit()), data); + return new PageUtils(resultList); + } +} diff --git a/src/main/java/com/spring/modules/material/service/PoReceiveService.java b/src/main/java/com/spring/modules/material/service/PoReceiveService.java new file mode 100644 index 0000000..e8dcf0e --- /dev/null +++ b/src/main/java/com/spring/modules/material/service/PoReceiveService.java @@ -0,0 +1,9 @@ +package com.spring.modules.material.service; + +import com.spring.common.utils.PageUtils; +import com.spring.modules.base.data.PartInformationVo; +import com.spring.modules.material.data.TransHeaderData; + +public interface PoReceiveService { + PageUtils searchTransHeader(TransHeaderData data); +} diff --git a/src/main/resources/mapper/material/PoReceiveMapper.xml b/src/main/resources/mapper/material/PoReceiveMapper.xml new file mode 100644 index 0000000..a733b37 --- /dev/null +++ b/src/main/resources/mapper/material/PoReceiveMapper.xml @@ -0,0 +1,22 @@ + + + + + \ No newline at end of file