产能控制

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

@@ -82,7 +82,7 @@ public class SyCapacityControlController extends JeecgController<SyCapacityContr
 	@ApiOperation(value="产能控制-添加", notes="产能控制-添加")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody SyCapacityControl syCapacityControl) {
-		syCapacityControlService.save(syCapacityControl);
+		syCapacityControlService.insert(syCapacityControl);
 		return Result.OK("添加成功！");
 	}
 	

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

@@ -32,7 +32,7 @@ public class SyCapacityControl implements Serializable {
     private static final long serialVersionUID = 1L;
 
 	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
+	@TableId(type = IdType.INPUT)
     @ApiModelProperty(value = "主键")
     private int id;
 	/**供应商*/

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

@@ -1,7 +1,5 @@
 package org.jeecg.modules.capacity.mapper;
 
-import java.util.List;
-
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.capacity.entity.SyCapacityControl;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -13,5 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @Version: V1.0
  */
 public interface SyCapacityControlMapper extends BaseMapper<SyCapacityControl> {
-
+    @Override
+    int insert(@Param("entity") SyCapacityControl entity);
 }

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

@@ -2,4 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <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)
+        values (#{entity.supplier},#{entity.supplier_code},#{entity.capacity_quota},#{entity.working_hours},#{entity.capacity_section},
+                #{entity.supplier_state},#{entity.remarks},#{entity.state});
+    </insert>
 </mapper>

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

@@ -10,5 +10,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @Version: V1.0
  */
 public interface ISyCapacityControlService extends IService<SyCapacityControl> {
-
+    int insert( SyCapacityControl entity);
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.dynamic.datasource.annotation.DS;
 import org.jeecg.modules.capacity.entity.SyCapacityControl;
 import org.jeecg.modules.capacity.mapper.SyCapacityControlMapper;
 import org.jeecg.modules.capacity.service.ISyCapacityControlService;
+import org.jeecg.modules.openApi.service.ISenYuDataSourceThree;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -18,4 +19,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @DS("multi-three")
 public class SyCapacityControlServiceImpl extends ServiceImpl<SyCapacityControlMapper, SyCapacityControl> implements ISyCapacityControlService {
 
+    private  SyCapacityControlMapper syCapacityControlMapper;
+
+    @Override
+    public int insert(SyCapacityControl entity) {
+        return syCapacityControlMapper.insert(entity);
+    }
 }

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

@@ -194,11 +194,4 @@ public class SyOrderDataItemController extends JeecgController<SyOrderDataItem,
 		 return syOrderDataItemService.querySupplier();
 	 }
 
-	 @AutoLog(value = "订单子表信息-供应商编码")
-	 @ApiOperation(value="订单子表信息-供应商编码", notes="订单子表信息-供应商编码")
-	 @GetMapping(value = "/querySupplierCode")
-	 public List<?> querySupplierCode() {
-		 return syOrderDataItemService.querySupplierCode();
-	 }
-
 }

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

@@ -8,6 +8,7 @@ import org.jeecg.modules.documents.orderData.entity.SyOrderDataItem;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 订单子表信息
@@ -18,6 +19,5 @@ import java.util.List;
 public interface SyOrderDataItemMapper extends BaseMapper<SyOrderDataItem> {
      IPage<SyOrderDataItem> queryList(@Param("syOrderDataId") String syOrderDataId, Page<SyOrderDataItem> page);
 
-     List<String> querySupplier();
-     List<String> querySupplierCode();
+     List<Map<String,String>> querySupplier();
 }

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

@@ -21,10 +21,7 @@
             coding_rules
     </select>
 
-    <select id="querySupplier" resultType="String">
-         select supplier from sy_order_data_item  where supplier!='' group by supplier
-    </select>
-    <select id="querySupplierCode" resultType="String">
-         select supplier_code from sy_order_data_item  where supplier_code!='' group by supplier_code
+    <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>
 </mapper>

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

@@ -6,6 +6,7 @@ import org.jeecg.modules.documents.orderData.entity.SyOrderDataItem;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 订单子表信息
@@ -15,6 +16,5 @@ import java.util.List;
  */
 public interface ISyOrderDataItemService extends IService<SyOrderDataItem> {
     IPage<SyOrderDataItem> queryList(String syOrderDataId, Page<SyOrderDataItem> page);
-    List<String> querySupplier();
-    List<String> querySupplierCode();
+    List<Map<String,String>> querySupplier();
 }

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

@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 订单子表信息
@@ -30,12 +31,8 @@ public class SyOrderDataItemServiceImpl extends ServiceImpl<SyOrderDataItemMappe
     }
 
     @Override
-    public List<String> querySupplier() {
+    public List<Map<String,String>> querySupplier() {
         return syOrderDataItemMapper.querySupplier();
     }
 
-    @Override
-    public List<String> querySupplierCode() {
-        return syOrderDataItemMapper.querySupplierCode();
-    }
 }