Merge remote-tracking branch 'origin/master_0929' into master_0929

@@ -280,9 +280,15 @@ create table `tbl_replenishment_order_line`
     `replenishment_order_id`  varchar(32) NOT NULL COMMENT '补货单',
     `purchase_order_line_id`  varchar(32) NOT NULL COMMENT '订货单表物料行ID',
     `brand`                   varchar(100) COMMENT '牌号',
-    `thickness`               decimal(10, 4) COMMENT '厚度',
-    `width`                   decimal(10, 4) COMMENT '宽度',
-    `length`                  decimal(10, 4) COMMENT '长度',
+    `thickness`               DECIMAL(10, 4) COMMENT '厚度',
+    `thickness_tol_pos`       DECIMAL(10, 4) COMMENT '厚度公差正',
+    `thickness_tol_neg`       DECIMAL(10, 4) COMMENT '厚度公差负',
+    `width`                   DECIMAL(10, 4) COMMENT '宽度',
+    `width_tol_pos`           DECIMAL(10, 4) COMMENT '宽度公差正',
+    `width_tol_neg`           DECIMAL(10, 4) COMMENT '宽度公差负',
+    `length`                  DECIMAL(10, 4) COMMENT '长度',
+    `length_tol_pos`          DECIMAL(10, 4) COMMENT '长度公差正',
+    `length_tol_neg`          DECIMAL(10, 4) COMMENT '长度公差负',
     `status`                  varchar(50) COMMENT '状态',
     `quantity`                decimal(15, 4) COMMENT '需发(t)',
     `shipped_quantity`        decimal(15, 4) COMMENT '实发(t)',

@@ -49,18 +49,54 @@ public class GetReplenishmentOrderLineBo extends BaseBo<ReplenishmentOrderLine>
     private BigDecimal thickness;
 
     /**
+     * 厚度公差正
+     */
+    @ApiModelProperty("厚度公差正")
+    private BigDecimal thicknessTolPos;
+
+    /**
+     * 厚度公差负
+     */
+    @ApiModelProperty("厚度公差负")
+    private BigDecimal thicknessTolNeg;
+
+    /**
      * 宽度
      */
     @ApiModelProperty("宽度")
     private BigDecimal width;
 
     /**
+     * 宽度公差正
+     */
+    @ApiModelProperty("宽度公差正")
+    private BigDecimal widthTolPos;
+
+    /**
+     * 宽度公差负
+     */
+    @ApiModelProperty("宽度公差负")
+    private BigDecimal widthTolNeg;
+
+    /**
      * 长度
      */
     @ApiModelProperty("长度")
     private BigDecimal length;
 
     /**
+     * 长度公差正
+     */
+    @ApiModelProperty("长度公差正")
+    private BigDecimal lengthTolPos;
+
+    /**
+     * 长度公差负
+     */
+    @ApiModelProperty("长度公差负")
+    private BigDecimal lengthTolNeg;
+
+    /**
      * 状态
      */
     @ApiModelProperty("状态")

@@ -64,6 +64,20 @@ public class GetDelayedShipmentBo extends BaseBo<DelayedShipment> {
     @ApiModelProperty("延期发货详情")
     private List<DelayedShipmentDetail> delayedShipmentDetailList;
 
+    /**
+     * 是否展示审核按钮(非持久化字段)
+     */
+    @ApiModelProperty("是否展示审核按钮")
+    private Boolean showExamine;
+
+    /**
+     * 是否是创建人(非持久化字段)
+     */
+    @ApiModelProperty("是否展示审核按钮")
+    private Boolean delayedCreateBy;
+
+
+
     public GetDelayedShipmentBo() {
 
     }

@@ -55,6 +55,7 @@ import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.util.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -613,6 +614,14 @@ public class ContractDistributorStandardController extends DefaultBaseController
         return InvokeResultBuilder.success();
     }
 
+    @ApiModelProperty("合同规范补充提醒")
+    @GetMapping("/supplementContractSpecReminder")
+    @Scheduled(cron = "0 20 0 * * ?")
+    public InvokeResult<Void> supplementContractSpecReminder() {
+        contractDistributorStandardService.supplementContractSpecReminder();
+        return InvokeResultBuilder.success();
+    }
+
     /**
      * 标准合同模版打印
      */

@@ -199,7 +199,7 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
      * 新增
      */
     @ApiOperation("新增")
