订单删除修改

@@ -19,4 +19,6 @@ public interface TblBiddingShenqMapper extends BaseMapper<TblBiddingShenq> {
     Page<BiddingShenqForm> selectList(Page<BiddingShenqForm> page,@Param("biddingShenqForm") BiddingShenqForm biddingShenqForm);
     Page<BiddingShenqForm> selectList(Page<BiddingShenqForm> page,@Param("biddingShenqForm") BiddingShenqForm biddingShenqForm);
 
 
     Integer updateapprovalStatusByOrderId(String approvalStatus,String approvalResult,String partNumber);
     Integer updateapprovalStatusByOrderId(String approvalStatus,String approvalResult,String partNumber);
+
+    Integer deleteByOrderId(String orderId);
 }
 }

@@ -41,4 +41,7 @@
         </trim>
         </trim>
         where part_number = #{partNumber}
         where part_number = #{partNumber}
     </update>
     </update>
+    <delete id="deleteByOrderId" parameterType="java.lang.String">
+        delete from tbl_bidding_shenq where order_id = #{orderId}
+    </delete>
 </mapper>
 </mapper>

@@ -20,4 +20,6 @@ public interface ITblBiddingShenqService extends IService<TblBiddingShenq> {
 
 
     Page<BiddingShenqForm> selectList(Page<BiddingShenqForm> page, BiddingShenqForm biddingShenqForm);
     Page<BiddingShenqForm> selectList(Page<BiddingShenqForm> page, BiddingShenqForm biddingShenqForm);
     Integer updateapprovalStatusByOrderId(String approvalStatus,String approvalResult,String partNumber);
     Integer updateapprovalStatusByOrderId(String approvalStatus,String approvalResult,String partNumber);
+
+    Integer deleteByOrderId(String orderId);
 }
 }

@@ -38,4 +38,9 @@ public class TblBiddingShenqServiceImpl extends ServiceImpl<TblBiddingShenqMappe
     public Integer updateapprovalStatusByOrderId(String approvalStatus,String approvalResult,String partNumber) {
     public Integer updateapprovalStatusByOrderId(String approvalStatus,String approvalResult,String partNumber) {
         return tblBiddingShenqMapper.updateapprovalStatusByOrderId(approvalStatus, approvalResult, partNumber);
         return tblBiddingShenqMapper.updateapprovalStatusByOrderId(approvalStatus, approvalResult, partNumber);
     }
     }
+
+    @Override
+    public Integer deleteByOrderId(String orderId) {
+        return tblBiddingShenqMapper.deleteByOrdeId(orderId);
+    }
 }
 }

@@ -17,6 +17,7 @@ import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.erp.bidding_info.service.ITblBiddingShenqService;
 import org.jeecg.modules.erp.order_form.entity.TblOrderForm;
 import org.jeecg.modules.erp.order_form.entity.TblOrderForm;
 import org.jeecg.modules.erp.order_form.entity.TblProductType;
 import org.jeecg.modules.erp.order_form.entity.TblProductType;
 import org.jeecg.modules.erp.order_form.entity.TblWorkOrder;
 import org.jeecg.modules.erp.order_form.entity.TblWorkOrder;
@@ -26,6 +27,8 @@ import org.jeecg.modules.erp.order_form.form.TblOrderFormModel;
 import org.jeecg.modules.erp.order_form.service.ITblOrderFormService;
 import org.jeecg.modules.erp.order_form.service.ITblOrderFormService;
 import org.jeecg.modules.erp.order_form.service.ITblWorkOrderService;
 import org.jeecg.modules.erp.order_form.service.ITblWorkOrderService;
 import org.jeecg.modules.erp.order_form.service.ITblWorkPriceService;
 import org.jeecg.modules.erp.order_form.service.ITblWorkPriceService;
+import org.jeecg.modules.erp.product_design.service.ITblProductDesignService;
+import org.jeecg.modules.erp.production.service.ITblProductionGongxuService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -62,6 +65,12 @@ public class TblOrderFormController extends JeecgController<TblOrderForm, ITblOr
 
 
 	@Autowired
 	@Autowired
 	private ITblOrderFormService tblOrderFormService;
 	private ITblOrderFormService tblOrderFormService;
