产能控制 和 供应商下拉框接口

jeecg-boot-module-system/src/main/java/org/jeecg/modules/capacity/controller/SyCapacityControlController.java

@@ -65,11 +65,11 @@ public class SyCapacityControlController extends JeecgController<SyCapacityContr
 	//@AutoLog(value = "产能控制-分页列表查询")
 	@ApiOperation(value="产能控制-分页列表查询", notes="产能控制-分页列表查询")
 	@GetMapping(value = "/list")
-	public Result<List<SyCapacityControl>> queryPageList(String supplier,
+	public Result<List<SyCapacityControl>> queryPageList(String supplier,String cvenCodeType,String supplierState,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		List<SyCapacityControl> pageList = syCapacityControlService.query(supplier,pageNo,pageSize);
+		List<SyCapacityControl> pageList = syCapacityControlService.query(supplier,cvenCodeType,supplierState,pageNo,pageSize);
 		return Result.OK(pageList);
 	}
 	

jeecg-boot-module-system/src/main/java/org/jeecg/modules/capacity/entity/SyCapacityControl.java

@@ -43,6 +43,10 @@ public class SyCapacityControl implements Serializable {
 	@Excel(name = "供应商编码", width = 15)
     @ApiModelProperty(value = "供应商编码")
     private java.lang.String supplierCode;
+    /**供应商编码*/
+    @Excel(name = "供应商分类", width = 15)
+    @ApiModelProperty(value = "供应商分类")
+    private java.lang.String cvenCodeType;
 	/**产能额度（月）*/
 	@Excel(name = "产能额度（月）", width = 15)
     @ApiModelProperty(value = "产能额度（月）")

jeecg-boot-module-system/src/main/java/org/jeecg/modules/capacity/mapper/SyCapacityControlMapper.java

@@ -16,6 +16,7 @@ public interface SyCapacityControlMapper extends BaseMapper<SyCapacityControl> {
     @Override
     int insert(@Param("entity") SyCapacityControl entity);
 
-    List<SyCapacityControl> query(@Param("supplier")String supplier,@Param("pageIndex")Integer pageIndex,
+    List<SyCapacityControl> query(@Param("supplier")String supplier,@Param("cvenCodeType")String cvenCodeType,
+                                  @Param("state")String state,@Param("pageIndex")Integer pageIndex,
                                   @Param("pageSize")Integer pageSize);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/capacity/mapper/xml/SyCapacityControlMapper.xml

@@ -3,18 +3,24 @@
 <mapper namespace="org.jeecg.modules.capacity.mapper.SyCapacityControlMapper">
 
     <insert id="insert" parameterType="org.jeecg.modules.capacity.entity.SyCapacityControl">
-        insert sy_capacity_control  (supplier,supplier_code,capacity_quota,working_hours,capacity_section,supplier_state,remarks,state)
+        insert sy_capacity_control  (supplier,supplier_code,capacity_quota,working_hours,capacity_section,supplier_state,remarks,state,cven_code_type)
         values (#{entity.supplier},#{entity.supplierCode},#{entity.capacityQuota},#{entity.workingHours},#{entity.capacitySection},
-                #{entity.supplierState},#{entity.remarks},#{entity.state});
+                #{entity.supplierState},#{entity.remarks},#{entity.state},#{entity.cvenCodeType});
     </insert>
 
     <select id="query" resultType="org.jeecg.modules.capacity.entity.SyCapacityControl">
         select
-        id,supplier,supplier_code,capacity_quota,working_hours,capacity_section,supplier_state,remarks,state from sy_capacity_control
+        id,supplier,supplier_code,capacity_quota,working_hours,capacity_section,supplier_state,remarks,state,cven_code_type from sy_capacity_control
         where state != '-1'
         <if test="supplier != null">
             and supplier=#{supplier}
         </if>
+        <if test="cvenCodeType != null">
+            and cven_code_type=#{cvenCodeType}
+        </if>
+        <if test="state != null">
+            and supplier_state=#{state}
+        </if>
         order by id desc
         offset #{pageIndex} rows
         fetch next #{pageSize} rows only

jeecg-boot-module-system/src/main/java/org/jeecg/modules/capacity/service/ISyCapacityControlService.java

@@ -13,5 +13,5 @@ import java.util.List;
  */
 public interface ISyCapacityControlService extends IService<SyCapacityControl> {
     int insert( SyCapacityControl entity);
-    List<SyCapacityControl> query(String supplier, Integer pageIndex,Integer pageSize);
+    List<SyCapacityControl> query(String supplier,String cvenCodeType,String state, Integer pageIndex,Integer pageSize);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/capacity/service/impl/SyCapacityControlServiceImpl.java

@@ -31,8 +31,8 @@ public class SyCapacityControlServiceImpl extends ServiceImpl<SyCapacityControlM
     }
 
     @Override
-    public List<SyCapacityControl> query(String supplier, Integer pageIndex, Integer pageSize) {
+    public List<SyCapacityControl> query(String supplier,String cvenCodeType,String state, Integer pageIndex, Integer pageSize) {
         pageIndex=(pageIndex-1)*pageSize;
-        return syCapacityControlMapper.query(supplier, pageIndex, pageSize);
+        return syCapacityControlMapper.query(supplier,cvenCodeType,state, pageIndex, pageSize);
     }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/mapper/SyOrderDataItemMapper.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.documents.orderData.mapper;
 
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
@@ -19,6 +20,7 @@ import java.util.Map;
 public interface SyOrderDataItemMapper extends BaseMapper<SyOrderDataItem> {
      IPage<SyOrderDataItem> queryList(@Param("syOrderDataId") String syOrderDataId, Page<SyOrderDataItem> page);
 
+     @DS("multi-three")
      List<Map<String,String>> querySupplier();
 
      void deleteByID(@Param("id") String id);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/mapper/xml/SyOrderDataItemMapper.xml

@@ -34,8 +34,16 @@
     </select>
 
     <select id="querySupplier" resultType="Map">
-         select supplier_code,supplier from sy_order_data_item  where supplier!='' and supplier_code!='' group by supplier,supplier_code
+        select v.cVenName,v.cVenAbbName as supplier,v.cVenCode as supplier_code,vc.cVCName as cvenCodeType from UFDATA_103_2021.dbo.Vendor v
+        join UFDATA_103_2021.dbo.VendorClass vc on vc.cVCCode=v.cVCCode
+        union
+        select v.cVenName,v.cVenAbbName as supplier,v.cVenCode as supplier_code,vc.cVCName as cvenCodeType from UFDATA_102_2021.dbo.Vendor v
+        join UFDATA_102_2021.dbo.VendorClass vc on vc.cVCCode=v.cVCCode
+        union
+        select v.cVenName,v.cVenAbbName as supplier,v.cVenCode as supplier_code,vc.cVCName as cvenCodeType from UFDATA_101_2021.dbo.Vendor v
+        join UFDATA_101_2021.dbo.VendorClass vc on vc.cVCCode=v.cVCCode
     </select>
+<!--    select supplier_code,supplier from sy_order_data_item  where supplier!='' and supplier_code!='' group by supplier,supplier_code-->
 
     <delete id="deleteByID">
         DELETE FROM sy_order_data_item where id =  #{id}