diff --git a/src/main/java/com/letian/modules/product/entity/PartCheckData.java b/src/main/java/com/letian/modules/product/entity/PartCheckData.java new file mode 100644 index 0000000..5d109b4 --- /dev/null +++ b/src/main/java/com/letian/modules/product/entity/PartCheckData.java @@ -0,0 +1,112 @@ +package com.letian.modules.product.entity; + +public class PartCheckData { + private String site; + private String partNo; + private String checkFlag; + private String seqNoData; + private float itemNo; + private String componentPartNo; + private String partDesc; + private String partSpec; + private String partUm; + private float calQtyOnHand; + private float calQtyShorage; + private float qtyRequired; + + public String getSite() { + return site; + } + + public void setSite(String site) { + this.site = site; + } + + public String getPartNo() { + return partNo; + } + + public void setPartNo(String partNo) { + this.partNo = partNo; + } + + public String getCheckFlag() { + return checkFlag; + } + + public void setCheckFlag(String checkFlag) { + this.checkFlag = checkFlag; + } + + public String getSeqNoData() { + return seqNoData; + } + + public void setSeqNoData(String seqNoData) { + this.seqNoData = seqNoData; + } + + public float getItemNo() { + return itemNo; + } + + public void setItemNo(float itemNo) { + this.itemNo = itemNo; + } + + public String getComponentPartNo() { + return componentPartNo; + } + + public void setComponentPartNo(String componentPartNo) { + this.componentPartNo = componentPartNo; + } + + public String getPartDesc() { + return partDesc; + } + + public void setPartDesc(String partDesc) { + this.partDesc = partDesc; + } + + public String getPartSpec() { + return partSpec; + } + + public void setPartSpec(String partSpec) { + this.partSpec = partSpec; + } + + public String getPartUm() { + return partUm; + } + + public void setPartUm(String partUm) { + this.partUm = partUm; + } + + public float getCalQtyOnHand() { + return calQtyOnHand; + } + + public void setCalQtyOnHand(float calQtyOnHand) { + this.calQtyOnHand = calQtyOnHand; + } + + public float getCalQtyShorage() { + return calQtyShorage; + } + + public void setCalQtyShorage(float calQtyShorage) { + this.calQtyShorage = calQtyShorage; + } + + public float getQtyRequired() { + return qtyRequired; + } + + public void setQtyRequired(float qtyRequired) { + this.qtyRequired = qtyRequired; + } +} diff --git a/src/main/java/com/letian/modules/production/controller/DailyPlanController.java b/src/main/java/com/letian/modules/production/controller/DailyPlanController.java index d1216ae..7c67766 100644 --- a/src/main/java/com/letian/modules/production/controller/DailyPlanController.java +++ b/src/main/java/com/letian/modules/production/controller/DailyPlanController.java @@ -2,6 +2,7 @@ package com.letian.modules.production.controller; import com.letian.common.utils.R; import com.letian.modules.base.entity.*; +import com.letian.modules.product.entity.PartCheckData; import com.letian.modules.product.entity.PrdEntity; import com.letian.modules.production.dao.SOTaskOrderHeaderMapper; import com.letian.modules.production.dao.SoScheduledListMapper; @@ -424,4 +425,21 @@ public class DailyPlanController { .put("rows", resultList) .put("total", resultList.size()); } + + /** + * TODO 查询-待生产工单 + * @author rq + * @date 2021/10/28 16:46 + * @param inData + * @return com.gaotao.common.utils.R + **/ + @RequestMapping(value = "getPartCheckData") + public R getPartCheckData(@RequestBody PartCheckData inData){ + List resultList = dailyPlanService.getPartCheckData(inData); + return R.ok() + .put("code", 200) + .put("msg", "操作成功!") + .put("rows", resultList) + .put("total", resultList.size()); + } } diff --git a/src/main/java/com/letian/modules/production/dao/DailyPlanMapper.java b/src/main/java/com/letian/modules/production/dao/DailyPlanMapper.java index 49593a9..fede965 100644 --- a/src/main/java/com/letian/modules/production/dao/DailyPlanMapper.java +++ b/src/main/java/com/letian/modules/production/dao/DailyPlanMapper.java @@ -1,6 +1,7 @@ package com.letian.modules.production.dao; import com.letian.modules.base.entity.*; +import com.letian.modules.product.entity.PartCheckData; import com.letian.modules.production.entity.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -229,4 +230,15 @@ public interface DailyPlanMapper { * @throw */ List getSOScheduledRoutingData(ScheduleOneData inData); + + /** + * @Description 物料缺料检查 + * @Title getPartCheckData + * @param inData + * @author rq + * @date 2022/5/23 16:32 + * @return List + * @throw + */ + List getPartCheckData(PartCheckData inData); } diff --git a/src/main/java/com/letian/modules/production/service/DailyPlanService.java b/src/main/java/com/letian/modules/production/service/DailyPlanService.java index 88fe967..c3f19d0 100644 --- a/src/main/java/com/letian/modules/production/service/DailyPlanService.java +++ b/src/main/java/com/letian/modules/production/service/DailyPlanService.java @@ -1,6 +1,7 @@ package com.letian.modules.production.service; import com.letian.modules.base.entity.*; +import com.letian.modules.product.entity.PartCheckData; import com.letian.modules.production.entity.*; import org.springframework.web.bind.annotation.RequestBody; @@ -290,4 +291,14 @@ public interface DailyPlanService { * @return java.util.List **/ List getProduceScheduleData(SearchScheduleDataNew inData); + /** + * @Description 物料缺料检查 + * @Title getPartCheckData + * @param inData + * @author rq + * @date 2022/5/23 16:32 + * @return List + * @throw + */ + List getPartCheckData(PartCheckData inData); } diff --git a/src/main/java/com/letian/modules/production/service/impl/DailyPlanServiceImpl.java b/src/main/java/com/letian/modules/production/service/impl/DailyPlanServiceImpl.java index 8b58df9..6dff9e4 100644 --- a/src/main/java/com/letian/modules/production/service/impl/DailyPlanServiceImpl.java +++ b/src/main/java/com/letian/modules/production/service/impl/DailyPlanServiceImpl.java @@ -5,6 +5,7 @@ import com.letian.common.utils.DateUtil; import com.letian.common.utils.DateUtils; import com.letian.modules.base.dao.BaseMapper; import com.letian.modules.base.entity.*; +import com.letian.modules.product.entity.PartCheckData; import com.letian.modules.production.dao.DailyPlanMapper; import com.letian.modules.production.dao.ProcedureMapper; import com.letian.modules.production.dao.SOTaskOrderHeaderMapper; @@ -544,4 +545,9 @@ public class DailyPlanServiceImpl implements DailyPlanService { public List getProduceScheduleData(SearchScheduleDataNew inData) { return dailyPlanMapper.getProduceScheduleData(inData); } + + @Override + public List getPartCheckData(PartCheckData inData){ + return dailyPlanMapper.getPartCheckData(inData); + } } diff --git a/src/main/resources/mapper/production/DailyPlanMapper.xml b/src/main/resources/mapper/production/DailyPlanMapper.xml index 8e39f18..61e841e 100644 --- a/src/main/resources/mapper/production/DailyPlanMapper.xml +++ b/src/main/resources/mapper/production/DailyPlanMapper.xml @@ -202,7 +202,7 @@ @@ -328,4 +329,26 @@ + + \ No newline at end of file