插入中间表字段调整

hr/hr/src/client/nc/ui/hr/baod_orders/view/AccumulationFundAllInsertDiaLog.java

@@ -169,7 +169,8 @@ public class AccumulationFundAllInsertDiaLog extends UIDialog implements ActionL
 				insertSQL.append(getString(staffsum)).append(", ");
 				insertSQL.append(getString(orgsum)).append(", ");
 				insertSQL.append(getString(mark)).append(", ");
-				insertSQL.append("sysdate)");
+				insertSQL.append("sysdate,");
+				insertSQL.append("null)");
 				siaMaintain.executeBaseDAO(insertSQL.toString());
 			}
 			//¹Ø±Õµ¯¿ò

hr/hr/src/client/nc/ui/hr/baod_orders/view/AccumulationFundAllUpdateDialog.java

@@ -172,7 +172,8 @@ public class AccumulationFundAllUpdateDialog extends UIDialog {
 					insertSQL.append(getString(staffsum)).append(", ");
 					insertSQL.append(getString(orgsum)).append(", ");
 					insertSQL.append(getString(mark)).append(", ");
-					insertSQL.append("sysdate)");
+					insertSQL.append("sysdate,");
+					insertSQL.append("null)");
 					siaMaintain.executeBaseDAO(insertSQL.toString());
 					
 				}else {

hr/hr/src/client/nc/ui/hr/baod_orders/view/ServiceChargeAllUpdateDialog.java

@@ -173,7 +173,8 @@ public class ServiceChargeAllUpdateDialog extends UIDialog{
 					insertSQL.append(getString(staffsum)).append(", ");
 					insertSQL.append(getString(orgsum)).append(", ");
 					insertSQL.append(getString(mark)).append(", ");
-					insertSQL.append("sysdate)");
+					insertSQL.append("sysdate,");
+					insertSQL.append("null)");
 					siaMaintain.executeBaseDAO(insertSQL.toString());
 				}else {
 					StringBuilder updateSQL = new StringBuilder("UPDATE accumulation_fund");

hr/hr/src/client/nc/ui/hr/baod_orders/view/ServiceChargeAllocationUI.java

@@ -28,7 +28,6 @@ import javax.swing.table.TableCellRenderer;
 
 import nc.bs.framework.common.InvocationInfoProxy;
 import nc.bs.framework.common.NCLocator;
-import nc.bs.hr.plugin.GetDataUtil;
 import nc.desktop.ui.WorkbenchEnvironment;
 import nc.hr.utils.OutputDialogUtil;
 import nc.itf.hr.SocialInsuranceAllMaintain;
@@ -112,15 +111,11 @@ public class ServiceChargeAllocationUI extends ToftPanel {
 	}
 
 	public void initialize() {
-		try {
-			setLayout(new BorderLayout());
-			add(getUIPanel0(), BorderLayout.NORTH);
-			add(getUIPanel2(), BorderLayout.CENTER);
-			add(getUIPanel4(), BorderLayout.SOUTH);
-			setButtons(new ButtonObject[] { this.bt_query, this.bt_update, this.bt_output, this.bt_voucher, this.bt_linkvouchar });// 添加按钮
-		} catch (Exception e) {
-			MessageDialog.showHintDlg(this, "提示", e.getMessage());
-		}
+		setLayout(new BorderLayout());
+		add(getUIPanel0(), BorderLayout.NORTH);
+		add(getUIPanel2(), BorderLayout.CENTER);
+		add(getUIPanel4(), BorderLayout.SOUTH);
+		setButtons(new ButtonObject[] { this.bt_query, this.bt_update, this.bt_output, this.bt_voucher, this.bt_linkvouchar });// 添加按钮
 	}
 
 	private UILabel getOrgLabel() {
@@ -979,6 +974,8 @@ public class ServiceChargeAllocationUI extends ToftPanel {
 		String pk_org = getPk_financeorg(orgCode);
 		// 组织版本
 		String pk_group = InvocationInfoProxy.getInstance().getGroupId();// 集团
+		String yearperiod = period.substring(0, 4);// 会计年度      2025-03-13
+		String monthperiod = period.substring(5, 7);// 会计月份    2025-03-13
 		Date newDate = convertStringToDate(period + "-01", "yyyy-MM-dd");
 		String nexMonthDate = getMonthFirstDate(newDate);// 下月最后一天
 		String year = nexMonthDate.substring(0, 4);// 会计年度
@@ -1023,7 +1020,7 @@ public class ServiceChargeAllocationUI extends ToftPanel {
 				debitamount = entry.getValue();// 借方发生额
 				pk_accasoa = tranKm(km_code, pk_accountGlbook);// 科目
 				DetailVO itemVO = new DetailVO();
-				getDetailvo(itemVO, pk_accasoa, creditamount, debitamount, voucher, period + " 人事代理服务费");
+				getDetailvo(itemVO, pk_accasoa, creditamount, debitamount, voucher,  "缴纳" + yearperiod + "年" + monthperiod + "月 人事代理服务费");
 				// 辅助核算
 				AssVO[] assvos = getAss(pk_accasoa, "0001", "其他-虚拟（财务成本归结）", pk_org);// 部门：其他虚拟财务
 				ArrayList<AssVO> arrassvo = new ArrayList<AssVO>();
@@ -1051,7 +1048,7 @@ public class ServiceChargeAllocationUI extends ToftPanel {
 				debitamount = entry.getValue();// 借方发生额
 				pk_accasoa = tranKm(km_code, pk_accountGlbook);// 科目
 				DetailVO itemVO = new DetailVO();
-				getDetailvo(itemVO, pk_accasoa, creditamount, debitamount, voucher, period + " 人事代理服务费");
+				getDetailvo(itemVO, pk_accasoa, creditamount, debitamount, voucher,  "缴纳" + yearperiod + "年" + monthperiod + "月 人事代理服务费");
 				// 辅助核算
 				AssVO[] assvos1 = getAss(pk_accasoa, "0001", "其他-虚拟（财务成本归结）", pk_org);// 部门：其他虚拟财务
 				AssVO[] assvos = getAss(pk_accasoa, "0010", "PM201601130001", pk_org);// 项目：其他
@@ -1065,15 +1062,18 @@ public class ServiceChargeAllocationUI extends ToftPanel {
 			} else if ("其他应收款/单位往来".equals(key)) {
 				km_code = "122101";// 其他应收款/单位往来
 				debitamount = entry.getValue();// 借方发生额
-				pk_accasoa = tranKm(km_code, pk_accountGlbook);// 科目
-				DetailVO itemVO = new DetailVO();
-				getDetailvo(itemVO, pk_accasoa, creditamount, debitamount, voucher, period + " 人事代理服务费-尤咏杰");
-				// 辅助核算：上海茗杰商务咨询有限公司
-				AssVO[] assvos = getAss(pk_accasoa, "0004", "G006353", pk_org);// 客商
-				ArrayList<AssVO> arrassvo = new ArrayList<AssVO>();
-				arrassvo.add(assvos[0]);
-				itemVO.setAss((AssVO[]) arrassvo.toArray(new AssVO[0]));
-				itemarr.add(itemVO);
+				if(debitamount.doubleValue() != 0){// 判断外部公司承担表公司部分是否为0(龙咏杰特殊处理)
+					pk_accasoa = tranKm(km_code, pk_accountGlbook);// 科目
+					DetailVO itemVO = new DetailVO();
+					getDetailvo(itemVO, pk_accasoa, creditamount, debitamount, voucher,  "缴纳" + yearperiod + "年" + monthperiod + "月 人事代理服务费-尤咏杰");
+					// 辅助核算：上海茗杰商务咨询有限公司
+					AssVO[] assvos = getAss(pk_accasoa, "0004", "G006353", pk_org);// 客商
+					ArrayList<AssVO> arrassvo = new ArrayList<AssVO>();
+					arrassvo.add(assvos[0]);
+					itemVO.setAss((AssVO[]) arrassvo.toArray(new AssVO[0]));
+					itemarr.add(itemVO);	
+				}
+				
 			}
 			// else if("应交税费".equals(key)){
 			// km_code= "2221010101";//应交税费/应交增值税/进项税额/认证抵扣
@@ -1088,7 +1088,7 @@ public class ServiceChargeAllocationUI extends ToftPanel {
 				creditamount = entry.getValue();// 贷方发生额
 				pk_accasoa = tranKm(km_code, pk_accountGlbook);// 科目
 				DetailVO itemVO = new DetailVO();
-				getDetailvo(itemVO, pk_accasoa, creditamount, debitamount, voucher, period + " 人事代理服务费");
+				getDetailvo(itemVO, pk_accasoa, creditamount, debitamount, voucher,  "缴纳" + yearperiod + "年" + monthperiod + "月 人事代理服务费");
 				// 辅助核算
 				AssVO[] assvos = getAss(pk_accasoa, "05", "11", pk_org);// 待摊事项：人事代理费摊销
 				// AssVO[] assvos = getAss(pk_accasoa, "0004","G000371",pk_org);//客商：上海国际企业商务咨询服务有限公司

hr/hr/src/client/nc/ui/hr/baod_orders/view/SocialInsuranceAllInsertDialog.java

@@ -167,7 +167,8 @@ public class SocialInsuranceAllInsertDialog extends UIDialog implements ActionLi
 				insertSQL.append(getString(staffsum)).append(", ");
 				insertSQL.append(getString(orgsum)).append(", ");
 				insertSQL.append(getString(mark)).append(", ");
-				insertSQL.append("sysdate)");
+				insertSQL.append("sysdate,");
+				insertSQL.append("null)");
 				siaMaintain.executeBaseDAO(insertSQL.toString());
 			}
 			//¹Ø±Õµ¯¿ò

hr/hr/src/client/nc/ui/hr/baod_orders/view/SocialInsuranceAllUpdateDialog.java

@@ -172,7 +172,8 @@ public class SocialInsuranceAllUpdateDialog extends UIDialog {
 					insertSQL.append(getString(staffsum)).append(", ");
 					insertSQL.append(getString(orgsum)).append(", ");
 					insertSQL.append(getString(mark)).append(", ");
-					insertSQL.append("sysdate)");
+					insertSQL.append("sysdate,");
+					insertSQL.append("null)");
 					siaMaintain.executeBaseDAO(insertSQL.toString());
 					
 				}else {