oms修改
This commit is contained in:
赵辉
+6
@@ -750,4 +750,10 @@ public class BusinessDocumentOrder extends BaseVOEntity{
|
||||
|
||||
@ApiModelProperty("出入库单号")
|
||||
private String inOrderNumber;
|
||||
|
||||
@ApiModelProperty("仓库负责人")
|
||||
private String directorName;
|
||||
|
||||
@ApiModelProperty("仓库负责人电话")
|
||||
private String directorPhone;
|
||||
}
|
||||
|
||||
+6
@@ -784,6 +784,12 @@ public class BusinessDocumentOrderDO extends BaseVOEntity{
|
||||
@ApiModelProperty("出入库单号")
|
||||
private String inOrderNumber;
|
||||
|
||||
@ApiModelProperty("仓库负责人")
|
||||
private String directorName;
|
||||
|
||||
@ApiModelProperty("仓库负责人电话")
|
||||
private String directorPhone;
|
||||
|
||||
@ApiModelProperty("费用科目明细")
|
||||
private List<BusinessOrderAccount> businessOrderAccountList;
|
||||
|
||||
|
||||
+1
-1
@@ -426,7 +426,7 @@ public class BusinessDocumentOrderDomainService {
|
||||
tmsOrder.setCreaterPhone(u.getUserPo().getUserPhone());//保存创建人电话
|
||||
tmsOrder.setRealCreateBy(String.valueOf(u.getUserid()));
|
||||
tmsOrder.setRealCreateName(u.getWlhyLoginUser().getRealname());
|
||||
tmsOrder.setAppointShipper(userShipperPo.getShipperEnterpriseName());//20250-07-29修改：订单表委托方保存公司名字，而不是姓名
|
||||
tmsOrder.setAppointShipper(businessDocumentOrderDO.getAppointShipper());//20250-07-29修改：订单表委托方保存公司名字，而不是姓名
|
||||
String salesmanCodeNc = businessDocumentOrderDO.getSalesmanId();
|
||||
if (salesmanCodeNc != null){
|
||||
String makerCodeNc = businessDocumentOrderService.selectByMakerCodeNc(salesmanCodeNc);
|
||||
|
||||
+1
@@ -203,6 +203,7 @@ public class ExecuteOrderImpl extends ServiceImpl<ExecuteOrderMapper, ExecuteOrd
|
||||
tmsOrderAddDTO.setPayerType(0);
|
||||
tmsOrderAddDTO.setExecuteOrderNumber(executeOrder.getGoodsNumber());
|
||||
tmsOrderAddDTO.setOrderSource("0");
|
||||
// tmsOrderAddDTO.setOrganizationId(organizationId);
|
||||
|
||||
AjaxResult ajaxResult=wlhyServiceFeign.add(tmsOrderAddDTO);
|
||||
if(ajaxResult.get("code").toString().equals("200")){
|
||||
|
||||
+3
-1
@@ -87,7 +87,9 @@ public class ExecuteOrderDO extends BaseVOEntity{
|
||||
@ApiModelProperty("$column.columnComment")
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private String organizationName;
|
||||
|
||||
@ApiModelProperty("$column.columnComment")
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private String orderStatus;
|
||||
@ApiModelProperty("$column.columnComment")
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private Long topOrganizationId;
|
||||
|
||||
+2
-2
@@ -846,9 +846,9 @@ public class ReservationStockOutOrderApplicationService {
|
||||
stockOutOrderDO.setShipperId(userPo.getUserId());
|
||||
stockOutOrderDO.setShipperCode(userPo.getUserMemberCode());
|
||||
stockOutOrderDO.setShipperName(userPo.getUserName());
|
||||
stockOutOrderDO.setCustomerId(userPo.getUserId());
|
||||
// stockOutOrderDO.setCustomerId(userPo.getUserId());
|
||||
stockOutOrderDO.setCustomerCode(userPo.getUserMemberCode());
|
||||
stockOutOrderDO.setCustomerName(userPo.getUserName());
|
||||
// stockOutOrderDO.setCustomerName(userPo.getUserName());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+6
@@ -771,6 +771,12 @@ public class BusinessDocumentOrderDTO extends BaseVOEntity{
|
||||
@ApiModelProperty("入库单号")
|
||||
private String inOrderNumber;
|
||||
|
||||
@ApiModelProperty("仓库负责人")
|
||||
private String directorName;
|
||||
|
||||
@ApiModelProperty("仓库负责人电话")
|
||||
private String directorPhone;
|
||||
|
||||
@ApiModelProperty("业务单地址集合")
|
||||
private List<BusinessDocumentAddressMultiDTO> businessDocumentAddressMultiDTOList;
|
||||
|
||||
|
||||
@@ -31,6 +31,9 @@ public class ExecuteOrderDTO extends BaseVOEntity{
|
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
|
||||
@DateTimeFormat(pattern="yyyy-MM-dd")
|
||||
private Date createEndTime;
|
||||
@ApiModelProperty("$column.columnComment")
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private String orderStatus;
|
||||
/**更新日期*/
|
||||
@ApiModelProperty(value = "创建开始日期")
|
||||
@Excel(name = "创建开始日期", width = 20)
|
||||
|
||||
+5
-5
@@ -190,7 +190,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
and ORDER_SOURCE = #{orderSource}
|
||||
</if>
|
||||
<if test="inOrderNumber != null and inOrderNumber != ''">
|
||||
and IN_ORDER_NUMBER = #{inOrderNumber}
|
||||
AND IN_ORDER_NUMBER LIKE CONCAT('%', #{inOrderNumber}, '%')
|
||||
</if>
|
||||
|
||||
<if test="createCompanyId != null and createCompanyId != ''">
|
||||
@@ -206,9 +206,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<!-- <if test="updateTime != null ">-->
|
||||
<!-- and UPDATE_TIME = #{updateTime}-->
|
||||
<!-- </if>-->
|
||||
<if test="goodsNumber != null and goodsNumber != ''">
|
||||
and GOODS_NUMBER = #{goodsNumber}
|
||||
</if>
|
||||
<if test="goodsNumber != null and goodsNumber != ''">
|
||||
AND GOODS_NUMBER LIKE CONCAT('%', #{goodsNumber}, '%')
|
||||
</if>
|
||||
<if test="loadingAreaId != null and loadingAreaId != ''">
|
||||
and LOADING_AREA_ID = #{loadingAreaId}
|
||||
</if>
|
||||
@@ -390,7 +390,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
and CREATE_USER_ID = #{createUserId}
|
||||
</if>
|
||||
<if test="appointShipper != null and appointShipper != ''">
|
||||
and APPOINT_SHIPPER = #{appointShipper}
|
||||
AND APPOINT_SHIPPER LIKE CONCAT('%', #{appointShipper}, '%')
|
||||
</if>
|
||||
<if test="isStatus != null ">
|
||||
and IS_STATUS = #{isStatus}
|
||||
|
||||
@@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
and ISSUE_TIME <= #{issueEndTime} + 1 - 1/86400
|
||||
</if>
|
||||
<if test="goodsNumber != null and goodsNumber != ''">
|
||||
and GOODS_NUMBER = #{goodsNumber}
|
||||
and GOODS_NUMBER like concat('%', #{goodsNumber}, '%')
|
||||
</if>
|
||||
<if test="orgName != null and orgName != ''">
|
||||
and ORG_NAME like concat('%', #{orgName}, '%')
|
||||
@@ -82,8 +82,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
and BUSINESS_DOCUMENT_ID = #{businessDocumentId}
|
||||
</if>
|
||||
<if test="businessDocumentNumber != null and businessDocumentNumber != ''">
|
||||
and BUSINESS_DOCUMENT_NUMBER = #{businessDocumentNumber}
|
||||
and BUSINESS_DOCUMENT_NUMBER like concat('%', #{businessDocumentNumber}, '%')
|
||||
</if>
|
||||
<if test="appointShipper != null and appointShipper != ''">
|
||||
and appoint_shipper like concat('%', #{appointShipper}, '%')
|
||||
</if>
|
||||
<if test="orderStatus != null and orderStatus != ''">
|
||||
and order_status = #{orderStatus}
|
||||
</if>
|
||||
<if test="organizationName != null and organizationName != ''">
|
||||
and ORGANIZATION_NAME like concat('%', #{organizationName}, '%')
|
||||
</if>
|
||||
|
||||
Reference in New Issue
Block a user