+	@Autowired
+	private ITblBiddingShenqService biddingShenqService;
+	@Autowired
+	private ITblProductDesignService productDesignService;
+	@Autowired
+	private ITblProductionGongxuService productionGongxuService;
 
 
 	@Autowired
 	@Autowired
 	private ITblWorkOrderService tblWorkOrderService;
 	private ITblWorkOrderService tblWorkOrderService;
@@ -218,6 +227,10 @@ public class TblOrderFormController extends JeecgController<TblOrderForm, ITblOr
 //			return Result.error("订单已开始，不允许删除");
 //			return Result.error("订单已开始，不允许删除");
 //		}
 //		}
 //		tblOrderFormService.delMain(id);
 //		tblOrderFormService.delMain(id);
+		TblOrderForm byId = tblOrderFormService.getById(id);
+		productDesignService.deleteByOrderId(byId.getOrderId());
+		biddingShenqService.deleteByOrdeId(byId.getOrderId());
+		productionGongxuService.deleteByOrderId(byId.getOrderId());
 		tblOrderFormService.removeById(id);
 		tblOrderFormService.removeById(id);
         return Result.OK("删除成功!");
         return Result.OK("删除成功!");
     }
     }

@@ -18,4 +18,6 @@ public interface TblProductDesignMapper extends BaseMapper<TblProductDesign> {
     TblProductDesign getByOrderId(String orderId);
     TblProductDesign getByOrderId(String orderId);
     Integer updateByOrderId(TblProductDesign tblProductDesign);
     Integer updateByOrderId(TblProductDesign tblProductDesign);
 
 
+    Integer deleteByOrderId(String orderId);
+
 }
 }

@@ -7,4 +7,7 @@
     <update id="updateByOrderId" parameterType="org.jeecg.modules.erp.product_design.entity.TblProductDesign">
     <update id="updateByOrderId" parameterType="org.jeecg.modules.erp.product_design.entity.TblProductDesign">
         update tbl_product_design set design_pic = #{designPic}, design_file = #{designFile} where order_id = #{orderId}
         update tbl_product_design set design_pic = #{designPic}, design_file = #{designFile} where order_id = #{orderId}
     </update>
     </update>
+    <delete id="deleteByOrderId" parameterType="java.lang.String">
+        delete from tbl_product_design where order_id = #{orderId}
+    </delete>
 </mapper>
 </mapper>

@@ -14,4 +14,6 @@ public interface ITblProductDesignService extends IService<TblProductDesign> {
     TblProductDesign getByOrderId(String orderId);
     TblProductDesign getByOrderId(String orderId);
 
 
     Integer updateByOrderId(TblProductDesign tblProductDesign);
     Integer updateByOrderId(TblProductDesign tblProductDesign);
+
+    Integer deleteByOrderId(String orderId);
 }
 }

@@ -29,4 +29,9 @@ public class TblProductDesignServiceImpl extends ServiceImpl<TblProductDesignMap
     public Integer updateByOrderId(TblProductDesign tblProductDesign) {
     public Integer updateByOrderId(TblProductDesign tblProductDesign) {
         return tblProductDesignMapper.updateByOrderId(tblProductDesign);
         return tblProductDesignMapper.updateByOrderId(tblProductDesign);
     }
     }
+
+    @Override
+    public Integer deleteByOrderId(String orderId) {
+        return tblProductDesignMapper.deleteByOrderId(orderId);
+    }
 }
 }

@@ -65,7 +65,7 @@ public class TblProductionPlanController extends JeecgController<TblOrderForm, I
 
 
 		QueryWrapper<TblOrderForm> queryWrapper = QueryGenerator.initQueryWrapper(tblOrderForm, req.getParameterMap());
 		QueryWrapper<TblOrderForm> queryWrapper = QueryGenerator.initQueryWrapper(tblOrderForm, req.getParameterMap());
 		queryWrapper.orderByDesc("order_date");
 		queryWrapper.orderByDesc("order_date");
