生产订单排产 ShopOrderData--》ShopOrderOutData

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<ShopOrderData> resultList = scheduleService.getShopOrderList(inData);
+        List<ShopOrderOutData> resultList = scheduleService.getShopOrderList(inData);
         return R.ok().put("msg", "操作成功!")
                 .put("rows", resultList)
                 .put("total", resultList.size());

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<com.gaotao.modules.schedule.data.ShopOrderData>
      **/
-    List<ShopOrderData> getShopOrderList(SearchData inData);
+    List<ShopOrderOutData> getShopOrderList(SearchData inData);
 
     /**
      * TODO 查询派工单的数据

src/main/java/com/gaotao/modules/schedule/data/ShopOrderData.java → 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() {

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<com.gaotao.modules.schedule.data.ShopOrderData>
      **/
-    List<ShopOrderData> getShopOrderList(SearchData inData);
+    List<ShopOrderOutData> getShopOrderList(SearchData inData);
 
     /**
      * TODO 查询派工单的数据

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<ShopOrderData> getShopOrderList(SearchData inData) {
+    public List<ShopOrderOutData> getShopOrderList(SearchData inData) {
         return scheduleMapper.getShopOrderList(inData);
     }
 

src/main/resources/mapper/schedule/ScheduleMapper.xml

@@ -30,7 +30,7 @@
     </select>
 
     <!--按照条件查询工单的数据-->
-    <select id="getShopOrderList" parameterType="SearchData" resultType="ShopOrderData">
+    <select id="getShopOrderList" parameterType="SearchData" resultType="ShopOrderOutData">
         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,