diff --git a/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java b/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java index 2af5013..bb667bd 100644 --- a/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java +++ b/src/main/java/com/gaotao/modules/schedule/controller/ScheduleController.java @@ -4,7 +4,7 @@ import com.gaotao.common.utils.R; import com.gaotao.modules.schedule.data.ScheduleData; import com.gaotao.modules.schedule.data.SearchData; import com.gaotao.modules.schedule.data.ShiftInfoData; -import com.gaotao.modules.schedule.data.ShopOrderData; +import com.gaotao.modules.schedule.data.ShopOrderOutData; import com.gaotao.modules.schedule.service.ScheduleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; @@ -46,7 +46,7 @@ public class ScheduleController { * @return com.gaotao.common.utils.R **/ public R getShopOrderList(@RequestBody SearchData inData){ - List resultList = scheduleService.getShopOrderList(inData); + List resultList = scheduleService.getShopOrderList(inData); return R.ok().put("msg", "操作成功!") .put("rows", resultList) .put("total", resultList.size()); diff --git a/src/main/java/com/gaotao/modules/schedule/dao/ScheduleMapper.java b/src/main/java/com/gaotao/modules/schedule/dao/ScheduleMapper.java index 1b7cfe0..78e3c57 100644 --- a/src/main/java/com/gaotao/modules/schedule/dao/ScheduleMapper.java +++ b/src/main/java/com/gaotao/modules/schedule/dao/ScheduleMapper.java @@ -3,7 +3,7 @@ package com.gaotao.modules.schedule.dao; import com.gaotao.modules.schedule.data.ScheduleData; import com.gaotao.modules.schedule.data.SearchData; import com.gaotao.modules.schedule.data.ShiftInfoData; -import com.gaotao.modules.schedule.data.ShopOrderData; +import com.gaotao.modules.schedule.data.ShopOrderOutData; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -33,7 +33,7 @@ public interface ScheduleMapper { * @param inData * @return java.util.List **/ - List getShopOrderList(SearchData inData); + List getShopOrderList(SearchData inData); /** * TODO 查询派工单的数据 diff --git a/src/main/java/com/gaotao/modules/schedule/data/ShopOrderData.java b/src/main/java/com/gaotao/modules/schedule/data/ShopOrderOutData.java similarity index 98% rename from src/main/java/com/gaotao/modules/schedule/data/ShopOrderData.java rename to src/main/java/com/gaotao/modules/schedule/data/ShopOrderOutData.java index a4722da..0b8de1b 100644 --- a/src/main/java/com/gaotao/modules/schedule/data/ShopOrderData.java +++ b/src/main/java/com/gaotao/modules/schedule/data/ShopOrderOutData.java @@ -12,8 +12,8 @@ import java.util.Date; * 生产订单数据 * @Date 2021/10/25 14:07 */ -@Alias("ShopOrderData") -public class ShopOrderData extends BaseData { +@Alias("ShopOrderOutData") +public class ShopOrderOutData extends BaseData { private String orderNo;// private Integer itemNo; private String itemDesc;// @@ -54,7 +54,7 @@ public class ShopOrderData extends BaseData { private String manualFlag; private String repairSOFlag;// - public ShopOrderData() { + public ShopOrderOutData() { } public String getOrderNo() { diff --git a/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java b/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java index b9f7175..c882045 100644 --- a/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java +++ b/src/main/java/com/gaotao/modules/schedule/service/ScheduleService.java @@ -3,7 +3,7 @@ package com.gaotao.modules.schedule.service; import com.gaotao.modules.schedule.data.ScheduleData; import com.gaotao.modules.schedule.data.SearchData; import com.gaotao.modules.schedule.data.ShiftInfoData; -import com.gaotao.modules.schedule.data.ShopOrderData; +import com.gaotao.modules.schedule.data.ShopOrderOutData; import java.util.List; @@ -31,7 +31,7 @@ public interface ScheduleService { * @param inData * @return java.util.List **/ - List getShopOrderList(SearchData inData); + List getShopOrderList(SearchData inData); /** * TODO 查询派工单的数据 diff --git a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java index 6b1185b..1dff5cc 100644 --- a/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java +++ b/src/main/java/com/gaotao/modules/schedule/service/impl/ScheduleServiceImpl.java @@ -4,7 +4,7 @@ import com.gaotao.modules.schedule.dao.ScheduleMapper; import com.gaotao.modules.schedule.data.ScheduleData; import com.gaotao.modules.schedule.data.SearchData; import com.gaotao.modules.schedule.data.ShiftInfoData; -import com.gaotao.modules.schedule.data.ShopOrderData; +import com.gaotao.modules.schedule.data.ShopOrderOutData; import com.gaotao.modules.schedule.service.ScheduleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -28,7 +28,7 @@ public class ScheduleServiceImpl implements ScheduleService { } @Override - public List getShopOrderList(SearchData inData) { + public List getShopOrderList(SearchData inData) { return scheduleMapper.getShopOrderList(inData); } diff --git a/src/main/resources/mapper/schedule/ScheduleMapper.xml b/src/main/resources/mapper/schedule/ScheduleMapper.xml index 7d5cab2..44187db 100644 --- a/src/main/resources/mapper/schedule/ScheduleMapper.xml +++ b/src/main/resources/mapper/schedule/ScheduleMapper.xml @@ -30,7 +30,7 @@ - Select T.Site site, T.OrderNo orderNo, T.ItemNo itemNo, T.OperationDesc itemDesc, T.PartNo partNo, P.PartDescription partDesc, P.Spec spec, D.LotSize lotSize, T.QtyReported qtyReported, D.NeedDate needDate, T.PreItemNo PreItemNo, S1.OperationDesc PreItemDesc, S1.ScheduledFlag preScheduledFlag, T.NextItemNo nextItemNo, S2.OperationDesc nextItemDesc, S2.ScheduledFlag nextScheduledFlag, D.CustomerID customerId, P.ConfigurationTemplateID customerName,