md

emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWarehouseInController.java

@@ -19,6 +19,7 @@ import com.xdadan.erp.oms.common.core.page.PageDomain;
 import com.xdadan.erp.oms.common.core.page.TableSupport;
 import com.xdadan.erp.oms.common.enums.BusinessType;
 import com.xdadan.erp.oms.domain.EmisWarehouseIn;
+import com.xdadan.erp.oms.domain.EmisWarehouseInBatch;
 import com.xdadan.erp.oms.domain.vo.WaybillOrder;
 import com.xdadan.erp.oms.service.IEmisWarehouseInService;
 import com.xdadan.erp.oms.service.svc.IRpcWarehouseInSvc;
@@ -103,11 +104,21 @@ public class Oms2cWarehouseInController extends BaseController
 
     @Log(title = "客户进仓确认", businessType = BusinessType.UPDATE)
     @PostMapping("/cusConfirmWsIn")
-    public AjaxResult cusConfirmWsIn(@RequestBody EmisWarehouseIn emisWarehouseIn) {
+    public AjaxResult cusConfirmWsIn(@RequestBody EmisWarehouseInBatch emisWarehouseInBatch) {
-        emisWarehouseIn.setCustomerCode(getLoginUser().getUser().getCustomerCode());
+
-        return toAjax(emisWarehouseInService.cusConfirmWsIn(emisWarehouseIn));
+        emisWarehouseInBatch.setCustomerCode(getLoginUser().getUser().getCustomerCode());
+        return iRpcWarehouseInSvc.cusConfirmWsIn(emisWarehouseInBatch);
+
     }
 
+    @Log(title = "异常上报", businessType = BusinessType.UPDATE)
+    @PostMapping("/reportBatchWsInError")
+    public AjaxResult reportBatchWsInError(@RequestBody EmisWarehouseInBatch emisWarehouseInBatch) {
+        emisWarehouseInBatch.setCustomerCode(getLoginUser().getUser().getCustomerCode());
+        return iRpcWarehouseInSvc.reportBatchWsInError(emisWarehouseInBatch);
+    }
+
+
     /**
      * 导出进仓单模板
      * @return

emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisWarehouseInBatch.java

@@ -10,6 +10,8 @@
 
 package com.xdadan.erp.oms.domain;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xdadan.erp.oms.common.core.domain.BaseEntity;
 
@@ -30,12 +32,13 @@ public class EmisWarehouseInBatch extends BaseEntity
     private static final long serialVersionUID = 1L;
 
     /* id */
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
-    /* 进仓序列号 系统生成 */
+    /* 进仓序号 */
     private String serialNo;
     /* 进仓单号 */
     private String inNo;
-    /* 进仓子批次单号in_no+001 002 */
+    /* 进仓后缀+001 002 */
     private String inBatchNo;
     /* 客户编号 */
     private String customerCode;
@@ -48,20 +51,52 @@ public class EmisWarehouseInBatch extends BaseEntity
     /* 运输工具编号 例如车牌号等  */
     private String transCarNo;
     /* 进仓日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date entryDate;
     /* 客户确认状态 0-未确认 1-确认 2-部分确认3-异常反馈 */
     private String confirmStatus;
     /* 确认时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date confirmDate;
+    /* 是否异常 1-是  */
+    private String blAbnormal;
+    /* 异常上报时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date abnormalDate;
+    /* 异常描述 */
+    private String abnormalDesc;
     /* 状态 */
     private String status;
-    /* 总件数 */
+    /* 代垫运费 1-是 */
+    private String blPrepareInFreight;
+    /* 代垫运费 */
+    private BigDecimal prepareInEstFee;
+    /* 实际运费 */
+    private BigDecimal prepareInRealFee;
+    /* 快递公司 */
+    private String prepareInExpress;
+    /* 快递单号 */
+    private String prepareInBillCode;
+    /* 自定义标识 */
+    private String prepareInRemark;
+    /* 供应商 */
+    private String prepareInSupplier;
+    /* 包装类型 */
+    private String packType;
+    /* 总件数-旧 */
     private Integer totalParcelQty;
     /* 总体积 */
     private BigDecimal totalVolume;
-    /* 总重量 */
+    /* 总重量-旧 */
     private BigDecimal totalWeight;
+    /* 件数-新 */
+    private Integer parcelQty;
+    /* 实际重量-新 */
+    private BigDecimal billWeight;
+    /* 货值 */
+    private String realValue;
+    /* 进仓图片链接 */
+    private String picUrl;
+
 
 }

emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/IEmisWarehouseInService.java

@@ -10,6 +10,7 @@
 package com.xdadan.erp.oms.service;
 
 import com.xdadan.erp.oms.domain.EmisWarehouseIn;
+import com.xdadan.erp.oms.domain.EmisWarehouseInBatch;
 
  /**
   * @ClassName EmisWarehouseInService
@@ -23,10 +24,13 @@ import com.xdadan.erp.oms.domain.EmisWarehouseIn;
      /**
       * 确认进仓单
       *
-      * @param emisWarehouseIn 进仓单
+      * @param emisWarehouseInBatch 进仓单
       * @return 结果
       */
-     public int cusConfirmWsIn(EmisWarehouseIn emisWarehouseIn);
+//     public int cusConfirmWsIn(EmisWarehouseInBatch emisWarehouseInBatch);
+
+
+//     public int reportBatchWsInError(EmisWarehouseInBatch emisWarehouseInBatch);
 
 
  }

emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/impl/EmisWarehouseInServiceImpl.java

@@ -11,6 +11,7 @@
 package com.xdadan.erp.oms.service.impl;
 
 import com.xdadan.erp.oms.domain.EmisWarehouseIn;
+import com.xdadan.erp.oms.domain.EmisWarehouseInBatch;
 import com.xdadan.erp.oms.mapper.EmisWarehouseInMapper;
 import com.xdadan.erp.oms.service.IEmisWarehouseInService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,13 +34,13 @@ import org.springframework.stereotype.Service;
      /**
       * 修改进仓单
       *
-      * @param emisWarehouseIn 进仓单
+      * @param emisWarehouseInBatch 进仓单
       * @return 结果
       */
      @Override
-     public int cusConfirmWsIn(EmisWarehouseIn emisWarehouseIn)
+     public int cusConfirmWsIn(EmisWarehouseInBatch emisWarehouseInBatch)
      {
-         return emisWarehouseInMapper.cusConfirmWsIn(emisWarehouseIn);
+//         return emisWarehouseInMapper.cusConfirmWsIn(emisWarehouseIn);
      }
 
 

emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/svc/IRpcWarehouseInSvc.java

@@ -3,6 +3,7 @@ package com.xdadan.erp.oms.service.svc;
 
 import com.xdadan.erp.oms.common.core.domain.AjaxResult;
 import com.xdadan.erp.oms.domain.EmisWarehouseIn;
+import com.xdadan.erp.oms.domain.EmisWarehouseInBatch;
 import com.xdadan.erp.oms.domain.vo.WaybillOrder;
 import feign.Response;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -42,4 +43,13 @@ public interface IRpcWarehouseInSvc {
     @PostMapping(value = "/apiweb/emisWarehouseIn/exportWarehouseInTpl")
     public Response exportWarehouseInTpl(@RequestParam("orderSn") String orderSn);
 
+
+    @PostMapping("/apiweb/emisWarehouseIn/cusConfirmWsIn")
+    public AjaxResult cusConfirmWsIn(@RequestBody EmisWarehouseInBatch emisWarehouseInBatch);
+
+
+    @PostMapping("/apiweb/emisWarehouseIn/reportBatchWsInError")
+    public AjaxResult reportBatchWsInError(@RequestBody EmisWarehouseInBatch emisWarehouseInBatch);
+
+
 }