Merge branch 'master_chujiang' into master_quotation

@@ -641,6 +641,9 @@ create table if not exists shipments_plan (
     update_time datetime default now() comment '更新时间'
     update_time datetime default now() comment '更新时间'
 );
 );
 
 
+ALTER TABLE `shipments_plan`
+    ADD COLUMN `business_office_auditor` varchar(32) DEFAULT NULL COMMENT '经营办审核人(发货计划提交人)';
+
 -- 发货明细
 -- 发货明细
 drop table if exists `shipments_plan_detail`;
 drop table if exists `shipments_plan_detail`;
 create table if not exists `shipments_plan_detail` (
 create table if not exists `shipments_plan_detail` (

@@ -311,6 +311,18 @@ public class GetPurchaseOrderInfoBo extends BaseBo<PurchaseOrderInfo> {
     private String contractCreateByName;
     private String contractCreateByName;
 
 
     /**
     /**
+     * 目的地(合同里的目的地)
+     */
+    @ApiModelProperty("目的地")
+    private String destination;
+
+    /**
+     * 下单人手机号(非持久化字段)
+     */
+    @ApiModelProperty("下单人手机号")
+    private String contractCreateByTelephone;
+
+    /**
      * 是否展示审核按钮(非持久化字段)
      * 是否展示审核按钮(非持久化字段)
      */
      */
     @ApiModelProperty("是否展示审核按钮")
     @ApiModelProperty("是否展示审核按钮")

@@ -175,6 +175,8 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
         }
         }
 
 
         GetPurchaseOrderInfoBo result = new GetPurchaseOrderInfoBo(data);
         GetPurchaseOrderInfoBo result = new GetPurchaseOrderInfoBo(data);
+        //目的地
+        result.setDestination(ExcelUtil.buildPrintDestination(data.getContractType(), data.getDestination(), data.getForeignDestination()));
         // 判断 contractCreateById 是否等于当前用户 ID
         // 判断 contractCreateById 是否等于当前用户 ID
         String currentUserId = SecurityUtil.getCurrentUser().getId();
         String currentUserId = SecurityUtil.getCurrentUser().getId();
         boolean isCreateBy = false;
         boolean isCreateBy = false;

@@ -144,7 +144,7 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
      * 填写实际发货日期
      * 填写实际发货日期
      */
      */
     @ApiOperation("填写实际发货日期")
     @ApiOperation("填写实际发货日期")
-    @HasPermission({"shipping-plan-manage:invoice:modify"})
+    @HasPermission({"shipping-plan-manage:invoice:fill-date"})
     @PutMapping
     @PutMapping
     public InvokeResult<Void> update(@Valid UpdateShipmentsOrderInfoVo vo) {
     public InvokeResult<Void> update(@Valid UpdateShipmentsOrderInfoVo vo) {
         shipmentsOrderInfoService.updateShipmentDate(vo);
         shipmentsOrderInfoService.updateShipmentDate(vo);
@@ -249,6 +249,7 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
     @Scheduled(cron = "0 8 0 * * ?")
     @Scheduled(cron = "0 8 0 * * ?")
     public InvokeResult<Void> dataHandler() {
     public InvokeResult<Void> dataHandler() {
         // 只处理今日应该发货但状态仍是未发货的数据，避免已签收/已发货的数据被重复处理
         // 只处理今日应该发货但状态仍是未发货的数据，避免已签收/已发货的数据被重复处理
+        log.info("=========定时任务开始执行========");
         List<ShipmentsOrderInfo> shipmentsOrderInfoList = shipmentsOrderInfoService.queryUnShipmentsByShipmentDate(LocalDate.now());
         List<ShipmentsOrderInfo> shipmentsOrderInfoList = shipmentsOrderInfoService.queryUnShipmentsByShipmentDate(LocalDate.now());
         if (CollectionUtils.isNotEmpty(shipmentsOrderInfoList)) {
         if (CollectionUtils.isNotEmpty(shipmentsOrderInfoList)) {
             for (ShipmentsOrderInfo  orderInfo : shipmentsOrderInfoList) {
             for (ShipmentsOrderInfo  orderInfo : shipmentsOrderInfoList) {
@@ -400,9 +401,9 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
             // 发货单明细开始行
             // 发货单明细开始行
             int startRow = 4;
             int startRow = 4;
             DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
             DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-            for (int i = startRow + 1; i < startRow + detailList.size(); i++) {
-                ExcelUtil.copyRow(workbook, sheet, startRow, i);
-            }
+//            for (int i = startRow + 1; i < startRow + detailList.size(); i++) {
+//                ExcelUtil.copyRow(workbook, sheet, startRow, i);
+//            }
             BigDecimal totalQuantity = BigDecimal.ZERO;
             BigDecimal totalQuantity = BigDecimal.ZERO;
             BigDecimal totalActualQuantity = BigDecimal.ZERO;
             BigDecimal totalActualQuantity = BigDecimal.ZERO;
             BigDecimal totalNum = BigDecimal.ZERO;
             BigDecimal totalNum = BigDecimal.ZERO;
@@ -510,9 +511,9 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
                     formulaComponent.setSub(detail.getLengthTolNeg());
                     formulaComponent.setSub(detail.getLengthTolNeg());
                     formulaComponentList.add(formulaComponent);
                     formulaComponentList.add(formulaComponent);
                 }
                 }
-                String latex = LatexFormulaExcelExporterUtil.convertToLatex(formulaComponentList);
+                String latex = LatexFormulaExcelExporterUtil.convertToContractSpecLatexSingleLineFixed3(formulaComponentList);
                 if (StringUtils.isNotBlank(latex)) {
                 if (StringUtils.isNotBlank(latex)) {
-                    LatexFormulaExcelExporterUtil.insertLatexImageToCell(workbook, sheet, latex, startRow, 2, 1, 7);
+                    LatexFormulaExcelExporterUtil.insertLatexImageToCellLeftAligned(workbook, sheet, latex, startRow, 2, 1, 7);
                 }
                 }
                 String materialCode = resultMaterialMap.get(detail.getOrderSpecId());
                 String materialCode = resultMaterialMap.get(detail.getOrderSpecId());
                 ExcelUtil.setCellValue(sheet, startRow, 9, materialCode);
                 ExcelUtil.setCellValue(sheet, startRow, 9, materialCode);

@@ -312,6 +312,12 @@ public class PurchaseOrderInfo extends BaseEntity implements BaseDto {
     @TableField(exist = false)
     @TableField(exist = false)
     private String contractCreateByName;
     private String contractCreateByName;
 
 
+    /**
+     * 下单人手机号(非持久化字段)
+     */
+    @TableField(exist = false)
+    private String contractCreateByTelephone;
+
 
 
     /**
     /**
      * 是否展示审核按钮(非持久化字段)
      * 是否展示审核按钮(非持久化字段)

@@ -58,6 +58,11 @@ public class ShipmentsPlan extends BaseEntity implements BaseDto {
     private Boolean autoGenerate;
     private Boolean autoGenerate;
 
 
     /**
     /**
+     * 经营办审核人(发货计划提交人)
+     */
+    private String businessOfficeAuditor;
+
+    /**
      * 创建人ID
      * 创建人ID
      */
      */
     @TableField(fill = FieldFill.INSERT)
     @TableField(fill = FieldFill.INSERT)

@@ -116,6 +116,10 @@ public class ShipmentsPlanServiceImpl extends BaseMpServiceImpl<ShipmentsPlanMap
         LambdaUpdateWrapper<ShipmentsPlan> updateWrapper = Wrappers.lambdaUpdate(ShipmentsPlan.class)
         LambdaUpdateWrapper<ShipmentsPlan> updateWrapper = Wrappers.lambdaUpdate(ShipmentsPlan.class)
                 .set(ShipmentsPlan::getStatus, vo.getStatus())
                 .set(ShipmentsPlan::getStatus, vo.getStatus())
                 .eq(ShipmentsPlan::getId, vo.getId());
                 .eq(ShipmentsPlan::getId, vo.getId());
+        // 状态为审核中(CHECKING)时，记录当前提交人作为经营办审核人
+        if ("CHECKING".equals(vo.getStatus())) {
+            updateWrapper.set(ShipmentsPlan::getBusinessOfficeAuditor, SecurityUtil.getCurrentUser().getId());
+        }
 
 
         getBaseMapper().update(updateWrapper);
         getBaseMapper().update(updateWrapper);
 
 

@@ -20,6 +20,7 @@ import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.xingyun.sc.entity.*;
 import com.lframework.xingyun.sc.entity.*;
 import com.lframework.xingyun.sc.mappers.CarRequestPlanMapper;
 import com.lframework.xingyun.sc.mappers.CarRequestPlanMapper;
+import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanService;
 import com.lframework.xingyun.sc.service.shipments.car.CarRequestPlanService;
 import com.lframework.xingyun.sc.service.shipments.car.CarRequestPlanService;
 import com.lframework.xingyun.sc.service.shipments.car.DraftRequestCarTicketService;
 import com.lframework.xingyun.sc.service.shipments.car.DraftRequestCarTicketService;
 import com.lframework.xingyun.sc.service.shipments.car.RequestCarTicketService;
 import com.lframework.xingyun.sc.service.shipments.car.RequestCarTicketService;
@@ -44,6 +45,8 @@ public class CarRequestPlanServiceImpl extends BaseMpServiceImpl<CarRequestPlanM
     private RequestCarTicketService requestCarTicketService;
     private RequestCarTicketService requestCarTicketService;
     @Resource
     @Resource
     private DraftRequestCarTicketService draftRequestCarTicketService;
     private DraftRequestCarTicketService draftRequestCarTicketService;
+    @Resource
+    private ShipmentsPlanService shipmentsPlanService;
 
 
     @Override
     @Override
     public PageResult<CarRequestPlan> query(Integer pageIndex, Integer pageSize, QueryCarRequestPlanVo vo) {
     public PageResult<CarRequestPlan> query(Integer pageIndex, Integer pageSize, QueryCarRequestPlanVo vo) {
@@ -157,6 +160,11 @@ public class CarRequestPlanServiceImpl extends BaseMpServiceImpl<CarRequestPlanM
         List<DraftRequestCarTicket> draftTickets = draftRequestCarTicketService.listByOrderId(orderIds);
         List<DraftRequestCarTicket> draftTickets = draftRequestCarTicketService.listByOrderId(orderIds);
         Map<String, DraftRequestCarTicket> draftTicketMap = draftTickets.stream().collect(Collectors.toMap(DraftRequestCarTicket::getPurchaseOrderId, Function.identity()
         Map<String, DraftRequestCarTicket> draftTicketMap = draftTickets.stream().collect(Collectors.toMap(DraftRequestCarTicket::getPurchaseOrderId, Function.identity()
                 , (v1, v2) -> v2));
                 , (v1, v2) -> v2));
+        // 获取发货计划，取经营办审核人(发货计划提交人)
+        ShipmentsPlan shipmentsPlan = null;
+        if (StringUtil.isNotBlank(shipmentsOrderInfo.getPlanId())) {
+            shipmentsPlan = shipmentsPlanService.findById(shipmentsOrderInfo.getPlanId());
+        }
         for (PurchaseOrderInfo orderInfo : orderInfoList) {
         for (PurchaseOrderInfo orderInfo : orderInfoList) {
             // 生成要车计划
             // 生成要车计划
             LocalDate requestCarDate = shipmentsOrderInfo.getShipmentsDate();
             LocalDate requestCarDate = shipmentsOrderInfo.getShipmentsDate();
@@ -185,8 +193,8 @@ public class CarRequestPlanServiceImpl extends BaseMpServiceImpl<CarRequestPlanM
             ticketVo.setShipmentsOrderId(shipmentsOrderInfo.getId());
             ticketVo.setShipmentsOrderId(shipmentsOrderInfo.getId());
             // 外办审核人(草稿要车单审核人)
             // 外办审核人(草稿要车单审核人)
             ticketVo.setExternalAuditor(draftTicket.getExternalAuditor());
             ticketVo.setExternalAuditor(draftTicket.getExternalAuditor());
-            // 经营办审核人(发货计划提交人)
-            ticketVo.setBusinessOfficeAuditor(SecurityUtil.getCurrentUser().getId());
+            // 经营办审核人(发货计划提交人，取自发货计划)
+            ticketVo.setBusinessOfficeAuditor(shipmentsPlan != null ? shipmentsPlan.getBusinessOfficeAuditor() : null);
             ticketVo.setDestination(draftTicket.getDestination());
             ticketVo.setDestination(draftTicket.getDestination());
             ticketVo.setConsignee(draftTicket.getConsignee());
             ticketVo.setConsignee(draftTicket.getConsignee());
             ticketVo.setPhone(draftTicket.getPhone());
             ticketVo.setPhone(draftTicket.getPhone());

@@ -49,6 +49,7 @@
         <result column="packaging_fee" property="packagingFee"/>
         <result column="packaging_fee" property="packagingFee"/>
         <result column="contract_create_by_id" property="contractCreateById"/>
         <result column="contract_create_by_id" property="contractCreateById"/>
         <result column="contract_create_by_name" property="contractCreateByName"/>
         <result column="contract_create_by_name" property="contractCreateByName"/>
+        <result column="contract_create_by_telephone" property="contractCreateByTelephone"/>
         <result column="sample_order" property="sampleOrder"/>
         <result column="sample_order" property="sampleOrder"/>
         <result column="warranty_certificate_file_id" property="warrantyCertificateFileId"/>
         <result column="warranty_certificate_file_id" property="warrantyCertificateFileId"/>
         <result column="warranty_certificate_file_name" property="warrantyCertificateFileName"/>
         <result column="warranty_certificate_file_name" property="warrantyCertificateFileName"/>
@@ -108,6 +109,7 @@
             tb.packaging_fee,
             tb.packaging_fee,
             tb.contract_create_by_id,
             tb.contract_create_by_id,
             su.name as contract_create_by_name,
             su.name as contract_create_by_name,
+            su.telephone as contract_create_by_telephone,
             tb.freeze,
             tb.freeze,
             tb.sample_order,
             tb.sample_order,
             tb.warranty_certificate_file_id,
             tb.warranty_certificate_file_id,

@@ -10,6 +10,7 @@
         <result column="tomo_pre_ship_date" property="tomoPreShipDate"/>
         <result column="tomo_pre_ship_date" property="tomoPreShipDate"/>
         <result column="af_tomo_pre_ship_date" property="afTomoPreShipDate"/>
         <result column="af_tomo_pre_ship_date" property="afTomoPreShipDate"/>
         <result column="auto_generate" property="autoGenerate"/>
         <result column="auto_generate" property="autoGenerate"/>
+        <result column="business_office_auditor" property="businessOfficeAuditor"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by_id" property="createById"/>
         <result column="update_by_id" property="updateById"/>
         <result column="update_by_id" property="updateById"/>
         <result column="create_time" property="createTime"/>
         <result column="create_time" property="createTime"/>
@@ -25,6 +26,7 @@
             tb.tomo_pre_ship_date,
             tb.tomo_pre_ship_date,
             tb.af_tomo_pre_ship_date,
             tb.af_tomo_pre_ship_date,
             tb.auto_generate,
             tb.auto_generate,
+            tb.business_office_auditor,
             tb.create_by_id,
             tb.create_by_id,
             tb.update_by_id,
             tb.update_by_id,
             tb.create_time,
             tb.create_time,
@@ -58,7 +60,7 @@
         ORDER BY tb.create_time DESC
         ORDER BY tb.create_time DESC
     </select>
     </select>
 
 
-    <select id="getById" resultType="com.lframework.xingyun.sc.entity.ShipmentsPlan">
+    <select id="getById" resultMap="ShipmentsPlan">
         <include refid="ShipmentsPlan_sql"/>
         <include refid="ShipmentsPlan_sql"/>
         <where>
         <where>
             AND tb.id = #{id}
             AND tb.id = #{id}