入库预约单按是否报关查询;

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/StockOutOrder.java

@@ -336,7 +336,7 @@ public class StockOutOrder extends BaseVOEntity {
     @ApiModelProperty("出仓日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date outboundDate;
     @ApiModelProperty("完成时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/StockOutOrderTZPD.java

@@ -336,7 +336,7 @@ public class StockOutOrderTZPD extends BaseVOEntity {
     @ApiModelProperty("出仓日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date outboundDate;
     @ApiModelProperty("完成时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/vo/GwInDetail.java

@@ -0,0 +1,29 @@
+package com.mhd.oms.domain.reservationStockInOrder.repository.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class GwInDetail {
+    //订单号
+    private String bill_no;
+    //订单行号
+    private Integer line_num;
+    //物料号
+    private String item_no;
+    //物料名称
+    private String item_name;
+    //物料规格
+    private String spec;
+    //计量单位
+    private String unit;
+    //数量
+    private BigDecimal qty;
+    //企业币制
+    private String erp_curr;
+    //企业单价
+    private BigDecimal erp_price;
+    //申报总价
+    private BigDecimal amount;
+}

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/vo/GwStockInOrder.java

@@ -0,0 +1,18 @@
+package com.mhd.oms.domain.reservationStockInOrder.repository.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class GwStockInOrder {
+    //订单号
+    private String bill_no;
+    //进出标记
+    private String ie_flag;
+    //下单日期
+    private Date bill_date;
+    //客户代码
+    private String corp_code;
+
+}

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/entity/ReservationStockOutOrder.java

@@ -336,7 +336,7 @@ public class ReservationStockOutOrder extends BaseVOEntity {
     @ApiModelProperty("出仓日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date outboundDate;
     @ApiModelProperty("完成时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/po/ReservationStockOutOrderPO.java

@@ -340,7 +340,7 @@ public class ReservationStockOutOrderPO extends BaseVOEntity {
     @ApiModelProperty("出仓日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date outboundDate;
     @ApiModelProperty("完成时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java

@@ -361,7 +361,7 @@ public class ReservationStockOutOrderDO extends BaseVOEntity {
     @ApiModelProperty("出仓日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date outboundDate;
     @ApiModelProperty("完成时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java

@@ -351,7 +351,7 @@ public class ReservationStockOutOrderDTO extends ReservationStockOutOrderBaseDTO
     @ApiModelProperty("出仓日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date outboundDate;
     @ApiModelProperty("完成时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/vo/GwOutDetail.java

@@ -0,0 +1,41 @@
+package com.mhd.oms.domain.reservationStockOutOrder.repository.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class GwOutDetail {
+    //订单号
+    private String bill_no;
+    //订单行号
+    private Integer line_num;
+    //物料号
+    private String item_no;
+    //物料名称
+    private String item_name;
+    //物料规格
+    private String spec;
+    //计量单位
+    private String unit;
+    //数量
+    private BigDecimal qty;
+    //企业币制
+    private String erp_curr;
+    //企业单价
+    private BigDecimal erp_price;
+    //申报总价
+    private BigDecimal amount;
+    //入仓订单号
+    private String order_i_no;
+    //入仓订单行号
+    private Integer order_i_row;
+    //仓库
+    private String warehouse;
+    //库位
+    private String op_wh_loc;
+    //入库单编号
+    private String bill_i;
+    //入库单行号
+    private Integer bill_i_row;
+}

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/vo/GwStockOutOrder.java

@@ -0,0 +1,18 @@
+package com.mhd.oms.domain.reservationStockOutOrder.repository.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class GwStockOutOrder {
+    //订单号
+    private String bill_no;
+    //进出标记
+    private String ie_flag;
+    //下单日期
+    private Date bill_date;
+    //客户代码
+    private String corp_code;
+
+}

mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderApplicationService.java

@@ -212,71 +212,6 @@ public class ReserveStockInOrderApplicationService {
 
     public List<InAndOutListVo> inAndOutList(ReserveStockInOrderDO stockInOrderDO) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
-//        if (loginUser != null && loginUser.getUserPo() != null){
-//            Long userOrganizationId = loginUser.getUserPo().getOrganizationId();
-//            Long frontendOrganizationId = stockInOrderDO.getOrganizationId();
-//            if (userOrganizationId != null && userOrganizationId == 2827L) {
-//                if (frontendOrganizationId != null) {
-//                    stockInOrderDO.setOrganizationId(frontendOrganizationId);
-//                    stockInOrderDO.setTopOrganizationId(null);
-//                } else {
-//                    stockInOrderDO.setOrganizationId(null);
-//                    stockInOrderDO.setTopOrganizationId(null);
-//                }
-//            } else {
-//                if (frontendOrganizationId != null && userOrganizationId != null) {
-//                    if (!frontendOrganizationId.equals(userOrganizationId)) {
-//                        stockInOrderDO.setOrganizationId(userOrganizationId);
-//                    }
-//                } else {
-//                    if (userOrganizationId != null) {
-//                        stockInOrderDO.setOrganizationId(userOrganizationId);
-//                    }
-//                }
-//                if (stockInOrderDO.getOrganizationId() == null) {
-//                    Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
-//                    if (topOrganizationId != null && topOrganizationId != 1) {
-//                        stockInOrderDO.setTopOrganizationId(topOrganizationId);
-//                    }
-//                } else {
-//                    stockInOrderDO.setTopOrganizationId(2827L);
-//                }
-//            }
-//            if (stockInOrderDO.getWarehouseId() == null) {
-//                AssociationWarehouseCacheDO associationWarehouseCacheDO =
-//                        SystemServiceCacheUtil.getAssociationWarehouseCache(loginUser.getUserid());
-//                if (associationWarehouseCacheDO != null) {
-//                    stockInOrderDO.setWarehouseId(associationWarehouseCacheDO.getWarehouseId());
-//                }
-//            }
-//        }
-
-//        if (loginUser != null) {
-//            String targetRoleCode = "KGY-001";
-//            boolean isKuGuan = false;
-//
-//            String roleCode = loginUser.getUserPo() != null ? loginUser.getUserPo().getRoleCode() : null;
-//            if (StringUtils.isNotBlank(roleCode) && roleCode.contains(targetRoleCode)) {
-//                isKuGuan = true;
-//            }
-//
-//            if (!isKuGuan && loginUser.getRoleList() != null) {
-//                isKuGuan = loginUser.getRoleList().stream()
-//                        .anyMatch(rc -> StringUtils.isNotBlank(rc) && rc.contains(targetRoleCode));
-//            }
-//
-//            if (!isKuGuan && loginUser.getRoles() != null) {
-//                isKuGuan = loginUser.getRoles().stream()
-//                        .anyMatch(rc -> StringUtils.isNotBlank(rc) && rc.contains(targetRoleCode));
-//            }
-//
-//            if (isKuGuan) {
-//                Integer currentGtStatus = stockInOrderDO.getGtStatus();
-//                if (currentGtStatus == null || currentGtStatus < 1) {
-//                    stockInOrderDO.setGtStatus(1); // status > 1
-//                }
-//            }
-//        }
         return stockInOrderDomainService.inAndOutList(stockInOrderDO);
     }
 

mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/entity/ReserveStockOutOrder.java

@@ -336,7 +336,7 @@ public class ReserveStockOutOrder extends BaseVOEntity {
     @ApiModelProperty("出仓日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date outboundDate;
     @ApiModelProperty("完成时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/repository/po/ReserveStockOutOrderPO.java

@@ -338,7 +338,7 @@ public class ReserveStockOutOrderPO extends BaseVOEntity {
     @ApiModelProperty("出仓日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date outboundDate;
     @ApiModelProperty("完成时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/repository/todo/ReserveStockOutOrderDO.java

@@ -361,7 +361,7 @@ public class ReserveStockOutOrderDO extends BaseVOEntity {
     @ApiModelProperty("出仓日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date outboundDate;
     @ApiModelProperty("完成时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/repository/todo/ReserveStockOutOrderDTO.java

@@ -349,9 +349,9 @@ public class ReserveStockOutOrderDTO extends ReserveStockOutOrderBaseDTO {
     private String containerNoName;
 
     @ApiModelProperty("出仓日期")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date outboundDate;
     @ApiModelProperty("完成时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

mhd_oms/src/main/resources/mapper/reserveStockInOrder/ReserveStockInOrderMapper.xml

@@ -661,6 +661,7 @@
         <if test="customerId != null">
             and a.customer_id = #{customerId}
         </if>
+        order by a."createTime" desc
     </select>
 
     <select id="getinfo" parameterType="java.lang.Long" resultType="com.mhd.oms.domain.reservationStockInOrder.repository.po.MaterialBaseInfoPO">

mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java

@@ -336,7 +336,7 @@ public class StockOutOrder extends BaseVOEntity {
     @ApiModelProperty("出仓日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date outboundDate;
     @ApiModelProperty("完成时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java

@@ -340,7 +340,7 @@ public class StockOutOrderPO extends BaseVOEntity {
     @ApiModelProperty("出仓日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date outboundDate;
     @ApiModelProperty("完成时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java

@@ -361,7 +361,7 @@ public class StockOutOrderDO extends BaseVOEntity {
     @ApiModelProperty("出仓日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date outboundDate;
     @ApiModelProperty("完成时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockOutOrder/StockOutOrderDTO.java

@@ -351,7 +351,7 @@ public class StockOutOrderDTO extends StockOutOrderBaseDTO {
     @ApiModelProperty("出仓日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date outboundDate;
     @ApiModelProperty("完成时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")