Преглед на файлове

【功能完善】【反馈编号:2023030191】【追加报关日期】

wuyx преди 1 година
родител
ревизия
73e724223c
променени са 2 файла, в които са добавени 7 реда и са изтрити 1 реда
  1. 4 0
      src/com/uas/erp/dao/common/impl/AcceptNotifyDaoImpl.java
  2. 3 1
      src/com/uas/erp/dao/common/impl/VerifyApplyDaoImpl.java

+ 4 - 0
src/com/uas/erp/dao/common/impl/AcceptNotifyDaoImpl.java

@@ -2,6 +2,8 @@ package com.uas.erp.dao.common.impl;
 
 import java.util.List;
 
+import com.uas.erp.core.DateUtil;
+import com.uas.erp.core.bind.Constant;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -174,6 +176,7 @@ public class AcceptNotifyDaoImpl extends BaseDao implements AcceptNotifyDao {
 				String code = sGetMaxNumber("VerifyApply", 2);
 				String sourcecode = rs.getString("an_code");
 				String bgcode=rs.getGeneralString("an_bgcode_user");
+				String bgDate = DateUtil.parseDateToString(rs.getDate("an_bgdate_user"), Constant.YMD);
 				boolean bool = execute(
 						VERIFYAPPLY,
 						new Object[] { vaid, code, BaseUtil.getLocalMessage("ENTERING"), SystemSession.getUser().getEm_name(),
@@ -203,6 +206,7 @@ public class AcceptNotifyDaoImpl extends BaseDao implements AcceptNotifyDao {
 							map.set("vad_andid", rs.getInt("and_id"));
 							map.set("vad_unitpackage", qty);
 							map.set("vad_bgcode_user", bgcode);
+							map.set("vad_bgdate_user", bgDate);
 							//B2B送货单明细id
 							map.set("b2b_si_id", rs.getInt("b2b_si_id"));
 							map.execute();

+ 3 - 1
src/com/uas/erp/dao/common/impl/VerifyApplyDaoImpl.java

@@ -76,7 +76,7 @@ public class VerifyApplyDaoImpl extends BaseDao implements VerifyApplyDao {
 			+ ",va_vendcode,va_vendname,vad_madedate,va_sendcode,vad_salecode FROM VERIFYAPPLYDETAIL left join VerifyApply on vad_vaid=va_id WHERE vad_id=?";
 	static final String TURNVERIFYAPPLYDETAIL_LIST = "SELECT vad_id,vad_vaid,vad_code,vad_class,vad_detno,vad_prodcode,vad_qty,vad_remark,vad_pucode,vad_pudetno,vad_description"
 			+ ",va_vendcode,va_vendname,vad_madedate,va_sendcode,vad_batchcode,va_cop,va_code,vad_salecode,va_emcode,va_emname,va_intype,vad_jobcode,vad_mcid,vad_purcqty," +
-			"vad_bgcode_user "
+			"vad_bgcode_user,vad_bgdate_user "
 			+ " FROM VERIFYAPPLYDETAIL left join VerifyApply on vad_vaid=va_id WHERE vad_id in (@IDS)";
 	static final String INSERQUA_VERIFYAPPLYDETAIL = "INSERT INTO QUA_VERIFYAPPLYDETAIL(ve_id,ve_code,ve_class,ve_method,ve_status,ve_printstatus,ve_checkdate"
 			+ ",ve_indate,ve_recorder,ve_statuscode,ve_type,ve_date,vad_vaid,vad_code,vad_class,vad_detno,vad_prodcode,vad_qty,vad_remark,vad_sourcecode"
@@ -507,6 +507,7 @@ public class VerifyApplyDaoImpl extends BaseDao implements VerifyApplyDao {
 			map.set("vad_mcid", rs.getGeneralInt("vad_mcid"));
 			map.set("ve_description", rs.getString("vad_description"));
 			map.set("ve_bgcode_user", rs.getGeneralString("vad_bgcode_user"));
+			map.set("ve_bgdate_user", DateUtil.parseDateToString(rs.getDate("vad_bgdate_user"), Constant.YMD));
 			/**
 			 * @author wsy
 			 * 双单位
@@ -608,6 +609,7 @@ public class VerifyApplyDaoImpl extends BaseDao implements VerifyApplyDao {
 			 */
 			map.set("ve_purcqty", rs.getDouble("vad_purcqty"));
 			map.set("ve_bgcode_user", rs.getGeneralString("vad_bgcode_user"));
+			map.set("ve_bgdate_user", DateUtil.parseDateToString(rs.getDate("vad_bgdate_user"), Constant.YMD));
 			sqls.add(map);
 			returnQc.put(id, code);
 			// 先判断收料单明细中ve_code是否为空