工资计算和导入

@@ -99,8 +99,21 @@ public class TblProductionGongxuController extends JeecgController<TblProduction
 	 @PutMapping("/updateYan")
 	 @PutMapping("/updateYan")
 	 public Result<?> updateYan(@RequestBody List<TblProductionGongxu> tblProductionGongxuList){
 	 public Result<?> updateYan(@RequestBody List<TblProductionGongxu> tblProductionGongxuList){
 		 boolean b = tblProductionGongxuService.updateBatchById(tblProductionGongxuList);
 		 boolean b = tblProductionGongxuService.updateBatchById(tblProductionGongxuList);
+		 LambdaQueryWrapper<TblProductionGongxu> queryWrapper=new LambdaQueryWrapper<TblProductionGongxu>()
+				 .eq(TblProductionGongxu::getOrderNumber,tblProductionGongxuList.get(0).getOrderNumber());
 		 if(b){
 		 if(b){
-
+			 List<TblProductionGongxu> list = tblProductionGongxuService.list(queryWrapper);
+			 boolean allHhhQualified = true;
+			 for (TblProductionGongxu productionGongxu : list) {
+				 if (!"合格入库".equals(productionGongxu.getYanResult())) {
+					 // 如果有任何一个元素的hhh值不是“合格入库”，则置标志位为false，并跳出循环
+					 allHhhQualified = false;
+					 break;
+				 }
+			 }
+			 if(allHhhQualified){
+				 tblProductionGongxuService.updateByStatus(tblProductionGongxuList.get(0).getOrderNumber());
+			 }
 		 }
 		 }
 		 return Result.ok("修改成功");
 		 return Result.ok("修改成功");
 	 }
 	 }

@@ -68,7 +68,6 @@ public class TblProductionPlanController extends JeecgController<TblOrderForm, I
 		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);
 	}
 	}
 
 

@@ -18,4 +18,6 @@ public interface TblProductionGongxuMapper extends BaseMapper<TblProductionGongx
     void updateByNumber(TblOrderForm tblOrderForm);
     void updateByNumber(TblOrderForm tblOrderForm);
 
 
     TblOrderForm getByhours(String orderNumber);
     TblOrderForm getByhours(String orderNumber);
+
+    void updateByStatus(String orderNumber);
 }
 }

@@ -3,9 +3,13 @@
 <mapper namespace="org.jeecg.modules.erp.production.mapper.TblProductionGongxuMapper">
 <mapper namespace="org.jeecg.modules.erp.production.mapper.TblProductionGongxuMapper">
 
 
     <update id="updateByNumber">
     <update id="updateByNumber">
-        update tbl_order_form set dispatched_working_hours=#{dispatchedWorkingHours},dispatch_status=1
+        update tbl_order_form set dispatched_working_hours=#{dispatchedWorkingHours},dispatch_status=1,verify_status=0
         where order_id=#{orderId}
         where order_id=#{orderId}
     </update>
     </update>
+    <update id="updateByStatus">
+        update tbl_order_form set verify_status=1
+        where order_id=#{orderNumber}
+    </update>
     <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>

@@ -16,4 +16,6 @@ public interface ITblProductionGongxuService extends IService<TblProductionGongx
     void updateByNumber(TblOrderForm tblOrderForm);
     void updateByNumber(TblOrderForm tblOrderForm);
 
 
     TblOrderForm getByhours(String orderNumber);
     TblOrderForm getByhours(String orderNumber);
+
+    void updateByStatus(String orderNumber);
 }
 }

 package org.jeecg.modules.erp.production.service.impl;
 package org.jeecg.modules.erp.production.service.impl;
 
 
 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.mapper.TblOrderFormMapper;
 import org.jeecg.modules.erp.production.entity.TblProductionGongxu;
 import org.jeecg.modules.erp.production.entity.TblProductionGongxu;
 import org.jeecg.modules.erp.production.mapper.TblProductionGongxuMapper;
 import org.jeecg.modules.erp.production.mapper.TblProductionGongxuMapper;
 import org.jeecg.modules.erp.production.service.ITblProductionGongxuService;
 import org.jeecg.modules.erp.production.service.ITblProductionGongxuService;
@@ -29,4 +30,9 @@ public class TblProductionGongxuServiceImpl extends ServiceImpl<TblProductionGon
     public TblOrderForm getByhours(String orderNumber) {
     public TblOrderForm getByhours(String orderNumber) {
         return tblProductionGongxuMapper.getByhours(orderNumber);
         return tblProductionGongxuMapper.getByhours(orderNumber);
     }
     }
+
+    @Override
+    public void updateByStatus(String orderNumber) {
+        tblProductionGongxuMapper.updateByStatus(orderNumber);
+    }
 }
 }