oms执行单修改

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java

@@ -128,6 +128,9 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
         try {
             for (Long id:ids){
                 BusinessDocumentOrder businessDocumentOrder=businessDocumentOrderMapper.selectById(id);
+                if (businessDocumentOrder.getReviewStatus()!=1){
+                    throw new ServerException("业务单审核状态异常");
+                }
 
                 if (ObjectUtil.isNotNull(businessDocumentOrder)){
                     ExecuteOrder objects = executeOrderMapper.selectOne(new LambdaQueryWrapper<ExecuteOrder>().eq(ExecuteOrder::getBusinessDocumentId, id).eq(ExecuteOrder::getDelFlag,1) .last("LIMIT 1")
@@ -170,6 +173,7 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean cancelExecute(Long[] ids) throws Exception{
         LoginUser loginUser = SecurityUtils.getLoginUser();//获取登录人
         for (Long id:ids){
@@ -190,7 +194,10 @@ public class BusinessDocumentOrderImpl extends ServiceImpl<BusinessDocumentOrder
                        }else{
                            executeOrder.setOrderStatus(3L);
                            executeOrder.setIssueStatus(1L);
-                           executeOrderMapper.updateById(executeOrder);
+                           int i = executeOrderMapper.updateById(executeOrder);
+                           if (i > 0) {
+                               return true;
+                           }
                        }
                    }
                }

mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/service/BusinessDocumentOrderDomainService.java

@@ -106,7 +106,7 @@ public class BusinessDocumentOrderDomainService {
         String orderRemark = businessDocumentOrderDO.getRemarks();
         businessDocumentOrderDO.setRemarks(orderRemark);
 
-        businessDocumentOrderDO.setAppointShipperId(String.valueOf(userShipperPo.getUserId()));
+//        businessDocumentOrderDO.setAppointShipperId(String.valueOf(userShipperPo.getUserId()));
         // 分类处理货物列表
         List<BusinessDocumentCargoMultiDTO> allCargoList = businessDocumentOrderDO.getBusinessDocumentCargoMultiList();
         businessDocumentOrderDO.setReceivableType(2L);

mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/persistence/ExecuteOrderImpl.java

@@ -156,8 +156,16 @@ public class ExecuteOrderImpl extends ServiceImpl<ExecuteOrderMapper, ExecuteOrd
                             unloadAddressList.add(tmsAddressMultiDTO);
                         }
                     }
+                    tmsOrderAddDTO.setAppointShipper(businessDocumentOrder.getAppointShipper());
+                    tmsOrderAddDTO.setAppointShipperId(businessDocumentOrder.getAppointShipperId());
+                    tmsOrderAddDTO.setCargoInfoList(cargoInfoList);
+                    tmsOrderAddDTO.setLoadingAddressList(loadingAddressList);
+                    tmsOrderAddDTO.setUnloadAddressList(unloadAddressList);
+                    tmsOrderAddDTO.setOrderShippingType(2);
+                    tmsOrderAddDTO.setPayerType(0);
                     AjaxResult ajaxResult=wlhyServiceFeign.add(tmsOrderAddDTO);
                     if(ajaxResult.get("code").toString().equals("200")){
+                        return true;
 
                     }else {
                         throw  new ServiceException(ajaxResult.get("msg").toString());

mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/po/ExecuteOrderPO.java

@@ -66,6 +66,23 @@ public class ExecuteOrderPO extends BaseVOEntity{
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Long topOrganizationId;
 
+    @ApiModelProperty("下发状态")
+    @Excel(name = "下发状态")
+    private String issueStatus;
+
+    @ApiModelProperty("下发人")
+    @Excel(name = "下发人")
+    private String issueName;
+
+    @ApiModelProperty("下发时间")
+    @Excel(name = "下发时间", width = 20, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date issueTime;
+
+    @ApiModelProperty("业务单状态")
+    @Excel(name = "业务单状态")
+    private String orderStatus;
+
 
 
 }

mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/repository/todo/ExecuteOrderDO.java

@@ -7,6 +7,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import java.math.BigDecimal;
 import io.swagger.annotations.ApiModelProperty;
 import com.mhd.common.core.web.domain.BaseVOEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.List;
 
@@ -26,6 +27,31 @@ public class ExecuteOrderDO extends BaseVOEntity{
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Long id;
 
+
+    @ApiModelProperty(value = "创建结束日期")
+    @Excel(name = "创建结束日期", width = 20)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date createEndTime;
+    /**更新日期*/
+    @ApiModelProperty(value = "创建开始日期")
+    @Excel(name = "创建开始日期", width = 20)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date createStartTime;
+
+    @ApiModelProperty(value = "下发结束日期")
+    @Excel(name = "下发结束日期", width = 20)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date issueEndTime;
+    /**更新日期*/
+    @ApiModelProperty(value = "下发开始日期")
+    @Excel(name = "下发开始日期", width = 20)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date issueStartTime;
+
     @ApiModelProperty("$column.columnComment")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String realCreateBy;

mhd_oms/src/main/java/com/mhd/oms/domain/executeOrder/service/ExecuteOrderDomainService.java

@@ -51,6 +51,12 @@ public class ExecuteOrderDomainService {
     public Boolean delete(Long[] ids) {
         return executeOrderService.delete(ids);
     }
+
+    /**
+     * 下发执行单
+     * @param ids
+     * @return
+     */
   public Boolean issueDocuments(Long[] ids) {
         return executeOrderService.issueDocuments(ids);
     }

mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/executeOrder/ExecuteOrderDTO.java

@@ -7,6 +7,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import java.math.BigDecimal;
 import io.swagger.annotations.ApiModelProperty;
 import com.mhd.common.core.web.domain.BaseVOEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.List;
 
@@ -25,6 +26,30 @@ public class ExecuteOrderDTO extends BaseVOEntity{
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private Long id;
 
+    @ApiModelProperty(value = "创建结束日期")
+    @Excel(name = "创建结束日期", width = 20)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date createEndTime;
+    /**更新日期*/
+    @ApiModelProperty(value = "创建开始日期")
+    @Excel(name = "创建开始日期", width = 20)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date createStartTime;
+
+    @ApiModelProperty(value = "下发结束日期")
+    @Excel(name = "下发结束日期", width = 20)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date issueEndTime;
+    /**更新日期*/
+    @ApiModelProperty(value = "下发开始日期")
+    @Excel(name = "下发开始日期", width = 20)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date issueStartTime;
+
     @ApiModelProperty("$column.columnComment")
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String realCreateBy;

mhd_oms/src/main/resources/mapper/executeOrder/ExecuteOrderMapper.xml

@@ -25,38 +25,50 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <sql id="selectExecuteOrderPo">
-        select ID, REAL_CREATE_BY, REAL_CREATE_NAME, CREATE_BY, CREATE_COMPANY_ID, CREATE_TIME, UPDATE_BY, UPDATE_TIME, DEL_FLAG, GOODS_NUMBER, ORG_NAME, ORGANIZATION_ID, BUSINESS_DOCUMENT_ID, BUSINESS_DOCUMENT_NUMBER, ORGANIZATION_NAME, TOP_ORGANIZATION_ID from execute_order
+        select * from execute_order
     </sql>
 
     <sql id="selectExecuteOrderPo1">
         <where>
-        <if test="id != null ">
+<!--        <if test="id != null ">-->
-            and ID = #{id}
+<!--            and ID = #{id}-->
-        </if>
+<!--        </if>-->
-        <if test="realCreateBy != null  and realCreateBy != ''">
+<!--        <if test="realCreateBy != null  and realCreateBy != ''">-->
-            and REAL_CREATE_BY = #{realCreateBy}
+<!--            and REAL_CREATE_BY = #{realCreateBy}-->
-        </if>
+<!--        </if>-->
-        <if test="realCreateName != null  and realCreateName != ''">
+<!--        <if test="realCreateName != null  and realCreateName != ''">-->
-            and REAL_CREATE_NAME like concat('%', #{realCreateName}, '%')
+<!--            and REAL_CREATE_NAME like concat('%', #{realCreateName}, '%')-->
-        </if>
+<!--        </if>-->
-        <if test="createBy != null  and createBy != ''">
+<!--        <if test="createBy != null  and createBy != ''">-->
-            and CREATE_BY = #{createBy}
+<!--            and CREATE_BY = #{createBy}-->
-        </if>
+<!--        </if>-->
-        <if test="createCompanyId != null  and createCompanyId != ''">
+<!--        <if test="createCompanyId != null  and createCompanyId != ''">-->
-            and CREATE_COMPANY_ID = #{createCompanyId}
+<!--            and CREATE_COMPANY_ID = #{createCompanyId}-->
-        </if>
+<!--        </if>-->
-        <if test="createTime != null ">
+<!--        <if test="createTime != null ">-->
-            and CREATE_TIME = #{createTime}
+<!--            and CREATE_TIME = #{createTime}-->
-        </if>
+<!--        </if>-->
-        <if test="updateBy != null  and updateBy != ''">
+<!--        <if test="updateBy != null  and updateBy != ''">-->
-            and UPDATE_BY = #{updateBy}
+<!--            and UPDATE_BY = #{updateBy}-->
-        </if>
+<!--        </if>-->
-        <if test="updateTime != null ">
+<!--        <if test="updateTime != null ">-->
-            and UPDATE_TIME = #{updateTime}
+<!--            and UPDATE_TIME = #{updateTime}-->
-        </if>
+<!--        </if>-->
-        <if test="delFlag != null ">
+<!--        <if test="delFlag != null ">-->
-            and DEL_FLAG = #{delFlag}
+<!--            and DEL_FLAG = #{delFlag}-->
-        </if>
+<!--        </if>-->
+            <if test="createStartTime != null">
+                and CREATE_TIME &gt;= #{createStartTime}
+            </if>
+            <if test="createEndTime != null">
+                and CREATE_TIME &lt;= #{createEndTime} + 1 - 1/86400
+            </if>
+            <if test="issueStartTime != null">
+                and ISSUE_TIME &gt;= #{issueStartTime}
+            </if>
+            <if test="issueEndTime != null">
+                and ISSUE_TIME &lt;= #{issueEndTime} + 1 - 1/86400
+            </if>
         <if test="goodsNumber != null  and goodsNumber != ''">
             and GOODS_NUMBER = #{goodsNumber}
         </if>
@@ -84,5 +96,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="queryList" parameterType="com.mhd.oms.domain.executeOrder.repository.todo.ExecuteOrderDO" resultMap="ExecuteOrderResult">
         <include refid="selectExecuteOrderPo"/>
         <include refid="selectExecuteOrderPo1"/>
+        order by CREATE_TIME desc
     </select>
 </mapper>