点检率提交单据修改

js/customer/compensation/web/js/timepieceSchemeBillEx.js

@@ -4,11 +4,18 @@ shr.defineClass("shr.compensation.TimepieceSchemeBillEx", shr.compensation.Timep
 		shr.compensation.TimepieceSchemeBillEx.superClass.initalizeDOM.call(this);
 		 
 	},
-
- 
- 
-	 
- 
+    /**
+     * 选择条件
+     */
+    selectWhereAction : function(){
+        var _self = this;
+        shr.compensation.TimepieceSchemeBillEx.superClass.selectWhereAction.call(this);
+        var date = new Date();
+        var beginDate = (new Date(date.getFullYear(),date.getMonth(),1)).format('yyyy-MM-dd');
+        var endDate = (new Date(date.getFullYear(),date.getMonth()+1,0)).format('yyyy-MM-dd');
+        $('#beginDate').shrDateTimePicker("setValue",beginDate);
+        $('#endDate').shrDateTimePicker("setValue",endDate);
+    },
 
 	saveAction: function(event) {
 		var _self = this;

src/com/kingdee/eas/custom/calcdailypay/task/AutoSubDayDetailFacadeControllerBean.java

@@ -5,13 +5,7 @@ import com.kingdee.bos.metadata.query.util.CompareType;
 import com.kingdee.bos.util.EASResource;
 import com.kingdee.shr.base.syssetting.exception.SHRWebException;
 import com.kingdee.shr.base.syssetting.exception.ShrWebBizException;
-import com.kingdee.shr.compensation.app.integrate.BatchSubmitShemeBillCollection;
-import com.kingdee.shr.compensation.app.integrate.BatchSubmitShemeBillFactory;
-import com.kingdee.shr.compensation.app.integrate.BatchSubmitShemeBillInfo;
-import com.kingdee.shr.compensation.app.integrate.CalSubmitSchemeFactory;
-import com.kingdee.shr.compensation.app.integrate.CalSubmitSchemeInfo;
-import com.kingdee.shr.compensation.app.integrate.IBatchSubmitShemeBill;
-import com.kingdee.shr.compensation.app.integrate.SubmitSchemeType;
+import com.kingdee.shr.compensation.app.integrate.*;
 import com.kingdee.shr.compensation.integrate.verify.CycleVerify;
 import com.kingdee.shr.compensation.integrate.verify.ISubmitBillVerifyInterface;
 import com.kingdee.shr.compensation.integrate.verify.SubmitBillDisableElementVerify;
@@ -88,15 +82,31 @@ public class AutoSubDayDetailFacadeControllerBean extends AbstractAutoSubDayDeta
         filter.getFilterItems().add(new FilterItemInfo("submitScheme.submitSchemeType", SubmitSchemeType.TIMEPIECE_VALUE, CompareType.EQUALS));
         filter.getFilterItems().add(new FilterItemInfo("applyDate",  formattedDate , CompareType.LESS_EQUALS));
         filter.getFilterItems().add(new FilterItemInfo("applyDate",  formattedDate , CompareType.GREATER_EQUALS  ));
+
         EntityViewInfo viewInfo = new EntityViewInfo();
         viewInfo.setFilter(filter);
         try {
         	BatchSubmitShemeBillCollection batchSubmitShemeBillCollection = billIns.getBatchSubmitShemeBillCollection(viewInfo);
         	if (!batchSubmitShemeBillCollection.isEmpty()) {
+				BatchSubmitShemeBillControllerBeanEx beanEx = new BatchSubmitShemeBillControllerBeanEx();
         		for (int i = 0; i < batchSubmitShemeBillCollection.size(); ++i) {
         			BatchSubmitShemeBillInfo model = batchSubmitShemeBillCollection.get(i);
-        			beforeSubmit( ctx, model);
-        			billIns.submitEffect(model);
+					beanEx._save(ctx,model);
+
+					EntityViewInfo viewInfo2 = new EntityViewInfo();
+					FilterInfo filter2 = new FilterInfo();
+					filter2.getFilterItems().add(new FilterItemInfo("id",  model.getId().toString() , CompareType.EQUALS  ));
+					filter2.getFilterItems().add(new FilterItemInfo("entry.s68",  null, CompareType.ISNOT));
+					filter2.getFilterItems().add(new FilterItemInfo("entry.s68",  0, CompareType.GREATER));
+					viewInfo2.setFilter(filter2);
+					logger.error("executeSubmit:filter2->"+filter2.toSql());
+					BatchSubmitShemeBillCollection batchSubmitShemeBillCollection2 = billIns.getBatchSubmitShemeBillCollection(viewInfo2);
+					logger.error("batchSubmitShemeBillCollection2->"+batchSubmitShemeBillCollection2.size());
+					if(!batchSubmitShemeBillCollection2.isEmpty() && batchSubmitShemeBillCollection2.size() > 0) {
+						model=batchSubmitShemeBillCollection2.get(0);
+						beforeSubmit(ctx, model);
+						billIns.submitEffect(model);
+					}
         		}
         	}
         } catch (SHRWebException e) {
@@ -117,6 +127,7 @@ public class AutoSubDayDetailFacadeControllerBean extends AbstractAutoSubDayDeta
     		ISubmitBillVerifyInterface verifyInstance = this.getVerifyInstance(ctx, info);
     		verifyInstance.verify(ctx, info, this.getVerifyParams());
     		BudgetUtil.verifyBudget(ctx, info);
+
     		model.setInt("billState", 1);
     	} catch (BOSException var8) {
     		throw new SHRWebException(var8.getMessage(), var8);

websrc/com/kingdee/shr/compensation/web/handler/timepiece/bill/CheckIwclUtil.java

@@ -0,0 +1,44 @@
+package com.kingdee.shr.compensation.web.handler.timepiece.bill;
+
+import com.kingdee.bos.metadata.entity.FilterInfo;
+import com.kingdee.bos.metadata.entity.FilterItemInfo;
+import com.kingdee.bos.metadata.query.util.CompareType;
+import com.kingdee.eas.framework.CoreBaseInfo;
+import com.kingdee.eas.hr.base.HRBillStateEnum;
+
+import java.math.BigDecimal;
+
+/**
+ * 点检率校验
+ * description: CheckIwclUtil <br>
+ * date: 2025/6/27 10:26 <br>
+ * author: lhbj <br>
+ * version: 1.0 <br>
+ */
+public class CheckIwclUtil {
+
+    //点检率
+    private static String IWCL = "S68";
+
+    public static boolean isNotBlank(CoreBaseInfo entry) {
+        //点检率是否为空
+        BigDecimal s68 = entry.getBigDecimal(IWCL);
+        if (null == s68 || BigDecimal.ZERO.compareTo(s68) == 0) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+    public static boolean isBlank(CoreBaseInfo cs) {
+        return !isNotBlank(cs);
+    }
+
+
+    public static void main(String[] args) {
+        FilterInfo filter = new FilterInfo();
+        filter.getFilterItems().add(new FilterItemInfo("billState", HRBillStateEnum.SAVED_VALUE, CompareType.EQUALS));
+        filter.getFilterItems().add(new FilterItemInfo("entry.s68", null, CompareType.ISNOT));
+        filter.getFilterItems().add(new FilterItemInfo("entry.s68",  0, CompareType.GREATER));
+        System.out.println(filter.toSql());
+    }
+}