From d6386619b019cce339bc07a4b439cabd31a66e2f Mon Sep 17 00:00:00 2001
From: zelian_wu <zelian.wu@xujiesoft.com>
Date: Tue, 4 Jun 2024 18:19:27 +0800
Subject: [PATCH] =?UTF-8?q?2024/06/04=20=E8=AE=A2=E5=8D=95=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/spring/common/utils/Constant.java     |  1 +
 .../production/controller/ShopOrderController.java |  5 +++++
 .../modules/production/mapper/ShopOrderMapper.java |  2 ++
 .../production/service/ShopOrderService.java       |  2 ++
 .../service/impl/ShopOrderServiceImpl.java         |  7 +++++++
 .../mapper/production/ShopOrderMapper.xml          | 14 ++++++++++++++
 6 files changed, 31 insertions(+)

diff --git a/src/main/java/com/spring/common/utils/Constant.java b/src/main/java/com/spring/common/utils/Constant.java
index b0fc821..11eea1c 100644
--- a/src/main/java/com/spring/common/utils/Constant.java
+++ b/src/main/java/com/spring/common/utils/Constant.java
@@ -47,6 +47,7 @@ public class Constant {
     public static final Integer ONE = 1;
     public static final Integer TWO = 2;
     public static final Integer TEN = 10;
+    public static final String SHOP_ORDER_STATUS_NEW = "已下达";
 
     /**
 	 * 菜单类型
diff --git a/src/main/java/com/spring/modules/production/controller/ShopOrderController.java b/src/main/java/com/spring/modules/production/controller/ShopOrderController.java
index a60b0ee..de51daa 100644
--- a/src/main/java/com/spring/modules/production/controller/ShopOrderController.java
+++ b/src/main/java/com/spring/modules/production/controller/ShopOrderController.java
@@ -24,6 +24,11 @@ public class ShopOrderController {
         List<ShopOrderVo> list = shopOrderService.queryShopOrderList(shopOrder);
         return R.ok().put("rows",list);
     }
+    @PostMapping("/ifs/list")
+    public R listByIfs(@RequestBody ShopOrderVo shopOrder){
+        List<ShopOrderVo> list = shopOrderService.queryShopOrderByIfsList(shopOrder);
+        return R.ok().put("rows",list);
+    }
     @PostMapping("/page/{no}/{size}")
     public R page(@RequestBody ShopOrderVo shopOrder, @PathVariable Integer no, @PathVariable Integer size){
         IPage<ShopOrderVo> page = shopOrderService.queryShopOrderPageList(no, size, shopOrder);
diff --git a/src/main/java/com/spring/modules/production/mapper/ShopOrderMapper.java b/src/main/java/com/spring/modules/production/mapper/ShopOrderMapper.java
index 59a0145..c161271 100644
--- a/src/main/java/com/spring/modules/production/mapper/ShopOrderMapper.java
+++ b/src/main/java/com/spring/modules/production/mapper/ShopOrderMapper.java
@@ -36,4 +36,6 @@ public interface ShopOrderMapper extends BaseMapper<ShopOrder> {
                         @Param("orderNo")String orderNo);
 
     List<PartInformationEntity> selectPartList(PartInformationEntity part);
+
+    List<ShopOrderVo> selectShopOrderByList(ShopOrderVo shopOrder);
 }
diff --git a/src/main/java/com/spring/modules/production/service/ShopOrderService.java b/src/main/java/com/spring/modules/production/service/ShopOrderService.java
index f6f56e2..2362ea7 100644
--- a/src/main/java/com/spring/modules/production/service/ShopOrderService.java
+++ b/src/main/java/com/spring/modules/production/service/ShopOrderService.java
@@ -20,4 +20,6 @@ public interface ShopOrderService extends IService <ShopOrder> {
     IPage<ShopOrderVo> queryShopOrderPageList(Integer no, Integer size, ShopOrderVo shopOrder);
 
     List<PartInformationEntity> queryPartList(PartInformationEntity part);
+
+    List<ShopOrderVo> queryShopOrderByIfsList(ShopOrderVo shopOrder);
 }
diff --git a/src/main/java/com/spring/modules/production/service/impl/ShopOrderServiceImpl.java b/src/main/java/com/spring/modules/production/service/impl/ShopOrderServiceImpl.java
index eb38a47..3e1b1b6 100644
--- a/src/main/java/com/spring/modules/production/service/impl/ShopOrderServiceImpl.java
+++ b/src/main/java/com/spring/modules/production/service/impl/ShopOrderServiceImpl.java
@@ -3,6 +3,7 @@ package com.spring.modules.production.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.spring.common.utils.Constant;
 import com.spring.modules.base.entity.PartInformationEntity;
 import com.spring.modules.base.service.PartService;
 import com.spring.modules.production.entity.ShopOrder;
@@ -34,6 +35,7 @@ public class ShopOrderServiceImpl extends ServiceImpl<ShopOrderMapper, ShopOrder
     @Transactional
     public void saveShopOrder(ShopOrder shopOrder) {
         checkShopOrderNo(shopOrder);
+        shopOrder.setStatus(Constant.SHOP_ORDER_STATUS_NEW);
         save(shopOrder);
         baseMapper.autoNewRouting(shopOrder.getSite(), shopOrder.getOrderNo(), shopOrder.getPartNo(),shopOrder.getLotSize(),shopOrder.getPlanStartDate());
     }
@@ -71,6 +73,11 @@ public class ShopOrderServiceImpl extends ServiceImpl<ShopOrderMapper, ShopOrder
         return baseMapper.selectPartList(part);
     }
 
+    @Override
+    public List<ShopOrderVo> queryShopOrderByIfsList(ShopOrderVo shopOrder) {
+        return baseMapper.selectShopOrderByList(shopOrder);
+    }
+
     private void checkShopOrderNo(ShopOrder shopOrder) {
         checkShopOrder(shopOrder);
         List<ShopOrder> list = lambdaQuery()
diff --git a/src/main/resources/mapper/production/ShopOrderMapper.xml b/src/main/resources/mapper/production/ShopOrderMapper.xml
index db7c55f..fb42518 100644
--- a/src/main/resources/mapper/production/ShopOrderMapper.xml
+++ b/src/main/resources/mapper/production/ShopOrderMapper.xml
@@ -135,4 +135,18 @@
             </if>
         </where>
     </select>
+
+    <select id="selectShopOrderByList" resultType="com.spring.modules.production.vo.ShopOrderVo">
+        select ifs.site, ifs.part_no,ifs.part_description as part_desc,ifs.order_no, ifs.lotsize as lotSize, ifs.start_date as PlanStartDate
+        from v_ifs_so ifs
+<!--                 left join part p on ifs.Site = p.site and ifs.part_no = p.part_no-->
+        <where>
+            <if test="site != null and site != ''">
+                and ifs.site = #{site}
+            </if>
+            <if test="orderNo != null and orderNo != ''">
+                and ifs.order_no like #{orderNo}
+            </if>
+        </where>
+    </select>
 </mapper>
\ No newline at end of file