md
This commit is contained in:
linfso
parent
04754e1b6c
commit
45006ec176
@ -87,4 +87,14 @@ public class EmisElectronicPagApply extends BaseEntity
|
||||
/* 是否允许自动分配单号 */
|
||||
private String blAllowAllocate;
|
||||
|
||||
|
||||
// ------
|
||||
private String applySiteName;
|
||||
private String applyManName;
|
||||
private String sendManName;
|
||||
private String sendSiteName;
|
||||
private String cancelSiteName;
|
||||
private String cancelManName;
|
||||
private String userSiteName;
|
||||
|
||||
}
|
||||
|
||||
@ -181,11 +181,20 @@ public class WaybillOrder implements Serializable {
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date dispFdDate;
|
||||
|
||||
/* 转单原因 */
|
||||
private String dispFdReason;
|
||||
|
||||
/* 取件员代码 */
|
||||
private String takePieceEmployeeCode;
|
||||
|
||||
/* 登记站点代码 */
|
||||
private String registerSiteCode;
|
||||
/* 登记时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date registerDate;
|
||||
/* 登记人编号 */
|
||||
private String registerManCode;
|
||||
|
||||
|
||||
/* 发件网点代码 */
|
||||
private String sendSiteCode;
|
||||
@ -291,6 +300,27 @@ public class WaybillOrder implements Serializable {
|
||||
private String printManName;
|
||||
private String printSiteName;
|
||||
|
||||
/* 签收人 */
|
||||
private String signMan;
|
||||
/* 签收人代码 */
|
||||
private String signManCode;
|
||||
/* 签收站点代码 */
|
||||
private String signSiteCode;
|
||||
/* 签收时间 */
|
||||
private String signDate;
|
||||
|
||||
|
||||
|
||||
/* 当前网点编号 */
|
||||
private String currentSiteCode;
|
||||
/* 下一网点编号 */
|
||||
private String nextSiteCode;
|
||||
/* 上一网点点号 */
|
||||
private String lastSiteCode;
|
||||
|
||||
|
||||
|
||||
|
||||
// 销售,回款
|
||||
// private String salesmenName;
|
||||
// private String payeeName;
|
||||
@ -486,21 +516,22 @@ public class WaybillOrder implements Serializable {
|
||||
// voItem.setInsureRemark(dbWaybill.getInsureRemark());
|
||||
// voItem.setInsureSiteCode(dbWaybill.getInsureSiteCode());
|
||||
// voItem.setInsureDate(dbWaybill.getInsureDate());
|
||||
voItem.setBlPrint(dbWaybill.getBlPrint());
|
||||
voItem.setPrintManCode(dbWaybill.getPrintManCode());
|
||||
voItem.setPrintSite(dbWaybill.getPrintSite());
|
||||
voItem.setPrintDate(dbWaybill.getPrintDate());
|
||||
voItem.setPrintCount(dbWaybill.getPrintCount());
|
||||
// voItem.setBlPrint(dbWaybill.getBlPrint());
|
||||
// voItem.setPrintManCode(dbWaybill.getPrintManCode());
|
||||
// voItem.setPrintSite(dbWaybill.getPrintSite());
|
||||
// voItem.setPrintDate(dbWaybill.getPrintDate());
|
||||
// voItem.setPrintCount(dbWaybill.getPrintCount());
|
||||
|
||||
voItem.setBlDispFd(dbWaybill.getBlDispFd());
|
||||
voItem.setTransferCode(dbWaybill.getTransferCode());
|
||||
voItem.setTransferBillcode(dbWaybill.getTransferBillcode());
|
||||
voItem.setDispFdDate(dbWaybill.getDispFdDate());
|
||||
voItem.setDispFdReason(dbWaybill.getDispFdReason());
|
||||
// voItem.setDispFdReason(dbWaybill.getDispFdReason());
|
||||
|
||||
voItem.setCurrentSiteCode(dbWaybill.getCurrentSiteCode());
|
||||
voItem.setNextSiteCode(dbWaybill.getNextSiteCode());
|
||||
voItem.setLastSiteCode(dbWaybill.getLastSiteCode());
|
||||
|
||||
voItem.setRegisterSiteCode(dbWaybill.getRegisterSiteCode());
|
||||
voItem.setRegisterDate(dbWaybill.getRegisterDate());
|
||||
voItem.setRegisterManCode(dbWaybill.getRegisterManCode());
|
||||
@ -545,7 +576,7 @@ public class WaybillOrder implements Serializable {
|
||||
// voItem.setTimezoneOffset(dbWaybill.getTimezoneOffset());
|
||||
// voItem.setDelFlag(dbWaybill.getDelFlag());
|
||||
// voItem.setCreateBy(dbWaybill.getCreateBy());
|
||||
voItem.setCreateTime(dbWaybill.getCreateTime());
|
||||
// voItem.setCreateTime(dbWaybill.getCreateTime());
|
||||
// voItem.setUpdateBy(dbWaybill.getUpdateBy());
|
||||
// voItem.setUpdateTime(dbWaybill.getUpdateTime());
|
||||
voItem.setRemark(dbWaybill.getRemark());
|
||||
|
||||
@ -11,6 +11,8 @@
|
||||
package com.xdadan.erp.emis.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.xdadan.erp.emis.service.EmisBaseService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.xdadan.erp.emis.domain.EmisElectronicPagApply;
|
||||
@ -24,7 +26,7 @@ import com.xdadan.erp.emis.service.IEmisElectronicPagApplyService;
|
||||
* @date 2024-03-01 10:49:50
|
||||
*/
|
||||
@Service
|
||||
public class EmisElectronicPagApplyServiceImpl implements IEmisElectronicPagApplyService
|
||||
public class EmisElectronicPagApplyServiceImpl extends EmisBaseService implements IEmisElectronicPagApplyService
|
||||
{
|
||||
@Autowired
|
||||
private EmisElectronicPagApplyMapper emisElectronicPagApplyMapper;
|
||||
@ -62,6 +64,10 @@ public class EmisElectronicPagApplyServiceImpl implements IEmisElectronicPagAppl
|
||||
@Override
|
||||
public int insertEmisElectronicPagApply(EmisElectronicPagApply emisElectronicPagApply)
|
||||
{
|
||||
|
||||
emisElectronicPagApply.setApplySiteCode(getCurrentUser().getOwnerSiteCode());
|
||||
emisElectronicPagApply.setApplyManCode(getCurrentUser().getEmpCode());
|
||||
emisElectronicPagApply.preInsert();
|
||||
return emisElectronicPagApplyMapper.insertEmisElectronicPagApply(emisElectronicPagApply);
|
||||
}
|
||||
|
||||
|
||||
@ -30,6 +30,8 @@
|
||||
<result property="curStartNo" column="cur_start_no" />
|
||||
<result property="hasBillCount" column="has_bill_count" />
|
||||
<result property="blAllowAllocate" column="bl_allow_allocate" />
|
||||
|
||||
|
||||
<result property="delFlag" column="del_flag" />
|
||||
<result property="createBy" column="create_by" />
|
||||
<result property="createTime" column="create_time" />
|
||||
@ -38,8 +40,29 @@
|
||||
<result property="remark" column="remark" />
|
||||
<result property="createSite" column="create_site" />
|
||||
<result property="updateSite" column="update_site" />
|
||||
|
||||
|
||||
<association property="applySiteName" column="apply_site_code" select="selectSiteNameByCode"/>
|
||||
<association property="sendSiteName" column="send_site_code" select="selectSiteNameByCode"/>
|
||||
<association property="cancelSiteName" column="cancel_site_code" select="selectSiteNameByCode"/>
|
||||
<association property="userSiteName" column="user_site_code" select="selectSiteNameByCode"/>
|
||||
|
||||
<association property="applyManName" column="apply_man_code" select="selectEmpNameByCode"/>
|
||||
<association property="sendManName" column="send_man_code" select="selectEmpNameByCode"/>
|
||||
<association property="cancelManName" column="cancel_man_code" select="selectEmpNameByCode"/>
|
||||
|
||||
</resultMap>
|
||||
|
||||
|
||||
<select id="selectSiteNameByCode" parameterType="String" resultType="string">
|
||||
select a.site_name from emis_site a where a.site_code = #{code} limit 1
|
||||
</select>
|
||||
|
||||
<select id="selectEmpNameByCode" parameterType="String" resultType="string">
|
||||
select a.emp_name from sys_user a where a.emp_code = #{code} limit 1
|
||||
</select>
|
||||
|
||||
|
||||
<sql id="selectEmisElectronicPagApplyVo">
|
||||
select id, apply_seq, apply_date, provide_type, material_code, material_name, apply_man_code, apply_site_code, unit_money, apply_count, sum_money, bl_send, send_date, send_man_code, send_site_code, bl_cancel, cancel_man_code, cancel_date, cancel_site_code, user_site_code, start_no, end_no, cur_start_no, has_bill_count, bl_allow_allocate, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site from emis_electronic_pag_apply
|
||||
</sql>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user