产能控制

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

@@ -13,7 +13,7 @@
         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 !=''">
-            and supplier=#{supplier}
+            and supplier like CONCAT('%',#{supplier},'%')
         </if>
         <if test="cvenCodeType != null and cvenCodeType!=''">
             and cven_code_type=#{cvenCodeType}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/controller/SyOrderDataItemController.java

@@ -193,5 +193,10 @@ public class SyOrderDataItemController extends JeecgController<SyOrderDataItem,
 	 public List<?> querySupplier() {
 		 return syOrderDataItemService.querySupplier();
 	 }
-
+	 @AutoLog(value = "订单子表信息-供应商分类")
+	 @ApiOperation(value="订单子表信息-供应商分类", notes="订单子表信息-供应商分类")
+	 @GetMapping(value = "/querySupplierType")
+	 public List<?> querySupplierType() {
+		 return syOrderDataItemService.querySupplierType();
+	 }
 }

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

@@ -22,6 +22,8 @@ public interface SyOrderDataItemMapper extends BaseMapper<SyOrderDataItem> {
 
      @DS("multi-three")
      List<Map<String,String>> querySupplier();
+     @DS("multi-three")
+     List<Map<String,String>> querySupplierType();
 
      void deleteByID(@Param("id") String id);
      void deleteByOrderID(@Param("id") String id);

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

@@ -33,6 +33,15 @@
             sy_order_data_id = #{syOrderDataId}  and inventory_ccode not like '19%'
     </select>
 
+    <select id="querySupplierType" resultType="Map">
+        select cvenCodeType from (
+            select vc.cVCName as cvenCodeType from UFDATA_103_2021.dbo.VendorClass vc
+            union
+            select vc.cVCName as cvenCodeType from UFDATA_102_2021.dbo.VendorClass vc
+            union
+            select vc.cVCName as cvenCodeType from UFDATA_101_2021.dbo.VendorClass vc
+        ) v_supplier GROUP BY cvenCodeType
+    </select>
     <select id="querySupplier" resultType="Map">
     select supplier,max(supplier_code) as supplier_code,max(cvenCodeType) as cvenCodeType from (
         select v.cVenName,v.cVenAbbName as supplier,v.cVenCode as supplier_code,vc.cVCName as cvenCodeType from UFDATA_103_2021.dbo.Vendor v

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/service/ISyOrderDataItemService.java

@@ -17,6 +17,7 @@ import java.util.Map;
 public interface ISyOrderDataItemService extends IService<SyOrderDataItem> {
     IPage<SyOrderDataItem> queryList(String syOrderDataId, Page<SyOrderDataItem> page);
     List<Map<String,String>> querySupplier();
+    List<Map<String,String>> querySupplierType();
     void deleteByID(String id);
     void deleteByOrderID( String id);
     String queryItemMub(String id);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/service/impl/SyOrderDataItemServiceImpl.java

@@ -35,6 +35,11 @@ public class SyOrderDataItemServiceImpl extends ServiceImpl<SyOrderDataItemMappe
         return syOrderDataItemMapper.querySupplier();
     }
 
+    @Override
+    public List<Map<String, String>> querySupplierType() {
+        return syOrderDataItemMapper.querySupplierType();
+    }
+
     @Override
     public void deleteByID(String id) {
         syOrderDataItemMapper.deleteByID(id);