-    @HasPermission({"purchaseOrderInfo:purchaseorderinfo:add"})
+    @HasPermission({"order-manage:order-list:add"})
     @PostMapping("/create")
     public InvokeResult<Void> create(@Valid @RequestBody CreatePurchaseOrderInfoVo vo) {
 
@@ -240,7 +240,7 @@ public class PurchaseOrderInfoController extends DefaultBaseController {
      */
     @ApiOperation("根据ID删除")
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
-    @HasPermission({"purchaseOrderInfo:purchaseorderinfo:delete"})
+    @HasPermission({"order-manage:order-list:delete"})
     @DeleteMapping("/deleteById")
     public InvokeResult<Void> deleteById(@NotBlank(message = "id不能为空！") String id) {
 

@@ -67,7 +67,7 @@ public class CarRequestPlanController extends DefaultBaseController {
      * 查询列表
      */
     @ApiOperation("查询列表")
-    @HasPermission({"carRequestPlan:carrequestplan:query"})
+    @HasPermission({"shipping-plan-manage:car-request-plan:query"})
     @GetMapping("/query")
     public InvokeResult<PageResult<GetCarRequestPlanBo>> query(@Valid QueryCarRequestPlanVo vo) {
 
@@ -88,7 +88,7 @@ public class CarRequestPlanController extends DefaultBaseController {
      */
     @ApiOperation("根据ID查询")
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
-    @HasPermission({"carRequestPlan:carrequestplan:query"})
+    @HasPermission({"shipping-plan-manage:car-request-plan:query"})
     @GetMapping
     public InvokeResult<GetCarRequestPlanBo> get(@NotBlank(message = "id不能为空！") String id) {
 
@@ -106,7 +106,7 @@ public class CarRequestPlanController extends DefaultBaseController {
      * 新增
      */
     @ApiOperation("新增")
-    @HasPermission({"carRequestPlan:carrequestplan:add"})
+    @HasPermission({"shipping-plan-manage:car-request-plan:add"})
     @PostMapping
     public InvokeResult<Void> create(@Valid @RequestBody CreateCarRequestPlanVo vo) {
 
@@ -119,7 +119,7 @@ public class CarRequestPlanController extends DefaultBaseController {
      * 修改
      */
     @ApiOperation("修改")
-    @HasPermission({"carRequestPlan:carrequestplan:modify"})
+    @HasPermission({"shipping-plan-manage:car-request-plan:modify", "shipping-plan-manage:car-request-plan:remark"})
     @PutMapping
     public InvokeResult<Void> update(@Valid @RequestBody UpdateCarRequestPlanVo vo) {
 
@@ -133,7 +133,7 @@ public class CarRequestPlanController extends DefaultBaseController {
      */
     @ApiOperation("根据ID删除")
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
-    @HasPermission({"carRequestPlan:carrequestplan:delete"})
+    @HasPermission({"shipping-plan-manage:car-request-plan:delete"})
     @DeleteMapping
     public InvokeResult<Void> deleteById(@NotBlank(message = "id不能为空！") String id) {
 

@@ -44,7 +44,7 @@ public class RequestCarTicketController extends DefaultBaseController {
      * 查询列表
      */
     @ApiOperation("查询列表")
-    @HasPermission({"requestCarTicket:requestcarticket:query"})
+    @HasPermission({"shipping-plan-manage:car-request-order:query"})
     @GetMapping("/query")
     public InvokeResult<PageResult<GetRequestCarTicketBo>> query(@Valid QueryRequestCarTicketVo vo) {
 
@@ -65,7 +65,7 @@ public class RequestCarTicketController extends DefaultBaseController {
      */
     @ApiOperation("根据ID查询")
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
-    @HasPermission({"requestCarTicket:requestcarticket:query"})
+    @HasPermission({"shipping-plan-manage:car-request-order:query"})
     @GetMapping
     public InvokeResult<GetRequestCarTicketBo> get(@NotBlank(message = "id不能为空！") String id) {
 
@@ -83,7 +83,7 @@ public class RequestCarTicketController extends DefaultBaseController {
      * 新增
      */
     @ApiOperation("新增")
-    @HasPermission({"requestCarTicket:requestcarticket:add"})
+    @HasPermission({"shipping-plan-manage:car-request-order:add"})
     @PostMapping
     public InvokeResult<Void> create(@Valid @RequestBody CreateRequestCarTicketVo vo) {
 
@@ -96,7 +96,7 @@ public class RequestCarTicketController extends DefaultBaseController {
      * 修改
      */
     @ApiOperation("修改")
-    @HasPermission({"requestCarTicket:requestcarticket:modify"})
+    @HasPermission({"shipping-plan-manage:car-request-order:modify"})
     @PutMapping
     public InvokeResult<Void> update(@Valid @RequestBody UpdateRequestCarTicketVo vo) {
 
@@ -109,7 +109,7 @@ public class RequestCarTicketController extends DefaultBaseController {
      * 取消
      */
     @ApiOperation("取消")
-    @HasPermission({"purchaseOrderRevoke:purchaseorderrevoke:cancel"})
+    @HasPermission({"shipping-plan-manage:car-request-order:cancel"})
     @GetMapping("/cancel")
     public InvokeResult<Void> cancel(@NotBlank(message = "id不能为空！") String id) {
 
@@ -123,7 +123,7 @@ public class RequestCarTicketController extends DefaultBaseController {
      */
     @ApiOperation("根据ID删除")
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
-    @HasPermission({"requestCarTicket:requestcarticket:delete"})
+    @HasPermission({"shipping-plan-manage:car-request-order:delete"})
     @DeleteMapping
     public InvokeResult<Void> deleteById(@NotBlank(message = "id不能为空！") String id) {
 

 package com.lframework.xingyun.sc.controller.shipments.delay;
 
 import com.lframework.starter.web.core.annotations.security.HasPermission;
+import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.components.resp.PageResult;
@@ -48,7 +49,7 @@ public class DelayedShipmentController extends DefaultBaseController {
      * 查询列表
      */
     @ApiOperation("查询列表")
-    @HasPermission({"delayedShipment:delayedshipment:query"})
+    @HasPermission({"shipping-plan-manage:delay-invoice:query"})
     @GetMapping("/query")
     public InvokeResult<PageResult<GetDelayedShipmentBo>> query(@Valid QueryDelayedShipmentVo vo) {
 
@@ -58,7 +59,18 @@ public class DelayedShipmentController extends DefaultBaseController {
         List<GetDelayedShipmentBo> results = null;
 
         if (!CollectionUtil.isEmpty(datas)) {
-            results = datas.stream().map(GetDelayedShipmentBo::new).collect(Collectors.toList());
+            String currentUserId = SecurityUtil.getCurrentUser().getId();
+
+            results = datas.stream().map(delayedShipment -> {
+                GetDelayedShipmentBo bo = new GetDelayedShipmentBo(delayedShipment);
+                // 判断 createById 是否等于当前用户 ID
+                boolean isCreateBy = false;
+                if (currentUserId.equals(delayedShipment.getCreateById())) {
+                    isCreateBy = true;
+                }
+                bo.setDelayedCreateBy(isCreateBy);
+                return bo;
+            }).collect(Collectors.toList());
         }
 
         return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results));
@@ -69,7 +81,9 @@ public class DelayedShipmentController extends DefaultBaseController {
      */
     @ApiOperation("根据ID查询")
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
-    @HasPermission({"delayedShipment:delayedshipment:query"})
+    @HasPermission({"shipping-plan-manage:delay-invoice:query",
+            "shipping-plan-manage:delay-invoice:approve",
+            "shipping-plan-manage:delay-invoice:review"})
     @GetMapping
     public InvokeResult<GetDelayedShipmentBo> get(@NotBlank(message = "id不能为空！") String id) {
 
@@ -91,7 +105,7 @@ public class DelayedShipmentController extends DefaultBaseController {
      * 新增
      */
     @ApiOperation("新增")
-    @HasPermission({"delayedShipment:delayedshipment:add"})
+    @HasPermission({"shipping-plan-manage:delay-invoice:add"})
     @PostMapping
     public InvokeResult<Void> create(@Valid @RequestBody CreateDelayedShipmentVo vo) {
 
@@ -104,7 +118,7 @@ public class DelayedShipmentController extends DefaultBaseController {
      * 修改
      */
     @ApiOperation("修改")
-    @HasPermission({"delayedShipment:delayedshipment:modify"})
+    @HasPermission({"shipping-plan-manage:delay-invoice:modify"})
     @PutMapping
     public InvokeResult<Void> update(@Valid @RequestBody UpdateDelayedShipmentVo vo) {
 
@@ -114,11 +128,24 @@ public class DelayedShipmentController extends DefaultBaseController {
     }
 
     /**
+     * 取消
+     */
+    @ApiOperation("取消")
+    @HasPermission({"shipping-plan-manage:delay-invoice:cancel"})
+    @GetMapping("/cancel")
+    public InvokeResult<Void> cancel(@NotBlank(message = "id不能为空！") String id) {
+
+        delayedShipmentService.updateStatus(id, "CANCEL");
+
+        return InvokeResultBuilder.success();
+    }
+
+    /**
      * 根据ID删除
      */
     @ApiOperation("根据ID删除")
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
-    @HasPermission({"delayedShipment:delayedshipment:delete"})
+    @HasPermission({"shipping-plan-manage:delay-invoice:delete"})
     @DeleteMapping
     public InvokeResult<Void> deleteById(@NotBlank(message = "id不能为空！") String id) {
 

@@ -66,6 +66,12 @@ public class DelayedShipment extends BaseEntity implements BaseDto {
     private List<DelayedShipmentDetail> delayedShipmentDetailList;
 
     /**
+     * 是否展示审核按钮(非持久化字段)
+     */
+    @TableField(exist = false)
+    private Boolean showExamine = false;
+
+    /**
      * 创建人ID
      */
     @TableField(fill = FieldFill.INSERT)

@@ -117,6 +117,12 @@ public class DelayedShipmentDetail extends BaseEntity implements BaseDto {
     private String delayReason;
 
     /**
+     * 合同创建人
+     */
+    @TableField(exist = false)
+    private String contractCreateById;
+
+    /**
      * 创建人ID
      */
     @TableField(fill = FieldFill.INSERT)

@@ -50,16 +50,46 @@ public class ReplenishmentOrderLine extends BaseEntity implements BaseDto {
     private BigDecimal thickness;
 
     /**
+     * 厚度公差正
+     */
+    private BigDecimal thicknessTolPos;
+
+    /**
+     * 厚度公差负
+     */
+    private BigDecimal thicknessTolNeg;
+
+    /**
      * 宽度
      */
     private BigDecimal width;
 
     /**
+     * 宽度公差正
+     */
+    private BigDecimal widthTolPos;
+
+    /**
+     * 宽度公差负
+     */
+    private BigDecimal widthTolNeg;
+
+    /**
      * 长度
      */
     private BigDecimal length;
 
     /**
+     * 长度公差正
+     */
+    private BigDecimal lengthTolPos;
+
+    /**
+     * 长度公差负
+     */
+    private BigDecimal lengthTolNeg;
+
+    /**
      * 状态
      */
     private String status;

@@ -9,9 +9,14 @@ import com.lframework.starter.bpm.mappers.FlowTaskWrapperMapper;
 import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
 import com.lframework.starter.bpm.vo.flow.task.QueryTodoTaskListVo;
 import com.lframework.starter.common.utils.StringUtil;
+import com.lframework.starter.mq.core.service.MqProducerService;
 import com.lframework.starter.web.core.components.security.SecurityUtil;
+import com.lframework.starter.web.inner.dto.message.SysSiteMessageDto;
 import com.lframework.starter.web.inner.entity.SysDataDicItem;
 import com.lframework.starter.web.inner.service.system.SysDataDicItemService;
+import com.lframework.starter.web.inner.service.system.SysUserRoleService;
+import com.lframework.xingyun.basedata.entity.Workshop;
+import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
 import com.lframework.xingyun.sc.controller.contract.ContractDistributorStandardController;
 import com.lframework.xingyun.sc.entity.*;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
@@ -81,6 +86,12 @@ public class ContractDistributorStandardServiceImpl extends
     private ContractFrameworkService contractFrameworkService;
     @Resource
     private SysDataDicItemService sysDataDicItemService;
+    @Resource
+    private SysUserRoleService sysUserRoleService;
+    @Resource
+    private WorkshopService workshopService;
+    @Autowired
+    private MqProducerService mqProducerService;
 
     @Override
     public PageResult<ContractDistributorStandard> query(Integer pageIndex, Integer pageSize, QueryContractDistributorStandardVo vo) {
@@ -1037,6 +1048,112 @@ public class ContractDistributorStandardServiceImpl extends
         return getBaseMapper().getContractSigned(buyerList);
     }
 
+    @Override
+    public void supplementContractSpecReminder() {
+        Wrapper<ContractDistributorStandard> wrapper = Wrappers.lambdaQuery(ContractDistributorStandard.class)
+                .in(ContractDistributorStandard::getFormalApproved, Arrays.asList("REFUSE", "CANCEL"))
+                .or()
+                .in(ContractDistributorStandard::getStandardApproved, Arrays.asList("REFUSE", "CANCEL"));
+        List<ContractDistributorStandard> contractDistributorStandardList = list(wrapper);
+        if (CollectionUtils.isEmpty(contractDistributorStandardList)) {
+            return;
+        }
+
+        Set<String> workshopIds = contractDistributorStandardList
+                .stream()
+                .map(ContractDistributorStandard::getWorkshopId)
+                .collect(Collectors.toSet());
+        List<Workshop> workshopList = workshopService.listByIds(workshopIds);
+        Map<String, String> workshopIdAndCodeMap = CollectionUtils.emptyIfNull(workshopList)
+                .stream()
+                .collect(Collectors.toMap(Workshop::getId, Workshop::getCode));
+        Map<String, String> workshopCodeAndJybzgCodeMap = new HashMap<>(4);
+        workshopCodeAndJybzgCodeMap.put("yfc", "yfcjybzg"); // 一分厂
+        workshopCodeAndJybzgCodeMap.put("efc", "efcjybzg"); // 二分厂
+        workshopCodeAndJybzgCodeMap.put("sfc", "sfcjybzg"); // 三分厂
+        workshopCodeAndJybzgCodeMap.put("ztfc", "ztcjybzg"); // 四分厂
+        Map<String, List<String>> jybzgCodeAndUserIdMap = new HashMap<>(4);
+        jybzgCodeAndUserIdMap.put("yfcjybzg", sysUserRoleService.listUserIdByRoleCodes(Collections.singletonList("yfcjybzg")));
+        jybzgCodeAndUserIdMap.put("efcjybzg", sysUserRoleService.listUserIdByRoleCodes(Collections.singletonList("efcjybzg")));
+        jybzgCodeAndUserIdMap.put("sfcjybzg", sysUserRoleService.listUserIdByRoleCodes(Collections.singletonList("sfcjybzg")));
+        jybzgCodeAndUserIdMap.put("ztcjybzg", sysUserRoleService.listUserIdByRoleCodes(Collections.singletonList("ztcjybzg")));
+
+        List<String> bsczgUserIdList = sysUserRoleService.listUserIdByRoleCodes(Collections.singletonList("bsczg"));
+        contractDistributorStandardList.forEach(contractDistributorStandard -> {
+            try {
+                StringBuilder stringBuilder = new StringBuilder("您的");
+                if ("DISTRIB_STD".equals(contractDistributorStandard.getType())) {
+                    stringBuilder.append("经销标准合同");
+                } else if ("DIST_STOCK_CONTRACT".equals(contractDistributorStandard.getType())) {
+                    stringBuilder.append("经销库存合同");
+                } else if ("DRAFT_DIST_AGMT".equals(contractDistributorStandard.getType())) {
+                    stringBuilder.append("经销未锁规合同");
+                } else if ("INTL_STD_CONTRACT".equals(contractDistributorStandard.getType())) {
+                    stringBuilder.append("外贸标准合同");
+                } else if ("INTL_INVENTORY_AGMT".equals(contractDistributorStandard.getType())) {
+                    stringBuilder.append("外贸库存合同");
+                } else if ("INTL_OPEN_SPEC_AGMT".equals(contractDistributorStandard.getType())) {
+                    stringBuilder.append("外贸未锁规格合同");
+                } else if ("PROCESS_STD_AGMT".equals(contractDistributorStandard.getType())) {
+                    stringBuilder.append("加工标准合同");
+                }
+
+                stringBuilder.append("（");
+                LocalDate lastApprovedTime = LocalDate.now();
+                if ("FORMAL".equals(contractDistributorStandard.getStatus())) {
+                    if (!"REFUSE".equals(contractDistributorStandard.getFormalApproved())
+                            && !"CANCEL".equals(contractDistributorStandard.getFormalApproved())) {
+                        return;
+                    }
+
+                    stringBuilder.append("正式合同）");
+                    lastApprovedTime = contractDistributorStandard.getFormalTime().toLocalDate();
+                }
+
+                if ("STANDARD".equals(contractDistributorStandard.getStatus())) {
+                    if (!"REFUSE".equals(contractDistributorStandard.getStandardApproved())
+                            && !"CANCEL".equals(contractDistributorStandard.getStandardApproved())) {
+                        return;
+                    }
+
+                    stringBuilder.append("标准合同）");
+                    lastApprovedTime = contractDistributorStandard.getStandardTime().toLocalDate();
+                }
+
+                stringBuilder.append("，合同号：").append(contractDistributorStandard.getCode());
+                stringBuilder.append("，请尽快补充规范合同。");
+                List<String> userIdList = new ArrayList<>();
+                userIdList.add(contractDistributorStandard.getCreateById());
+
+                LocalDate currentDate = LocalDate.now();
+                // 如果最后批准时间加3天还在当前时间之前，说明超过3天
+                if (lastApprovedTime.plusDays(3).isBefore(currentDate)) {
+                    Optional.ofNullable(contractDistributorStandard.getWorkshopId())
+                            .map(workshopIdAndCodeMap::get)
+                            .filter(StringUtils::isNotBlank)
+                            .map(workshopCodeAndJybzgCodeMap::get)
+                            .filter(StringUtils::isNotBlank)
+                            .map(jybzgCodeAndUserIdMap::get)
+                            .ifPresent(userIdList::addAll);
+
+                    userIdList.addAll(bsczgUserIdList);
+                }
+
+                // 发送消息
+                SysSiteMessageDto messageDto = new SysSiteMessageDto();
+                messageDto.setUserIdList(userIdList);
+                messageDto.setTitle("补充规范合同通知");
+                messageDto.setContent(stringBuilder.toString());
+                messageDto.setBizKey(IdUtil.getId());
+                messageDto.setCreateUserId(null);
+
+                mqProducerService.createSysSiteMessage(messageDto);
+            } catch (Exception e) {
+                log.error("发送消息报错", e);
+            }
+        });
+    }
+
     @CacheEvict(value = ContractDistributorStandard.CACHE_NAME, key = "@cacheVariables.tenantId() + #key")
     @Override
     public void cleanCacheByKey(Serializable key) {

@@ -310,7 +310,7 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         if (StringUtils.isNotEmpty(data.getWorkshopId())) {
             Workshop workshop = workshopService.findById(data.getWorkshopId());
             if (workshop != null) {
-                data.setWorkshopName(workshop.getName());
+                data.setWorkshopCode(workshop.getCode());
             }
         }
         flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);

@@ -67,8 +67,14 @@ public class ReplenishmentOrderLineServiceImpl extends BaseMpServiceImpl<Repleni
         data.setPurchaseOrderLineId(vo.getPurchaseOrderLineId());
         data.setBrand(vo.getBrand());
         data.setThickness(vo.getThickness());
+        data.setThicknessTolPos(vo.getThicknessTolPos());
+        data.setThicknessTolNeg(vo.getThicknessTolNeg());
         data.setWidth(vo.getWidth());
+        data.setWidthTolPos(vo.getWidthTolPos());
+        data.setWidthTolNeg(vo.getWidthTolNeg());
         data.setLength(vo.getLength());
+        data.setLengthTolPos(vo.getLengthTolPos());
+        data.setLengthTolNeg(vo.getLengthTolNeg());
         data.setStatus(vo.getStatus());
         data.setQuantity(vo.getQuantity());
         data.setShippedQuantity(vo.getShippedQuantity());
@@ -101,8 +107,14 @@ public class ReplenishmentOrderLineServiceImpl extends BaseMpServiceImpl<Repleni
                 .set(ReplenishmentOrderLine::getPurchaseOrderLineId, vo.getPurchaseOrderLineId())
                 .set(ReplenishmentOrderLine::getBrand, vo.getBrand())
                 .set(ReplenishmentOrderLine::getThickness, vo.getThickness())
+                .set(ReplenishmentOrderLine::getThicknessTolPos, vo.getThicknessTolPos())
+                .set(ReplenishmentOrderLine::getThicknessTolNeg, vo.getThicknessTolNeg())
                 .set(ReplenishmentOrderLine::getWidth, vo.getWidth())
+                .set(ReplenishmentOrderLine::getWidthTolPos, vo.getWidthTolPos())
+                .set(ReplenishmentOrderLine::getWidthTolNeg, vo.getWidthTolNeg())
                 .set(ReplenishmentOrderLine::getLength, vo.getLength())
+                .set(ReplenishmentOrderLine::getLengthTolPos, vo.getLengthTolPos())
+                .set(ReplenishmentOrderLine::getLengthTolNeg, vo.getLengthTolNeg())
                 .set(ReplenishmentOrderLine::getStatus, vo.getStatus())
                 .set(ReplenishmentOrderLine::getQuantity, vo.getQuantity())
                 .set(ReplenishmentOrderLine::getShippedQuantity, vo.getShippedQuantity())

@@ -170,8 +170,14 @@ public class ReplenishmentOrderServiceImpl extends BaseMpServiceImpl<Replenishme
                 createReplenishmentOrderLineVo.setPurchaseOrderLineId(updateReplenishmentOrderLineVo.getPurchaseOrderLineId());
                 createReplenishmentOrderLineVo.setBrand(updateReplenishmentOrderLineVo.getBrand());
                 createReplenishmentOrderLineVo.setThickness(updateReplenishmentOrderLineVo.getThickness());
+                createReplenishmentOrderLineVo.setThicknessTolPos(updateReplenishmentOrderLineVo.getThicknessTolPos());
+                createReplenishmentOrderLineVo.setThicknessTolNeg(updateReplenishmentOrderLineVo.getThicknessTolNeg());
                 createReplenishmentOrderLineVo.setWidth(updateReplenishmentOrderLineVo.getWidth());
+                createReplenishmentOrderLineVo.setWidthTolPos(updateReplenishmentOrderLineVo.getWidthTolPos());
+                createReplenishmentOrderLineVo.setWidthTolNeg(updateReplenishmentOrderLineVo.getWidthTolNeg());
                 createReplenishmentOrderLineVo.setLength(updateReplenishmentOrderLineVo.getLength());
+                createReplenishmentOrderLineVo.setLengthTolPos(updateReplenishmentOrderLineVo.getLengthTolPos());
+                createReplenishmentOrderLineVo.setLengthTolNeg(updateReplenishmentOrderLineVo.getLengthTolNeg());
                 createReplenishmentOrderLineVo.setStatus(updateReplenishmentOrderLineVo.getStatus());
                 createReplenishmentOrderLineVo.setQuantity(updateReplenishmentOrderLineVo.getQuantity());
                 createReplenishmentOrderLineVo.setShippedQuantity(updateReplenishmentOrderLineVo.getShippedQuantity());

@@ -3,9 +3,13 @@ package com.lframework.xingyun.sc.impl.shipments.delay;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageInfo;
+import com.lframework.starter.bpm.dto.FlowTaskDto;
+import com.lframework.starter.bpm.mappers.FlowTaskWrapperMapper;
 import com.lframework.starter.bpm.service.FlowInstanceWrapperService;
+import com.lframework.starter.bpm.vo.flow.task.QueryTodoTaskListVo;
 import com.lframework.starter.common.utils.CollectionUtil;
 import com.lframework.starter.common.utils.StringUtil;
+import com.lframework.starter.mq.core.service.MqProducerService;
 import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
 import com.lframework.starter.web.core.utils.PageResultUtil;;
@@ -20,16 +24,20 @@ import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.web.inner.bo.usercenter.UserInfoBo;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.starter.web.inner.dto.message.SysSiteMessageDto;
 import com.lframework.starter.web.inner.dto.system.UserInfoDto;
+import com.lframework.starter.web.inner.service.system.SysUserRoleService;
 import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.xingyun.sc.entity.DelayedShipment;
 import com.lframework.xingyun.sc.entity.DelayedShipmentDetail;
+import com.lframework.xingyun.sc.handlers.TransactorHandler;
 import com.lframework.xingyun.sc.mappers.DelayedShipmentMapper;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
 import com.lframework.xingyun.sc.service.shipments.delay.DelayedShipmentDetailService;
 import com.lframework.xingyun.sc.service.shipments.delay.DelayedShipmentService;
 import com.lframework.xingyun.sc.vo.shipments.delay.*;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
@@ -37,6 +45,7 @@ import java.time.LocalDate;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class DelayedShipmentServiceImpl extends BaseMpServiceImpl<DelayedShipmentMapper, DelayedShipment> implements DelayedShipmentService {
@@ -51,6 +60,14 @@ public class DelayedShipmentServiceImpl extends BaseMpServiceImpl<DelayedShipmen
     private SysUserService sysUserService;
     @Resource
     private PurchaseOrderLineService purchaseOrderLineService;
+    @Resource
+    private MqProducerService mqProducerService;
+    @Resource
+    private SysUserRoleService sysUserRoleService;
+    @Resource
+    private TransactorHandler transactorHandler;
+    @Resource
+    private FlowTaskWrapperMapper flowTaskWrapperMapper;
 
     @Override
     public PageResult<DelayedShipment> query(Integer pageIndex, Integer pageSize, QueryDelayedShipmentVo vo) {
@@ -60,6 +77,21 @@ public class DelayedShipmentServiceImpl extends BaseMpServiceImpl<DelayedShipmen
 
         PageHelperUtil.startPage(pageIndex, pageSize);
         List<DelayedShipment> datas = this.query(vo);
+        if (CollectionUtils.isNotEmpty(datas)) {
+            // 获取当前人员的待办任务数据
+            List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
+            if (org.apache.commons.collections4.CollectionUtils.isEmpty(flowTaskList)) {
+                return PageResultUtil.convert(new PageInfo<>(datas));
+            }
+            List<String> ids = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
+            for (DelayedShipment delayedShipment : datas) {
+                if (ids.contains(delayedShipment.getId())) {
+                    delayedShipment.setShowExamine(true);
+                } else {
+                    delayedShipment.setShowExamine(false);
+                }
+            }
+        }
 
         return PageResultUtil.convert(new PageInfo<>(datas));
     }
@@ -160,9 +192,9 @@ public class DelayedShipmentServiceImpl extends BaseMpServiceImpl<DelayedShipmen
         newRoleCodes.add("sfcsckjhy");
         newRoleCodes.add("ztfcsckjhy");
         boolean hasAny = newRoleCodes.stream().anyMatch(roleCodes::contains);
+        DelayedShipmentDetail delayedShipmentDetail = delayedShipmentDetailService.findById(id);
         if (delayedExceedOneDay && !hasAny) {
             //开启审核
-            DelayedShipmentDetail delayedShipmentDetail = delayedShipmentDetailService.findById(id);
             vo.setWorkshopCode(delayedShipmentDetail.getWorkshopCode());
 
             flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, vo);
@@ -174,14 +206,68 @@ public class DelayedShipmentServiceImpl extends BaseMpServiceImpl<DelayedShipmen
             vo1.setDelayedShipmentId(data.getId());
             List<DelayedShipmentDetail> query = delayedShipmentDetailService.query(vo1);
             if (CollectionUtil.isNotEmpty(query)) {
-                for (DelayedShipmentDetail delayedShipmentDetail : query) {
-                    purchaseOrderLineService.updateDeliveryDate(delayedShipmentDetail.getOrderSpecId(),
-                            delayedShipmentDetail.getApplyShipmentDate());
+                for (DelayedShipmentDetail detail : query) {
+                    purchaseOrderLineService.updateDeliveryDate(detail.getOrderSpecId(), detail.getApplyShipmentDate());
                 }
             }
         }
-        //todo 消息通知
-
+        //todo 消息通知经营办计划员、经营办发货员、业务员、办事处内勤和经营办主管。
+        List<String> userIdList = new ArrayList<>();
+        List<String> codeList = new ArrayList<>();
+        String workshopCode = delayedShipmentDetail.getWorkshopCode();
+        //业务员
+        String contractCreateById = delayedShipmentDetail.getContractCreateById();
+        userIdList.add(contractCreateById);
+        //办事处内勤
+        List<String> list1 = transactorHandler.listTransactorsByRoleCode("bscnq", contractCreateById);
+        if (CollectionUtils.isNotEmpty(list1)) {
+            userIdList.addAll(list1);
+        }
+        if ("yfc".equals(workshopCode)) {
+            //经营办计划员、经营办发货员、经营办主管
+            codeList.add("yfcjybjhy");
+            codeList.add("yfcjybfhy");
+            codeList.add("yfcjybzg");
+            List<String> userIds = sysUserRoleService.listUserIdByRoleCodes(codeList);
+            if (CollectionUtils.isNotEmpty(userIds)) {
+                userIdList.addAll(userIds);
+            }
+        } else if ("efc".equals(workshopCode)) {
+            //经营办计划员、经营办发货员、经营办主管
+            codeList.add("efcjybjhy");
+            codeList.add("efcjybfhy");
+            codeList.add("efcjybzg");
+            List<String> userIds = sysUserRoleService.listUserIdByRoleCodes(codeList);
+            if (CollectionUtils.isNotEmpty(userIds)) {
+                userIdList.addAll(userIds);
+            }
+        } else if ("sfc".equals(workshopCode)) {
+            //经营办计划员、经营办发货员、经营办主管
+            codeList.add("sfcjybjhy");
+            codeList.add("sfcjybfhy");
+            codeList.add("sfcjybzg");
+            List<String> userIds = sysUserRoleService.listUserIdByRoleCodes(codeList);
+            if (CollectionUtils.isNotEmpty(userIds)) {
+                userIdList.addAll(userIds);
+            }
+        } else if ("sfc".equals(workshopCode)) {
+            //经营办计划员、经营办发货员、经营办主管
+            codeList.add("ztfcjybjhy");
+            codeList.add("ztfcjybfhy");
+            codeList.add("ztcjybzg");
+            List<String> userIds = sysUserRoleService.listUserIdByRoleCodes(codeList);
+            if (CollectionUtils.isNotEmpty(userIds)) {
+                userIdList.addAll(userIds);
+            }
+        }
+        SysSiteMessageDto messageDto = new SysSiteMessageDto();
+        messageDto.setUserIdList(userIdList);
+        messageDto.setTitle("延期发货通知");
+        messageDto.setContent("延期发货通知！");
+        messageDto.setBizKey(IdUtil.getId());
+        //如果是空表示由系统自动发起
+        messageDto.setCreateUserId(null);
+        mqProducerService.createSysSiteMessage(messageDto);
         return data.getId();
     }
 
@@ -256,9 +342,9 @@ public class DelayedShipmentServiceImpl extends BaseMpServiceImpl<DelayedShipmen
         newRoleCodes.add("sfcsckjhy");
         newRoleCodes.add("ztfcsckjhy");
         boolean hasAny = newRoleCodes.stream().anyMatch(roleCodes::contains);
+        DelayedShipmentDetail delayedShipmentDetail = delayedShipmentDetailService.findById(id);
         if (delayedExceedOneDay && !hasAny) {
             //开启审核
-            DelayedShipmentDetail delayedShipmentDetail = delayedShipmentDetailService.findById(id);
             vo.setWorkshopCode(delayedShipmentDetail.getWorkshopCode());
 
             flowInstanceWrapperService.startInstance(BPM_FLAG, vo.getId(), BPM_FLAG, vo);
@@ -270,13 +356,68 @@ public class DelayedShipmentServiceImpl extends BaseMpServiceImpl<DelayedShipmen
             vo1.setDelayedShipmentId(data.getId());
             List<DelayedShipmentDetail> query = delayedShipmentDetailService.query(vo1);
             if (CollectionUtil.isNotEmpty(query)) {
-                for (DelayedShipmentDetail delayedShipmentDetail : query) {
-                    purchaseOrderLineService.updateDeliveryDate(delayedShipmentDetail.getOrderSpecId(),
-                            delayedShipmentDetail.getApplyShipmentDate());
+                for (DelayedShipmentDetail detail : query) {
+                    purchaseOrderLineService.updateDeliveryDate(detail.getOrderSpecId(), detail.getApplyShipmentDate());
                 }
             }
         }
-        //todo 消息通知
+        //todo 消息通知经营办计划员、经营办发货员、业务员、办事处内勤和经营办主管。
+        List<String> userIdList = new ArrayList<>();
+        List<String> codeList = new ArrayList<>();
+        String workshopCode = delayedShipmentDetail.getWorkshopCode();
+        //业务员
+        String contractCreateById = delayedShipmentDetail.getContractCreateById();
+        userIdList.add(contractCreateById);
+        //办事处内勤
+        List<String> list1 = transactorHandler.listTransactorsByRoleCode("bscnq", contractCreateById);
+        if (CollectionUtils.isNotEmpty(list1)) {
+            userIdList.addAll(list1);
+        }
+        if ("yfc".equals(workshopCode)) {
+            //经营办计划员、经营办发货员、经营办主管
+            codeList.add("yfcjybjhy");
+            codeList.add("yfcjybfhy");
+            codeList.add("yfcjybzg");
+            List<String> userIds = sysUserRoleService.listUserIdByRoleCodes(codeList);
+            if (CollectionUtils.isNotEmpty(userIds)) {
+                userIdList.addAll(userIds);
+            }
+        } else if ("efc".equals(workshopCode)) {
+            //经营办计划员、经营办发货员、经营办主管
+            codeList.add("efcjybjhy");
+            codeList.add("efcjybfhy");
+            codeList.add("efcjybzg");
+            List<String> userIds = sysUserRoleService.listUserIdByRoleCodes(codeList);
+            if (CollectionUtils.isNotEmpty(userIds)) {
+                userIdList.addAll(userIds);
+            }
+        } else if ("sfc".equals(workshopCode)) {
+            //经营办计划员、经营办发货员、经营办主管
+            codeList.add("sfcjybjhy");
+            codeList.add("sfcjybfhy");
+            codeList.add("sfcjybzg");
+            List<String> userIds = sysUserRoleService.listUserIdByRoleCodes(codeList);
+            if (CollectionUtils.isNotEmpty(userIds)) {
+                userIdList.addAll(userIds);
+            }
+        } else if ("ztfc".equals(workshopCode)) {
+            //经营办计划员、经营办发货员、经营办主管
+            codeList.add("ztfcjybjhy");
+            codeList.add("ztfcjybfhy");
+            codeList.add("ztcjybzg");
+            List<String> userIds = sysUserRoleService.listUserIdByRoleCodes(codeList);
+            if (CollectionUtils.isNotEmpty(userIds)) {
+                userIdList.addAll(userIds);
+            }
+        }
+        SysSiteMessageDto messageDto = new SysSiteMessageDto();
+        messageDto.setUserIdList(userIdList);
+        messageDto.setTitle("延期发货通知");
+        messageDto.setContent("延期发货通知！");
+        messageDto.setBizKey(IdUtil.getId());
+        //如果是空表示由系统自动发起
+        messageDto.setCreateUserId(null);
+        mqProducerService.createSysSiteMessage(messageDto);
     }
 
     @OpLog(type = OtherOpLogType.class, name = "修改状态，ID：{}", params = {"#id"})

@@ -120,4 +120,9 @@ public interface ContractDistributorStandardService extends BaseMpService<Contra
      * @return 一年内未签订合同的企业
      */
     List<String> getContractSigned(List<String> buyerList);
+
+    /**
+     * 合同规范补充提醒
+     */
+    void supplementContractSpecReminder();
 }

 package com.lframework.xingyun.sc.vo.purchase;
 
-import com.lframework.starter.web.core.components.validation.IsNumberPrecision;
 import com.lframework.starter.web.core.components.validation.TypeMismatch;
 import com.lframework.starter.web.core.vo.BaseVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.hibernate.validator.constraints.Length;
 
 
 import java.io.Serializable;
@@ -21,21 +19,18 @@ public class CreateReplenishmentOrderLineVo implements BaseVo, Serializable {
      * 补货单
      */
     @ApiModelProperty(value = "补货单")
-    @Length(message = "补货单最多允许32个字符！")
     private String replenishmentOrderId;
 
     /**
      * 订货单表物料行ID
      */
     @ApiModelProperty(value = "订货单表物料行ID")
-    @Length(message = "订货单表物料行ID最多允许32个字符！")
     private String purchaseOrderLineId;
 
     /**
      * 牌号
      */
     @ApiModelProperty(value = "牌号")
-    @Length(message = "牌号最多允许100个字符！")
     private String brand;
 
     /**
@@ -43,30 +38,62 @@ public class CreateReplenishmentOrderLineVo implements BaseVo, Serializable {
      */
     @ApiModelProperty(value = "厚度")
     @TypeMismatch(message = "厚度格式有误！")
-    @IsNumberPrecision(message = "厚度最多允许4位小数！", value = 4)
     private BigDecimal thickness;
 
     /**
+     * 厚度公差正
+     */
+    @ApiModelProperty("厚度公差正")
+    private BigDecimal thicknessTolPos;
+
+    /**
+     * 厚度公差负
+     */
+    @ApiModelProperty("厚度公差负")
+    private BigDecimal thicknessTolNeg;
+
+    /**
      * 宽度
      */
     @ApiModelProperty(value = "宽度")
     @TypeMismatch(message = "宽度格式有误！")
-    @IsNumberPrecision(message = "宽度最多允许4位小数！", value = 4)
     private BigDecimal width;
 
     /**
+     * 宽度公差正
+     */
+    @ApiModelProperty("宽度公差正")
+    private BigDecimal widthTolPos;
+
+    /**
+     * 宽度公差负
+     */
+    @ApiModelProperty("宽度公差负")
+    private BigDecimal widthTolNeg;
+
+    /**
      * 长度
      */
     @ApiModelProperty(value = "长度")
     @TypeMismatch(message = "长度格式有误！")
-    @IsNumberPrecision(message = "长度最多允许4位小数！", value = 4)
     private BigDecimal length;
 
     /**
+     * 长度公差正
+     */
+    @ApiModelProperty("长度公差正")
+    private BigDecimal lengthTolPos;
+
+    /**
+     * 长度公差负
+     */
+    @ApiModelProperty("长度公差负")
+    private BigDecimal lengthTolNeg;
+
+    /**
      * 状态
      */
     @ApiModelProperty(value = "状态")
-    @Length(message = "状态最多允许50个字符！")
     private String status;
 
     /**
@@ -74,7 +101,6 @@ public class CreateReplenishmentOrderLineVo implements BaseVo, Serializable {
      */
     @ApiModelProperty(value = "需发(t)")
     @TypeMismatch(message = "需发(t)格式有误！")
-    @IsNumberPrecision(message = "需发(t)最多允许4位小数！", value = 4)
     private BigDecimal quantity;
 
     /**
@@ -82,7 +108,6 @@ public class CreateReplenishmentOrderLineVo implements BaseVo, Serializable {
      */
     @ApiModelProperty(value = "实发(t)")
     @TypeMismatch(message = "实发(t)格式有误！")
-    @IsNumberPrecision(message = "实发(t)最多允许4位小数！", value = 4)
     private BigDecimal shippedQuantity;
 
     /**
@@ -90,7 +115,6 @@ public class CreateReplenishmentOrderLineVo implements BaseVo, Serializable {
      */
     @ApiModelProperty(value = "需求补发(t/件)")
     @TypeMismatch(message = "需求补发(t/件)格式有误！")
-    @IsNumberPrecision(message = "需求补发(t/件)最多允许4位小数！", value = 4)
     private BigDecimal supplementaryQuantity;
 
     /**
@@ -104,14 +128,12 @@ public class CreateReplenishmentOrderLineVo implements BaseVo, Serializable {
      * 备注
      */
     @ApiModelProperty(value = "备注")
-    @Length(message = "备注最多允许65,535个字符！")
     private String remarks;
 
     /**
      * 排序
      */
     @ApiModelProperty(value = "排序")
-    @TypeMismatch(message = "排序格式有误！")
     private Integer showOrder;
 
     /**

@@ -44,18 +44,54 @@ public class UpdateReplenishmentOrderLineVo implements BaseVo, Serializable {
     private BigDecimal thickness;
 
     /**
+     * 厚度公差正
+     */
+    @ApiModelProperty("厚度公差正")
+    private BigDecimal thicknessTolPos;
+
+    /**
+     * 厚度公差负
+     */
+    @ApiModelProperty("厚度公差负")
+    private BigDecimal thicknessTolNeg;
+
+    /**
      * 宽度
      */
     @ApiModelProperty(value = "宽度")
     private BigDecimal width;
 
     /**
+     * 宽度公差正
+     */
+    @ApiModelProperty("宽度公差正")
+    private BigDecimal widthTolPos;
+
+    /**
+     * 宽度公差负
+     */
+    @ApiModelProperty("宽度公差负")
+    private BigDecimal widthTolNeg;
+
+    /**
      * 长度
      */
     @ApiModelProperty(value = "长度")
     private BigDecimal length;
 
     /**
+     * 长度公差正
+     */
+    @ApiModelProperty("长度公差正")
+    private BigDecimal lengthTolPos;
+
+    /**
+     * 长度公差负
+     */
+    @ApiModelProperty("长度公差负")
+    private BigDecimal lengthTolNeg;
+
+    /**
      * 状态
      */
     @ApiModelProperty(value = "状态")

@@ -8,8 +8,14 @@
         <result column="purchase_order_line_id" property="purchaseOrderLineId"/>
         <result column="brand" property="brand"/>
         <result column="thickness" property="thickness"/>
+        <result column="thickness_tol_pos" property="thicknessTolPos"/>
+        <result column="thickness_tol_neg" property="thicknessTolNeg"/>
         <result column="width" property="width"/>
+        <result column="width_tol_pos" property="widthTolPos"/>
+        <result column="width_tol_neg" property="widthTolNeg"/>
         <result column="length" property="length"/>
+        <result column="length_tol_pos" property="lengthTolPos"/>
+        <result column="length_tol_neg" property="lengthTolNeg"/>
         <result column="status" property="status"/>
         <result column="quantity" property="quantity"/>
         <result column="shipped_quantity" property="shippedQuantity"/>
@@ -31,8 +37,14 @@
                tb.purchase_order_line_id,
                tb.brand,
                tb.thickness,
+               tb.thickness_tol_pos,
+               tb.thickness_tol_neg,
                tb.width,
+               tb.width_tol_pos,
+               tb.width_tol_neg,
                tb.length,
+               tb.length_tol_pos,
+               tb.length_tol_neg,
                tb.status,
                tb.quantity,
                tb.shipped_quantity,

@@ -20,6 +20,7 @@
         <result column="apply_count" property="applyCount"/>
         <result column="quantity" property="quantity"/>
         <result column="delay_reason" property="delayReason"/>
+        <result column="contract_create_by_id" property="contractCreateById"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by" property="createBy"/>
         <result column="update_by_id" property="updateById"/>
@@ -52,6 +53,7 @@
             tb.apply_count,
             tb.quantity,
             tb.delay_reason,
+            o.contract_create_by_id,
             tb.create_by_id,
             tb.create_by,
             tb.update_by_id,