获取和更新客户订单加所属工厂条件

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/dao/ApsProductDetailDao.java

@@ -12,28 +12,28 @@ public interface ApsProductDetailDao extends BaseMapper<ApsProductDetailDo> {
 
 
     @Select({" <script>",
-            "select * from aps_production_order where DELETED='0' and CUSTOMORDERNO in",
+            "select * from aps_production_order where DELETED='0' and TENANTID=#{curtenantid} and CUSTOMORDERNO in",
             " <foreach collection=\"orderNos\" item=\"orderno\" index=\"index\" open=\"(\" close=\")\" separator=\",\"> ",
             "  #{orderno}",
             "</foreach>",
             "</script>"})
-    List<ApsProductionOrderDo> getProductionOrders(@Param("orderNos") List<String> orderNos);
+    List<ApsProductionOrderDo> getProductionOrders(@Param("curtenantid") String curtenantid, @Param("orderNos") List<String> orderNos);
 
     @Select({" <script>",
-            "select * from aps_production_merge_order where DELETED='0' and CUSTOMORDERNO in",
+            "select * from aps_production_merge_order where DELETED='0' and TENANTID=#{curtenantid} and CUSTOMORDERNO in",
             " <foreach collection=\"orderNos\" item=\"orderno\" index=\"index\" open=\"(\" close=\")\" separator=\",\"> ",
             "  #{orderno}",
             "</foreach>",
             "</script>"})
-    List<ApsProductionMergeOrderDo> getProductionMergeOrders(@Param("orderNos") List<String> orderNos);
+    List<ApsProductionMergeOrderDo> getProductionMergeOrders(@Param("curtenantid") String curtenantid, @Param("orderNos") List<String> orderNos);
 
     @Select({" <script>",
-            "select * from aps_product_detail where DELETED='0' and CUSTOMORDERNO in\n" +
-            " <foreach collection=\"orderNos\" item=\"orderno\" index=\"index\" open=\"(\" close=\")\" separator=\",\"> ",
+            "select * from aps_product_detail where DELETED='0' and TENANTID=#{curtenantid} and CUSTOMORDERNO in\n" +
+                    " <foreach collection=\"orderNos\" item=\"orderno\" index=\"index\" open=\"(\" close=\")\" separator=\",\"> ",
             "  #{orderno}",
             "</foreach>",
             "</script>"})
-    List<ApsProductDetailDo> getProductDetails(@Param("orderNos") List<String> orderNos);
+    List<ApsProductDetailDo> getProductDetails(@Param("curtenantid") String curtenantid, @Param("orderNos") List<String> orderNos);
 
     @Select("select ID,CUSTOMERNAME,DELIVERYTIME from aps_customer_management where DELETED='0'")
     List<ApsCustomerManagementDo> getCustomerData();
@@ -42,8 +42,9 @@ public interface ApsProductDetailDao extends BaseMapper<ApsProductDetailDo> {
 
     void updateProductstatus(@Param("productionOrderIds") List<String> productionOrderIds);
 
-    void updateProductStatusByBlankId(@Param("blankIds")List<String>blankIds,
+    void updateProductStatusByBlankId(@Param("blankIds") List<String> blankIds,
                                       @Param("productStatus") String productStatus);
+
     @Select("select ID,MATERIALCODE,MATERIALNAME,MATERIALUNIT from aps_material where DELETED='0'")
     List<ApsProcessMaterialDo> getMaterialData();
 

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/ApsProductDetailService.java

@@ -2,11 +2,9 @@ package com.rongwei.bscommon.sys.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.rongwei.bsentity.domain.ApsProductDetailDo;
-import com.rongwei.bsentity.domain.ApsProductionOrderDo;
-import com.rongwei.bsentity.domain.VNcOrderVo;
 import com.rongwei.rwcommon.base.R;
+import org.springframework.web.bind.annotation.RequestBody;
 
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -21,7 +19,7 @@ public interface ApsProductDetailService extends IService<ApsProductDetailDo> {
 
     R getCustomOrderData(Map<String, Object> params);
 
-    R updateCustomOrder(List<String> orderNos);
+    R updateCustomOrder(Map<String, Object> params);
 
-    R updateMergeCustomOrder(List<String> orderNos);
+    R updateMergeCustomOrder(@RequestBody Map<String, Object> params);
 }

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProductDetailServiceImpl.java

@@ -13,6 +13,7 @@ import com.rongwei.rwcommon.utils.SecurityUtil;
 import com.rongwei.rwcommon.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -109,9 +110,11 @@ public class ApsProductDetailServiceImpl extends ServiceImpl<ApsProductDetailDao
     更新客户订单
      */
     @Override
-    public R updateCustomOrder(List<String> orderNos) {
+    public R updateCustomOrder(Map<String, Object> params) {
         StringBuffer noOrderNos = new StringBuffer();//不存在客户订单系统里的客户订单号
         List<String> hasOrderNos = new ArrayList<>();//存在客户订单系统里的客户订单号
+        String curtenantid = params.get("CURTENANTID").toString();
+        List<String> orderNos = (List<String>) params.get("ORDERNOS");
 
         //客户订单系统的数据
         List<VNcOrderVo> vNcOrderVoList = slaveSourceService.getVNcOrderVo(orderNos);
@@ -129,8 +132,8 @@ public class ApsProductDetailServiceImpl extends ServiceImpl<ApsProductDetailDao
         List<ApsProductDetailDo> apsProductDetailDoList = new ArrayList<>();
         List<String> delProductDetailIdList = new ArrayList<>();
         if (hasOrderNos.size() > 0) {
-            List<ApsProductionOrderDo> apsProductionOrderDos = apsProductDetailDao.getProductionOrders(hasOrderNos);
-            List<ApsProductDetailDo> apsProductDetailDos = apsProductDetailDao.getProductDetails(hasOrderNos);
+            List<ApsProductionOrderDo> apsProductionOrderDos = apsProductDetailDao.getProductionOrders(curtenantid, hasOrderNos);
+            List<ApsProductDetailDo> apsProductDetailDos = apsProductDetailDao.getProductDetails(curtenantid, hasOrderNos);
 //        List<ApsCustomerManagementDo> customDatas = apsProductDetailDao.getCustomerData();
             //明细 物料、合金、合金状态转换
             List<ApsProcessMaterialDo> materialDos = apsProductDetailDao.getMaterialData();
@@ -278,9 +281,11 @@ public class ApsProductDetailServiceImpl extends ServiceImpl<ApsProductDetailDao
     更新合并客户订单
      */
     @Override
-    public R updateMergeCustomOrder(List<String> orderNos) {
+    public R updateMergeCustomOrder(@RequestBody Map<String, Object> params) {
         StringBuffer noOrderNos = new StringBuffer();//不存在客户订单系统里的客户订单号
         List<String> hasOrderNos = new ArrayList<>();//存在客户订单系统里的客户订单号
+        String curtenantid = params.get("CURTENANTID").toString();
+        List<String> orderNos = (List<String>) params.get("ORDERNOS");
 
         //客户订单系统的数据
         List<VNcOrderVo> vNcOrderVoList = slaveSourceService.getVNcOrderVo(orderNos);
@@ -294,8 +299,8 @@ public class ApsProductDetailServiceImpl extends ServiceImpl<ApsProductDetailDao
         }
 
         //本系统的订单信息
-        List<ApsProductionMergeOrderDo> apsProductionMergeOrderDos = apsProductDetailDao.getProductionMergeOrders(hasOrderNos);
-        List<ApsProductDetailDo> apsProductDetailDos = apsProductDetailDao.getProductDetails(hasOrderNos);
+        List<ApsProductionMergeOrderDo> apsProductionMergeOrderDos = apsProductDetailDao.getProductionMergeOrders(curtenantid, hasOrderNos);
+        List<ApsProductDetailDo> apsProductDetailDos = apsProductDetailDao.getProductDetails(curtenantid, hasOrderNos);
         List<ApsProductionMergeOrderDo> apsProductionMergeOrderDoList = new ArrayList<>();
         List<ApsProductDetailDo> apsProductDetailDoList = new ArrayList<>();
         List<String> delProductDetailIdList = new ArrayList<>();

cx-aps/cx-aps-server/src/main/java/com/rongwei/bsserver/controller/ApsProductDetailController.java

@@ -10,7 +10,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -46,10 +45,10 @@ public class ApsProductDetailController {
     更新客户订单
      */
     @PostMapping("/updateCustomOrder")
-    public R updateCustomOrder(@RequestBody List<String> orderNos){
+    public R updateCustomOrder(@RequestBody Map<String, Object> params) {
         try {
-            log.info("更新客户订单;参数为：{}", orderNos);
-            return apsProductDetailService.updateCustomOrder(orderNos);
+            log.info("更新客户订单;参数为：{}", params);
+            return apsProductDetailService.updateCustomOrder(params);
         } catch (Exception e) {
             e.printStackTrace();
             return R.error("获取客户订单系统订单失败，请联系管理员");
@@ -60,10 +59,10 @@ public class ApsProductDetailController {
     更新合并客户订单
      */
     @PostMapping("/updateMergeCustomOrder")
-    public R updateMergeCustomOrder(@RequestBody List<String> orderNos){
+    public R updateMergeCustomOrder(@RequestBody Map<String, Object> params) {
         try {
-            log.info("更新客户订单;参数为：{}", orderNos);
-            return apsProductDetailService.updateMergeCustomOrder(orderNos);
+            log.info("更新客户订单;参数为：{}", params);
+            return apsProductDetailService.updateMergeCustomOrder(params);
         } catch (Exception e) {
             e.printStackTrace();
             return R.error("获取客户订单系统订单失败，请联系管理员");