-		queryWrapper.eq("product_design_status","1");
+//		queryWrapper.eq("product_design_status","1");
 		Page<TblOrderForm> page = new Page<TblOrderForm>(pageNo, pageSize);
 		Page<TblOrderForm> page = new Page<TblOrderForm>(pageNo, pageSize);
 		IPage<TblOrderForm> pageList = tblOrderFormService.page(page, queryWrapper);
 		IPage<TblOrderForm> pageList = tblOrderFormService.page(page, queryWrapper);
 		return Result.OK(pageList);
 		return Result.OK(pageList);

@@ -20,4 +20,6 @@ public interface TblProductionGongxuMapper extends BaseMapper<TblProductionGongx
     TblOrderForm getByhours(String orderNumber);
     TblOrderForm getByhours(String orderNumber);
 
 
     void updateByStatus(String orderNumber);
     void updateByStatus(String orderNumber);
+
+    Integer deleteByOrderId(String orderId);
 }
 }

@@ -13,4 +13,7 @@
     <select id="getByhours" resultType="org.jeecg.modules.erp.order_form.entity.TblOrderForm">
     <select id="getByhours" resultType="org.jeecg.modules.erp.order_form.entity.TblOrderForm">
         select * from tbl_order_form where order_id=#{orderNumber}
         select * from tbl_order_form where order_id=#{orderNumber}
     </select>
     </select>
+    <delete id="deleteByOrderId" parameterType="java.lang.String">
+        delete from tbl_production_gongxu where order_number = #{orderId}
+    </delete>
 </mapper>
 </mapper>

@@ -18,4 +18,6 @@ public interface ITblProductionGongxuService extends IService<TblProductionGongx
     TblOrderForm getByhours(String orderNumber);
     TblOrderForm getByhours(String orderNumber);
 
 
     void updateByStatus(String orderNumber);
     void updateByStatus(String orderNumber);
+
+    Integer deleteByOrderId(String orderId);
 }
 }

@@ -35,4 +35,9 @@ public class TblProductionGongxuServiceImpl extends ServiceImpl<TblProductionGon
     public void updateByStatus(String orderNumber) {
     public void updateByStatus(String orderNumber) {
         tblProductionGongxuMapper.updateByStatus(orderNumber);
         tblProductionGongxuMapper.updateByStatus(orderNumber);
     }
     }
+
+    @Override
+    public Integer deleteByOrderId(String orderId) {
+        return tblProductionGongxuMapper.deleteByOrderId(orderId);
+    }
 }
 }

@@ -55,12 +55,11 @@ public class ProductDesignController {
                                                             @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                                             @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                                             HttpServletRequest req) {
                                                             HttpServletRequest req) {
 
 
-        String userNameByToken = JwtUtil.getUserNameByToken(req);
+//        String userNameByToken = JwtUtil.getUserNameByToken(req);
 //        List<String> roleList = sysUserService.getRole(userNameByToken);
 //        List<String> roleList = sysUserService.getRole(userNameByToken);
-        SysUser sysUser = sysUserService.getUserByName(userNameByToken);
-        tblOrderForm.setDesigner(userNameByToken);
+//        SysUser sysUser = sysUserService.getUserByName(userNameByToken);
+//        tblOrderForm.setDesigner(userNameByToken);
 //        QueryWrapper<TblOrderForm> queryWrapper = QueryGenerator.initQueryWrapper(tblOrderForm, req.getParameterMap());
 //        QueryWrapper<TblOrderForm> queryWrapper = QueryGenerator.initQueryWrapper(tblOrderForm, req.getParameterMap());
-//        queryWrapper.eq("designer", sysUser.getWorkNo());
         Page<TblOrderFormModel> page = new Page<TblOrderFormModel>(pageNo, pageSize);
         Page<TblOrderFormModel> page = new Page<TblOrderFormModel>(pageNo, pageSize);
         IPage<TblOrderFormModel> pageList = tblOrderFormService.selectListDesign(page, tblOrderForm);
         IPage<TblOrderFormModel> pageList = tblOrderFormService.selectListDesign(page, tblOrderForm);
         return Result.OK(pageList);
         return Result.OK(pageList);