Merge branch 'dev' of http://39.105.222.208:1024/leihd/factory-java into dev

@@ -167,14 +167,26 @@ public class TblOrderFormController extends JeecgController<TblOrderForm, ITblOr
 
 
 	 //通过id查询一条订单
 	 //通过id查询一条订单
 	 @GetMapping(value = "/queryById/{id}")
 	 @GetMapping(value = "/queryById/{id}")
-	 public Result<TblOrderForm> queryById(@PathVariable(name="id",required=true) String id) {
-		 TblOrderForm tblOrderForm = tblOrderFormService.selectOneById(id);
+	 public Result<TblOrderFormModel> queryById(@PathVariable(name="id",required=true) String id) {
+		 TblOrderFormModel tblOrderForm = tblOrderFormService.selectOneById(id);
 		 if(tblOrderForm==null) {
 		 if(tblOrderForm==null) {
 			 return Result.error("未找到对应数据");
 			 return Result.error("未找到对应数据");
 		 }
 		 }
 		 return Result.OK(tblOrderForm);
 		 return Result.OK(tblOrderForm);
 	 }
 	 }
 
 
+	 @GetMapping(value = "/getOrderCompanyList")
+	 public Result<List<String>> getOrderCompanyList() {
+		 List<String> orderCompanyList = tblOrderFormService.getOrderCompanyList();
+		 return Result.OK(orderCompanyList);
+	 }
+
+	 @GetMapping(value = "/getProductNameList")
+	 public Result<List<String>> getProductNameList() {
+		 List<String> productNameList = tblOrderFormService.getProductNameList();
+		 return Result.OK(productNameList);
+	 }
+
 	 /**
 	 /**
 	  *  出货
 	  *  出货
 	  * @param tblOrderForm
 	  * @param tblOrderForm

@@ -21,7 +21,7 @@ public interface TblOrderFormMapper extends BaseMapper<TblOrderForm> {
 
 
     String getMaxorderIdByType(String productType);
     String getMaxorderIdByType(String productType);
 
 
-    TblOrderForm selectOneById(String id);
+    TblOrderFormModel selectOneById(String id);
 
 
     Integer updateDesignerByOrderId(TblOrderForm tblOrderForm);
     Integer updateDesignerByOrderId(TblOrderForm tblOrderForm);
     Integer updateProductDesignStatusByOrderId(TblOrderForm tblOrderForm);
     Integer updateProductDesignStatusByOrderId(TblOrderForm tblOrderForm);
@@ -29,4 +29,6 @@ public interface TblOrderFormMapper extends BaseMapper<TblOrderForm> {
     Page<TblOrderFormModel>  selectList(Page<TblOrderFormModel> page, @Param("qc") TblOrderFormModel tblOrderForm);
     Page<TblOrderFormModel>  selectList(Page<TblOrderFormModel> page, @Param("qc") TblOrderFormModel tblOrderForm);
     Page<TblOrderFormModel>  selectListDesign(Page<TblOrderFormModel> page, @Param("qc") TblOrderFormModel tblOrderForm);
     Page<TblOrderFormModel>  selectListDesign(Page<TblOrderFormModel> page, @Param("qc") TblOrderFormModel tblOrderForm);
 
 
+    List<String> getOrderCompanyList();
+    List<String> getProductNameList();
 }
 }

@@ -38,10 +38,10 @@
         WHERE
         WHERE
             order_id like CONCAT( #{productType}, '%')
             order_id like CONCAT( #{productType}, '%')
 	</select>
 	</select>
-    <select id="selectOneById" resultType="org.jeecg.modules.erp.order_form.entity.TblOrderForm">
-        SELECT
+    <select id="selectOneById" resultType="org.jeecg.modules.erp.order_form.form.TblOrderFormModel">
+         SELECT
             a.id,a.create_by,a.create_time,a.update_by,a.update_time,a.sys_org_code,a.order_id,a.order_company,
             a.id,a.create_by,a.create_time,a.update_by,a.update_time,a.sys_org_code,a.order_id,a.order_company,
-	        a.work_order,a.product_name,b.product_type_name as product_type,a.order_date,a.designer,
+	        a.work_order,a.product_name,b.product_type_id as product_type ,b.product_type_name,a.order_date,a.designer,
 	        a.dispatch_date,a.delivery_date,a.quantity,a.total_working_hours,a.dispatched_working_hours,a.STATUS,
 	        a.dispatch_date,a.delivery_date,a.quantity,a.total_working_hours,a.dispatched_working_hours,a.STATUS,
 	        a.finish_date,a.dispatch_status,a.product_design_status,a.verify_status,a.verify_result,a.delivery_date1,a.pics,a.pics2
 	        a.finish_date,a.dispatch_status,a.product_design_status,a.verify_status,a.verify_result,a.delivery_date1,a.pics,a.pics2
         FROM
         FROM
@@ -106,4 +106,10 @@
         </if>
         </if>
         order by a.create_time desc
         order by a.create_time desc
     </select>
     </select>
+    <select id="getOrderCompanyList" resultType="java.lang.String">
+        SELECT DISTINCT order_company from tbl_order_form
+    </select>
+    <select id="getProductNameList" resultType="java.lang.String">
+        SELECT DISTINCT product_name from tbl_order_form
+    </select>
 </mapper>
 </mapper>

@@ -37,7 +37,7 @@ public interface ITblOrderFormService extends IService<TblOrderForm> {
 
 
 	String getCountByType(String productType);
 	String getCountByType(String productType);
 
 
-	TblOrderForm selectOneById(String id);
+	TblOrderFormModel selectOneById(String id);
 
 
 	Integer updateDesignerByOrderId(TblOrderForm tblOrderForm);
 	Integer updateDesignerByOrderId(TblOrderForm tblOrderForm);
 	Integer updateProductDesignStatusByOrderId(TblOrderForm tblOrderForm);
 	Integer updateProductDesignStatusByOrderId(TblOrderForm tblOrderForm);
@@ -45,4 +45,6 @@ public interface ITblOrderFormService extends IService<TblOrderForm> {
 	Page<TblOrderFormModel> selectList(Page<TblOrderFormModel> page, TblOrderFormModel tblOrderForm);
 	Page<TblOrderFormModel> selectList(Page<TblOrderFormModel> page, TblOrderFormModel tblOrderForm);
 	Page<TblOrderFormModel> selectListDesign(Page<TblOrderFormModel> page, TblOrderFormModel tblOrderForm);
 	Page<TblOrderFormModel> selectListDesign(Page<TblOrderFormModel> page, TblOrderFormModel tblOrderForm);
 
 
+	List<String> getOrderCompanyList();
+	List<String> getProductNameList();
 }
 }

@@ -56,7 +56,7 @@ public class TblOrderFormServiceImpl extends ServiceImpl<TblOrderFormMapper, Tbl
 	}
 	}
 
 
 	@Override
 	@Override
-	public TblOrderForm selectOneById(String id) {
+	public TblOrderFormModel selectOneById(String id) {
 		return tblOrderFormMapper.selectOneById(id);
 		return tblOrderFormMapper.selectOneById(id);
 	}
 	}
 
 
@@ -80,5 +80,15 @@ public class TblOrderFormServiceImpl extends ServiceImpl<TblOrderFormMapper, Tbl
 		return tblOrderFormMapper.selectListDesign(page,tblOrderForm);
 		return tblOrderFormMapper.selectListDesign(page,tblOrderForm);
 	}
 	}
 
 
+	@Override
+	public List<String> getOrderCompanyList() {
+		return tblOrderFormMapper.getOrderCompanyList();
+	}
+
+	@Override
+	public List<String> getProductNameList() {
+		return tblOrderFormMapper.getProductNameList();
+	}
+
 
 
 }
 }