diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInBatchController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInBatchController.java
index f2a10f912..ec31376cd 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInBatchController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInBatchController.java
@@ -125,6 +125,7 @@ public class EmisWarehouseInBatchController extends EmisBaseController
return toAjax(emisWarehouseInBatchService.updateEmisWarehouseInBatch(emisWarehouseInBatch));
}
+
/**
* 删除进仓单批次
*/
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInBatch.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInBatch.java
index 9cf6a23d9..60b8e6800 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInBatch.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInBatch.java
@@ -64,6 +64,13 @@ public class EmisWarehouseInBatch extends BaseEntity
/* 确认时间 */
@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-是 */
@@ -88,8 +95,6 @@ public class EmisWarehouseInBatch extends BaseEntity
private BigDecimal totalVolume;
/* 总重量-旧 */
private BigDecimal totalWeight;
-
-
/* 件数-新 */
private Integer parcelQty;
/* 实际重量-新 */
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInBatchMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInBatchMapper.java
index e7f9f136a..b27b5deb5 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInBatchMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInBatchMapper.java
@@ -56,6 +56,9 @@ public interface EmisWarehouseInBatchMapper extends BaseMapper
+
+
+
@@ -26,9 +29,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
+
-
+
@@ -43,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select id, serial_no, in_no, in_batch_no, customer_code, customer_name, order_sn, bill_code, trans_car_no, entry_date, confirm_status, confirm_date, status, bl_prepare_in_freight, prepare_in_est_fee, prepare_in_real_fee, prepare_in_express, prepare_in_bill_code, prepare_in_remark, prepare_in_supplier, pack_type, total_parcel_qty, total_volume, total_weight, parcel_qty, bill_weight, real_value, pic_url, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_warehouse_in_batch
+ select id, serial_no, in_no, in_batch_no, customer_code, customer_name, order_sn, bill_code, trans_car_no, entry_date, confirm_status, confirm_date, bl_abnormal, abnormal_date, abnormal_desc, status, bl_prepare_in_freight, prepare_in_est_fee, prepare_in_real_fee, prepare_in_express, prepare_in_bill_code, prepare_in_remark, prepare_in_supplier, pack_type, total_parcel_qty, total_volume, total_weight, parcel_qty, bill_weight, real_value, pic_url, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_warehouse_in_batch
@@ -114,6 +121,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
entry_date,
confirm_status,
confirm_date,
+ bl_abnormal,
+ abnormal_date,
+ abnormal_desc,
status,
bl_prepare_in_freight,
prepare_in_est_fee,
@@ -152,6 +162,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{entryDate},
#{confirmStatus},
#{confirmDate},
+ #{blAbnormal},
+ #{abnormalDate},
+ #{abnormalDesc},
#{status},
#{blPrepareInFreight},
#{prepareInEstFee},
@@ -194,6 +207,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
entry_date = #{entryDate},
confirm_status = #{confirmStatus},
confirm_date = #{confirmDate},
+ bl_abnormal = #{blAbnormal},
+ abnormal_date = #{abnormalDate},
+ abnormal_desc = #{abnormalDesc},
status = #{status},
bl_prepare_in_freight = #{blPrepareInFreight},
prepare_in_est_fee = #{prepareInEstFee},
@@ -223,6 +239,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where id = #{id}
+
+ update emis_warehouse_in_batch set bl_abnormal = '1',abnormal_date=now(),abnormal_desc = #{abnormalDesc}
+ where serial_no = #{serialNo}
+
+
+
update emis_warehouse_in_batch set del_flag='1' where id = #{id}