diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/CertificState.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/CertificState.java index 580103402f..ee7911814a 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/CertificState.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/CertificState.java @@ -58,17 +58,17 @@ public class CertificState { @Getter public static enum TransferState { /** - * 未接收 + * 未移交 */ - TRANSTATE_WJS("001", "未接收"), + TRANSTATE_WJS("001", "未移交"), /** - * 已接收 + * 待移交 */ - TRANSTATE_YJS("002", "已接收"), + TRANSTATE_DYJ("002", "待移交"), /** - * 待移交 + * 移交中 */ - TRANSTATE_DYJ("003", "待移交"), + TRANSTATE_YJZ("003", "移交中"), /** * 已移交 */ diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.java index 320379c87d..a711b354dd 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclecertificate/BaseVehicleCertificateMapper.java @@ -103,6 +103,6 @@ public interface BaseVehicleCertificateMapper extends BaseMapper transferFiles = baseVehicleAppendixService.selectList(sid); - scmTransferRecordsDto.setTransferFiles(transferFiles); - scmTransferRecordsFeign.saveRecords(scmTransferRecordsDto); + busTransferRecordsDto.setTransferFiles(transferFiles); + busTransferRecordsFeign.saveRecords(busTransferRecordsDto); //消息推送 MessagePushTransferDto messagePushTransferDto = new MessagePushTransferDto(); messagePushTransferDto.setMsgTypeSid("bc59c198-2d51-458f-913e-cbd8d7ef4799"); @@ -318,6 +323,7 @@ public class BaseVehicleCertificateService extends MybatisBaseService vehicleOut(BaseVehicleOutDto dto) { log.info("BaseVehicleOutService-vehicleOut-95:{}", JSONObject.toJSONString(dto)); @@ -1988,9 +1996,26 @@ public class BaseVehicleOutService extends MybatisBaseService flowRecordVo = flowableFeignPro.flowRecordAndComment(appDeliveredDetailsVo.getProcInstId(), "1").getData(); + for (PCHistTaskListAndCommentList flowTask : flowRecordVo) { + if (flowTask.getFlowableRecordVo() != null) { + Map flowableRecordVo = flowTask.getFlowableRecordVo(); + String taskDefKey = (String) flowableRecordVo.get("taskDefKey"); + List> taskUserInfos = ConstantUtils.getListData(flowableRecordVo, "taskUserInfos"); + String assigneeName = (String) taskUserInfos.get(0).get("assigneeName"); + Date finishTime = (Date) flowableRecordVo.get("finishTime"); + String spsj = DateUtil.formatDate(finishTime); + if ("Activity_1x1eivz".equals(taskDefKey)){ + dataMap.put("makeName", assigneeName + spsj); + }else if ("Activity_13w5v5m".equals(taskDefKey)){ + dataMap.put("jrsp", assigneeName + spsj); + }else if ("Activity_1xzxtct".equals(taskDefKey) || "Activity_1ohp3br".equals(taskDefKey)){ + dataMap.put("confirmName", assigneeName + spsj); + } + } + } //获取模板 //模板路径 String sourcePath = "D:\\anrui\\upload\\template\\"; diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java index b3d063e5e4..2b3a41e0a9 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java @@ -94,6 +94,11 @@ public interface FinVehicleInvoiceFeign { @ResponseBody ResultBean invoiceYJ(@RequestBody FinVehicleInvoicePushTransferDto dto); + @ApiOperation("发票信息移交撤回") + @PostMapping("/invoiceYJCH") + @ResponseBody + ResultBean invoiceYJCH(@RequestBody String[] sids); + @ApiOperation("根据合同号获取发票信息") @PostMapping("/selectByContractNo") @ResponseBody diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java index e75b3ed7ea..5554371ad3 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java @@ -104,6 +104,11 @@ public class FinVehicleInvoiceFeignFallback implements FinVehicleInvoiceFeign { return null; } + @Override + public ResultBean invoiceYJCH(String[] sids) { + return null; + } + @Override public ResultBean> selectByContractNo(String contractNo) { return null; diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java index 81f031d04a..cdd2be984d 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java @@ -9,6 +9,7 @@ import com.yxt.anrui.fin.api.finvehicleinvoice.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; import java.util.List; @@ -58,4 +59,7 @@ public interface FinVehicleInvoiceMapper extends BaseMapper { List selectByContractNo(String contractNo); FinVehicleInvoice selectByVinSidss(String vinSid); + + @Update("update fin_vehicle_invoice set transferStateKey = #{code},transferState = #{remarks} where sid = #{sid}") + void updateTransferState(@Param("sid") String sid,@Param("code") String code,@Param("remarks") String remarks); } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java index fd38892919..31d60d7d69 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java @@ -219,7 +219,12 @@ public class FinVehicleInvoiceRest implements FinVehicleInvoiceFeign { @Override public ResultBean invoiceYJ(FinVehicleInvoicePushTransferDto dto) { - return null; + return finVehicleInvoiceService.invoiceYJ(dto); + } + + @Override + public ResultBean invoiceYJCH(String[] sids) { + return finVehicleInvoiceService.invoiceYJCH(sids); } @Override diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java index 6b5191e0f3..b58921bcc9 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java @@ -9,17 +9,30 @@ import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo; import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign; import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; +import com.yxt.anrui.base.common.enums.CertificState; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; +import com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecordEnum; +import com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecordsDto; +import com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecordsFeign; import com.yxt.anrui.fin.api.finbillfile.FinBillFileVo; import com.yxt.anrui.fin.api.finvehicleinvoice.*; import com.yxt.anrui.fin.biz.finbillfile.FinBillFileService; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgByUserVo; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; +import com.yxt.anrui.portal.api.sysuserrole.SysUserRoleFeign; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.messagecenter.api.message.MessageFeign; +import com.yxt.messagecenter.api.message.MessagePushTransferDto; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -46,24 +59,30 @@ import java.util.List; public class FinVehicleInvoiceService extends MybatisBaseService { @Resource private FileUploadComponent fileUploadComponent; - @Autowired private FinBillFileService finBillFileService; - @Autowired private SysOrganizationFeign sysOrganizationFeign; - @Autowired private BaseVehicleAppendixFeign baseVehicleAppendixFeign; - @Autowired private CommonAppendixFeign commonAppendixFeign; - @Autowired private BaseVehicleCertificateFeign baseVehicleCertificateFeign; - @Autowired private BaseTrailerFeign baseTrailerFeign; + @Autowired + private SysUserFeign sysUserFeign; + @Autowired + private BusTransferRecordsFeign busTransferRecordsFeign; + @Autowired + private MessageFeign messageFeign; + @Autowired + private BusSalesOrderFeign busSalesOrderFeign; + @Autowired + private SysStaffOrgFeign sysStaffOrgFeign; + @Autowired + private SysUserRoleFeign sysUserRoleFeign; public PagerVo listPage(PagerQuery pq) { FinVehicleInvoiceQuery query = pq.getParams(); @@ -393,4 +412,98 @@ public class FinVehicleInvoiceService extends MybatisBaseService finVehicleInvoices = baseMapper.selectByContractNo(contractNo); return rb.success().setData(finVehicleInvoices); } + + public ResultBean invoiceYJ(FinVehicleInvoicePushTransferDto dto) { + ResultBean rb = ResultBean.fireFail(); + String[] sids = dto.getSids(); + String transferSid = dto.getTransferSid(); + SysUserVo sysUserVo = sysUserFeign.fetchBySid(transferSid).getData(); + String orgPath = dto.getOrgPath(); + SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(orgPath).getData(); + for (String sid : sids) { + FinVehicleInvoice finVehicleInvoice = fetchBySid(sid); + if (CertificState.TransferState.TRANSTATE_WJS.getCode().equals(finVehicleInvoice.getTransferStateKey()) && "002".equals(finVehicleInvoice.getBillingStateKey()) && "是".equals(finVehicleInvoice.getIsTakeTicket())){ + String vehicleSid = finVehicleInvoice.getVehicleSid(); + BusSalesOrderDetailsVo busSalesOrderDetailsVo = busSalesOrderFeign.selNewComSaleByVehSid(vehicleSid).getData(); + if (busSalesOrderDetailsVo == null){ + return rb.setMsg("暂无销售订单，不可移交"); + } + String staffSid = busSalesOrderDetailsVo.getStaffSid(); + SysUserVo sysUserVo1 = sysUserFeign.selectByStaffsid(staffSid).getData(); + //推送物品移交记录 + BusTransferRecordsDto busTransferRecordsDto = new BusTransferRecordsDto(); + MessagePushTransferDto messagePushTransferDto = new MessagePushTransferDto(); + busTransferRecordsDto.setGoodsSid(sid); + busTransferRecordsDto.setGoodsName("发票"); + busTransferRecordsDto.setVinNo(finVehicleInvoice.getVIN()); + busTransferRecordsDto.setTransferNum(1); + busTransferRecordsDto.setTransferSid(transferSid); + busTransferRecordsDto.setTransferName(sysUserVo.getName()); + busTransferRecordsDto.setTransferDeptSid(sysOrganizationVo.getSid()); + busTransferRecordsDto.setTransferDept(sysOrganizationVo.getName()); + busTransferRecordsDto.setGoodsType(BusTransferRecordEnum.FP.getRemarks()); + busTransferRecordsDto.setGoodsTypeKey(BusTransferRecordEnum.FP.getCode()); + if ("89d7f310-a221-405b-858e-dd650e0993d5".equals(dto.getReceiveRoleSid())){ + busTransferRecordsDto.setReceiveRoleSid(dto.getReceiveRoleSid()); + busTransferRecordsDto.setReceiveSid(sysUserVo1.getSid()); + busTransferRecordsDto.setReceiveName(sysUserVo1.getName()); + messagePushTransferDto.setReceiveSids(sysUserVo1.getSid()); + messagePushTransferDto.setReceiveNames(sysUserVo1.getName()); + }else { + busTransferRecordsDto.setReceiveRoleSid(dto.getReceiveRoleSid()); + String receiveRoleSid = dto.getReceiveRoleSid(); + String useOrgSid = finVehicleInvoice.getUseOrgSid(); + SysOrganizationVo sysOrganizationVo1 = sysOrganizationFeign.fetchBySid(useOrgSid).getData(); + String orgSidPath = sysOrganizationVo1.getOrgSidPath(); + List sysStaffOrgByUserVos = sysStaffOrgFeign.selAllByOrgPath(orgSidPath, receiveRoleSid).getData(); + String receiveSids = ""; + String receiveNames = ""; + for (SysStaffOrgByUserVo sysStaffOrgByUserVo : sysStaffOrgByUserVos) { + receiveSids = receiveSids + sysStaffOrgByUserVo.getSid() + ","; + receiveNames = receiveNames + sysStaffOrgByUserVo.getName() + ","; + } + messagePushTransferDto.setReceiveSids(receiveSids.substring(0,receiveSids.length() - 1)); + messagePushTransferDto.setReceiveNames(receiveNames.substring(0,receiveNames.length() - 1)); + } + busTransferRecordsDto.setUseOrgSid(finVehicleInvoice.getUseOrgSid()); + //移交附件 + String billingSid = finVehicleInvoice.getBillingSid(); + List finBillFileVos = finBillFileService.fetchFileByBillSid(billingSid); + List transferFiles = new ArrayList<>(); + if (!finBillFileVos.isEmpty()){ + for (FinBillFileVo finBillFileVo : finBillFileVos) { + transferFiles.add(finBillFileVo.getFileUrl()); + } + } + busTransferRecordsDto.setTransferFiles(transferFiles); + busTransferRecordsFeign.saveRecords(busTransferRecordsDto); + //消息推送 + messagePushTransferDto.setMsgTypeSid("bc59c198-2d51-458f-913e-cbd8d7ef4799"); + messagePushTransferDto.setMsgType("业务"); + messagePushTransferDto.setMsgTitle("发票移交"); + messagePushTransferDto.setMsgContent(sysUserVo.getName() + "推送的发票移交，请查看"); + messagePushTransferDto.setMsgSource("开票管理"); + messagePushTransferDto.setSenderDeptSid(transferSid); + messagePushTransferDto.setSenderName(sysUserVo.getName()); + messagePushTransferDto.setSenderDeptSid(sysOrganizationVo.getSid()); + messagePushTransferDto.setSenderDeptName(sysOrganizationVo.getName()); + messagePushTransferDto.setBusinessSid(sid); + messageFeign.pushTransferMessage(messagePushTransferDto); + baseMapper.updateTransferState(sid,CertificState.TransferState.TRANSTATE_YJZ.getCode(),CertificState.TransferState.TRANSTATE_YJZ.getRemarks()); + }else { + rb.setMsg("不符合移交条件"); + } + } + return rb.success(); + } + + public ResultBean invoiceYJCH(String[] sids) { + for (String sid : sids) { + FinVehicleInvoice finVehicleInvoice = fetchBySid(sid); + if (CertificState.TransferState.TRANSTATE_YJZ.getCode().equals(finVehicleInvoice.getTransferStateKey())){ + //busTransferRecordsFeign. + } + } + return null; + } } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgByUserVo.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgByUserVo.java new file mode 100644 index 0000000000..61a0718c59 --- /dev/null +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgByUserVo.java @@ -0,0 +1,30 @@ +package com.yxt.anrui.portal.api.sysstafforg; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SysStaffOrgVo.java
+ * Class: com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo
+ * Description: 员工部门关联表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:29
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "员工部门关联表 视图数据对象", description = "员工部门关联表 视图数据对象") +@Data +public class SysStaffOrgByUserVo implements Vo { + + @ApiModelProperty("sid") + private String sid; + @ApiModelProperty("员工姓名") + private String name; +} diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java index 119f47f917..18d3a345b6 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeign.java @@ -1,5 +1,6 @@ package com.yxt.anrui.portal.api.sysstafforg; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; @@ -109,4 +110,9 @@ public interface SysStaffOrgFeign { @ResponseBody @ApiOperation("根据用户组织全路径获取用户的分公司sid") ResultBean getOrgSidByPath(@RequestParam("orgPath") String orgPath); + + @PostMapping("/selAllByOrgPath") + @ResponseBody + @ApiOperation("根据分公司全路径和角色sid模糊查询本公司本角色下的所有员工userSid") + ResultBean> selAllByOrgPath(@RequestParam("orgSidPath") String orgSidPath,@RequestParam("roleSid") String roleSid); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java index 3cecb5db71..144c144455 100644 --- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java +++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysstafforg/SysStaffOrgFeignFallback.java @@ -100,6 +100,11 @@ public class SysStaffOrgFeignFallback implements SysStaffOrgFeign { return null; } + @Override + public ResultBean> selAllByOrgPath(String orgSidPath, String roleSid) { + return null; + } + @Override public ResultBean selectAllByStaffSid(String staffSid) { return null; diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java index 84e3b245a7..8b5471f7a7 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.java @@ -6,9 +6,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgByUserVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgDetailsVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo; import com.yxt.anrui.portal.api.sysuserdefaultorg.SysOrgPathList; +import com.yxt.common.core.result.ResultBean; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -113,4 +115,6 @@ public interface SysStaffOrgMapper extends BaseMapper { List selectStaffByOrgSid(@Param("orgSid") String sid, @Param("type") String type); List selectStaffByOrg(String orgSid); + + List selAllByOrgPath(@Param(Constants.WRAPPER) QueryWrapper qw); } \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.xml index de7b932f55..b7282d360f 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgMapper.xml @@ -21,8 +21,8 @@ select sso.orgSid, sso.orgName, sso.orgNamePath, sso.orgNamePath, sso.manageType, so.orgCode from sys_staff_org sso - left join sys_organization so on sso.orgSid = so.sid + left join sys_organization so on sso.orgSid = so.sid where sso.staffSid = #{sid} and sso.orgSid = #{orgSid} @@ -46,7 +46,7 @@ select orgSid from anrui_portal.sys_staff_org - where staffSid = #{applySid} and manageType = '3' - order by id desc - limit 1 + where staffSid = #{applySid} + and manageType = '3' + order by id desc limit 1 select orgSid from sys_staff_org so - left join sys_user su on su.staffSid = so.staffSid - left join sys_staffinfo si on si.sid = su.staffSid + left join sys_user su on su.staffSid = so.staffSid + left join sys_staffinfo si on si.sid = su.staffSid where so.manageType = '3' and su.sid = #{userSid} + + \ No newline at end of file diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgRest.java index 75b47cee5b..2f2f689dd2 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgRest.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgRest.java @@ -135,6 +135,11 @@ public class SysStaffOrgRest implements SysStaffOrgFeign { return sysStaffOrgService.getOrgSidByPath(orgPath); } + @Override + public ResultBean> selAllByOrgPath(String orgSidPath,String roleSid) { + return sysStaffOrgService.selAllByOrgPath(orgSidPath,roleSid); + } + @Override public ResultBean selectAllByStaffSid(String staffSid) { return sysStaffOrgService.selectAllByStaffSid(staffSid); diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java index 57223e8e8f..90c913ab5a 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstafforg/SysStaffOrgService.java @@ -316,4 +316,13 @@ public class SysStaffOrgService extends MybatisBaseService selectStaffByOrg(String orgSid) { return baseMapper.selectStaffByOrg(orgSid); } + + public ResultBean> selAllByOrgPath(String orgSidPath,String roleSid) { + ResultBean rb = ResultBean.fireFail(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("sur.roleSid",roleSid); + qw.like("sso.orgSidPath",orgSidPath); + List sysStaffOrgByUserVos = baseMapper.selAllByOrgPath(qw); + return rb.success().setData(sysStaffOrgByUserVos); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java index ec22f23bd7..c6c14e1ddf 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java @@ -462,6 +462,9 @@ public class AppBusAdvanceGinvoiceapplyService { //开票车辆信息 List finBillVehicleDtos = new ArrayList<>(); for (AppCarListDto vinListDto : vinList) { + if (StringUtils.isBlank(vinListDto.getInvoiceInfo())){ + return new ResultBean().fail().setMsg("开票信息不能为空"); + } FinBillVehicleDto finBillVehicleDto = new FinBillVehicleDto(); finBillVehicleDto.setVinNo(vinListDto.getVin()); finBillVehicleDto.setVehSid(vinListDto.getVinSid()); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java index dc2405cc35..74e5ecb7c1 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/invoiced/InvoicedService.java @@ -226,6 +226,9 @@ public class InvoicedService { List vinList = dto.getVinList(); List finBillVehicleDtos = new ArrayList<>(); for (VinListDto vinListDto : vinList) { + if (StringUtils.isBlank(vinListDto.getInvoiceInfo())){ + return new ResultBean().fail().setMsg("开票信息不能为空"); + } FinBillVehicleDto finBillVehicleDto = new FinBillVehicleDto(); finBillVehicleDto.setVinNo(vinListDto.getVin()); finBillVehicleDto.setVehSid(vinListDto.getVinSid()); diff --git a/doc/databases/fin_tables.sql b/doc/databases/fin_tables.sql index dd5b67a30e..8d7ae73dc5 100644 --- a/doc/databases/fin_tables.sql +++ b/doc/databases/fin_tables.sql @@ -1113,7 +1113,7 @@ CREATE TABLE `fin_vehicle_invoice` ( `invoiceTypeKey` varchar(32) DEFAULT NULL COMMENT '发票类别Key（01机动车销售统一发票/02增值税专用发票）', `invoiceType` varchar(64) DEFAULT NULL COMMENT '发票类别', `invoiceTitle` varchar(64) DEFAULT NULL COMMENT '开票单位', - `transferState` varchar(32) DEFAULT NULL COMMENT '移交状态：001未接收，002已接收,003待移交,004已移交', + `transferState` varchar(32) DEFAULT NULL COMMENT '移交状态：001未移交，002待移交,003移交中,004已移交', `customerName` varchar(64) DEFAULT NULL COMMENT '客户名称', `invoicingName` varchar(64) DEFAULT NULL COMMENT '开票名称', `contractNo` varchar(64) DEFAULT NULL COMMENT '合同编号', diff --git a/工作内容需要的文档/单据模板/销售出库单单据打印模板/xsckdjg1.ftl b/工作内容需要的文档/单据模板/销售出库单单据打印模板/xsckdjg1.ftl new file mode 100644 index 0000000000..125dd9ca26 --- /dev/null +++ b/工作内容需要的文档/单据模板/销售出库单单据打印模板/xsckdjg1.ftl @@ -0,0 +1,4631 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 销售出库单 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 销售类型： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${saleType!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 销售日期： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${saleDate!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 合同编号： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${conNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 单据编号： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${billNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 客户名称： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${cName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 销售部门： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${oName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 销售专员： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${sName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 物料编码 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 物料分组 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 车辆类型 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 单位 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 数量 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 成交价 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 返利人 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 返利金额 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 赠送套餐 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 销售折让 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 备注 + + + + + <#list wlList as wl> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.mnum!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.mgroup!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.vtype!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.iunit!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.sl!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.price!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.flr!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.flje!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.zstc!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.xszr!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.remarks!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 合计 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${zs!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${zcjj!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${zflje!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${zzstc!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${zxszr!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 金额合计 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${tPriceDX!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + 106 + 331 + 0 + 0 + 0 + false + false + 331 + WPS Office_11.1.0.14309_F1E327BC-269C-435d-A152-05C5408002CA + 0 + + + + + + + 2014-10-29T12:08:00Z + God + 文档存本地丢失不负责 + 2023-06-06T06:00:21Z + + + + + + + + 2052-11.1.0.14309 + + + 09815EE6C31142BFB0B809794AD0EFE9_13 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 制单人： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${makeName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 金融审批： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${jrsp!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 支持部审批 + + + + + + + + + + + + ： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${confirmName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + 第 + + + + + + PAGE \* MERGEFORMAT + + + + + + 1 + + + + + + 页 共 + + + + + + NUMPAGES \* + MERGEFORMAT + + + + + + 1 + + + + + + 页 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/工作内容需要的文档/单据模板/销售出库单单据打印模板/xsckdzks1.ftl b/工作内容需要的文档/单据模板/销售出库单单据打印模板/xsckdzks1.ftl new file mode 100644 index 0000000000..db50cef610 --- /dev/null +++ b/工作内容需要的文档/单据模板/销售出库单单据打印模板/xsckdzks1.ftl @@ -0,0 +1,4523 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 销售出库单 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 销售类型： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${saleType!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 销售日期： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${saleDate!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 合同编号： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${conNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 单据编号： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${billNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 客户名称： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${cName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 销售部门： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${oName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 销售专员： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${sName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 物料编码 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 物料分组 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 车辆类型 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 单位 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 数量 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 成交价 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 返利人 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 返利金额 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 赠送套餐 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 销售折让 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 备注 + + + + + <#list wlList as wl> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.mnum!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.mgroup!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.vtype!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.iunit!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.sl!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.price!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.flr!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.flje!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.zstc!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.xszr!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${wl.remarks!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 合计 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${zs!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${zcjj!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${zflje!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${zzstc!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${zxszr!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 金额合计 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${tPriceDX!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1 + 106 + 331 + 0 + 0 + 0 + false + false + 332 + WPS Office_11.1.0.14309_F1E327BC-269C-435d-A152-05C5408002CA + 0 + + + + + + + 2014-10-29T12:08:00Z + God + 文档存本地丢失不负责 + 2023-06-06T06:01:01Z + + + + + + + + 2052-11.1.0.14309 + + + 67233E7F30D14F96AEEAA73337E1C732_13 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 制单人： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${makeName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 金融审批： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${jrsp!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 支持部审批 + + + + + + + + + + + + ： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${confirmName!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/工作内容需要的文档/单据模板/销售出库单单据打印模板/销售出库单模板(激光打印机).doc b/工作内容需要的文档/单据模板/销售出库单单据打印模板/销售出库单模板(激光打印机).doc index 08cd9d6546..f637ce875a 100644 --- a/工作内容需要的文档/单据模板/销售出库单单据打印模板/销售出库单模板(激光打印机).doc +++ b/工作内容需要的文档/单据模板/销售出库单单据打印模板/销售出库单模板(激光打印机).doc @@ -1,8 +1,6 @@ |销售出库单 | -|销售类型：|${saleType!} |销售日期 |${saleDate!} |单据编号|${billNo!} | -| | |： | |： | | -|客户名称：|${cName!} |销售部门 |${oName!} |销售专员|${sName!} | +|销售类型：|${saleType!} |销售日期 |${saleDate!} |合同编号|${conNo!} | | | |： | |： | | |物料编码|物料分组 | diff --git a/工作内容需要的文档/单据模板/销售出库单单据打印模板/销售出库单模板(针式打印机).doc b/工作内容需要的文档/单据模板/销售出库单单据打印模板/销售出库单模板(针式打印机).doc index bb87cda8aa..7f2f500efb 100644 --- a/工作内容需要的文档/单据模板/销售出库单单据打印模板/销售出库单模板(针式打印机).doc +++ b/工作内容需要的文档/单据模板/销售出库单单据打印模板/销售出库单模板(针式打印机).doc @@ -1,12 +1,6 @@ |销售出库单 | -|销售类型： |${saleType!} |销售日期： |${saleDate!} |单据编号 |${billNo!} | -| | | | |： | | -|客户名称： |${cName!} |销售部门 |${oName!} |销售专员 |${sName!} | +|销售类型： |${saleType!} |销售日期 |${saleDate!} |合同编号 |${conNo!} | | | |： | |： | | |物料编码|物料分组 | ------------------------ -第 1 页 共 1 页 - -