aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2025-01-05 16:20:35 +08:00
parent 9ce1f5e8c9
commit f0d34a0071
6 changed files with 46 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWarehouseInBatchController.java
View File

@ -125,6 +125,7 @@ public class EmisWarehouseInBatchController extends EmisBaseController
return toAjax(emisWarehouseInBatchService.updateEmisWarehouseInBatch(emisWarehouseInBatch));
}
/**
* 删除进仓单批次
*/

9
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWarehouseInBatch.java
View File

@ -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;
/* 实际重量-新 */

3
emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisWarehouseInBatchMapper.java
View File

@ -56,6 +56,9 @@ public interface EmisWarehouseInBatchMapper extends BaseMapper<EmisWarehouseInBa
*/
public int updateEmisWarehouseInBatch(EmisWarehouseInBatch emisWarehouseInBatch);
public int updateAbnormalBySerialNo(EmisWarehouseInBatch emisWarehouseInBatch);
/**
* 删除
*

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWarehouseInBatchService.java
View File

@ -52,6 +52,8 @@ public interface IEmisWarehouseInBatchService
*/
public int updateEmisWarehouseInBatch(EmisWarehouseInBatch emisWarehouseInBatch);
public int updateAbnormalBySerialNo(EmisWarehouseInBatch emisWarehouseInBatch);
/**
* 重新计算总重量和总体积

6
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWarehouseInBatchServiceImpl.java
View File

@ -205,6 +205,12 @@ public class EmisWarehouseInBatchServiceImpl extends EmisBaseService implements
return emisWarehouseInBatchMapper.updateEmisWarehouseInBatch(emisWarehouseInBatch);
}
@Override
public int updateAbnormalBySerialNo(EmisWarehouseInBatch emisWarehouseInBatch)
{
return emisWarehouseInBatchMapper.updateAbnormalBySerialNo(emisWarehouseInBatch);
}
/**
* 批量删除进仓单批次
*

32
emis-biz/src/main/resources/mapper/EmisWarehouseInBatchMapper.xml
View File

@ -17,6 +17,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="entryDate" column="entry_date" />
<result property="confirmStatus" column="confirm_status" />
<result property="confirmDate" column="confirm_date" />
<result property="blAbnormal" column="bl_abnormal" />
<result property="abnormalDate" column="abnormal_date" />
<result property="abnormalDesc" column="abnormal_desc" />
<result property="status" column="status" />
<result property="blPrepareInFreight" column="bl_prepare_in_freight" />
<result property="prepareInEstFee" column="prepare_in_est_fee" />
@ -26,9 +29,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="prepareInRemark" column="prepare_in_remark" />
<result property="prepareInSupplier" column="prepare_in_supplier" />
<result property="packType" column="pack_type" />
<result property="totalParcelQty" column="parcel_qty" />
<result property="totalParcelQty" column="total_parcel_qty" />
<result property="totalVolume" column="total_volume" />
<result property="totalWeight" column="bill_weight" />
<result property="totalWeight" column="total_weight" />
<result property="parcelQty" column="parcel_qty" />
<result property="billWeight" column="bill_weight" />
<result property="realValue" column="real_value" />
@ -43,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectEmisWarehouseInBatchVo">
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
</sql>
<select id="selectEmisWarehouseInBatchList" parameterType="EmisWarehouseInBatch" resultMap="EmisWarehouseInBatchResult">
@ -84,18 +87,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null "> and update_time = #{updateTime}</if>
<if test="createSite != null and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
<if test="updateSite != null and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
<if test="blAbnormal != null and blAbnormal != ''"> and bl_abnormal like concat('%', #{blAbnormal}, '%')</if>
<if test="abnormalDate != null "> and abnormal_date = #{abnormalDate}</if>
<if test="abnormalDesc != null and abnormalDesc != ''"> and abnormal_desc like concat('%', #{abnormalDesc}, '%')</if>
</where>
order by create_time desc
</select>
<select id="selectEmisWarehouseInBatchById" parameterType="Long" resultMap="EmisWarehouseInBatchResult">
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
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 a
where a.id = #{id}
</select>
<select id="selectInBatchListByInNo" parameterType="String" resultMap="EmisWarehouseInBatchResult">
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
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 a
where del_flag='0' and a.in_no = #{inNo}
</select>
@ -114,6 +121,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="entryDate != null">entry_date,</if>
<if test="confirmStatus != null and confirmStatus != ''">confirm_status,</if>
<if test="confirmDate != null">confirm_date,</if>
<if test="blAbnormal != null and blAbnormal != ''">bl_abnormal,</if>
<if test="abnormalDate != null">abnormal_date,</if>
<if test="abnormalDesc != null and abnormalDesc != ''">abnormal_desc,</if>
<if test="status != null and status != ''">status,</if>
<if test="blPrepareInFreight != null and blPrepareInFreight != ''">bl_prepare_in_freight,</if>
<if test="prepareInEstFee != null">prepare_in_est_fee,</if>
@ -152,6 +162,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="entryDate != null">#{entryDate},</if>
<if test="confirmStatus != null and confirmStatus != ''">#{confirmStatus},</if>
<if test="confirmDate != null">#{confirmDate},</if>
<if test="blAbnormal != null and blAbnormal != ''">#{blAbnormal},</if>
<if test="abnormalDate != null">#{abnormalDate},</if>
<if test="abnormalDesc != null and abnormalDesc != ''">#{abnormalDesc},</if>
<if test="status != null and status != ''">#{status},</if>
<if test="blPrepareInFreight != null and blPrepareInFreight != ''">#{blPrepareInFreight},</if>
<if test="prepareInEstFee != null">#{prepareInEstFee},</if>
@ -194,6 +207,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="entryDate != null">entry_date = #{entryDate},</if>
<if test="confirmStatus != null and confirmStatus != ''">confirm_status = #{confirmStatus},</if>
<if test="confirmDate != null">confirm_date = #{confirmDate},</if>
<if test="blAbnormal != null and blAbnormal != ''">bl_abnormal = #{blAbnormal},</if>
<if test="abnormalDate != null">abnormal_date = #{abnormalDate},</if>
<if test="abnormalDesc != null and abnormalDesc != ''">abnormal_desc = #{abnormalDesc},</if>
<if test="status != null and status != ''">status = #{status},</if>
<if test="blPrepareInFreight != null and blPrepareInFreight != ''">bl_prepare_in_freight = #{blPrepareInFreight},</if>
<if test="prepareInEstFee != null">prepare_in_est_fee = #{prepareInEstFee},</if>
@ -223,6 +239,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where id = #{id}
</update>
<update id="updateAbnormalBySerialNo" parameterType="EmisWarehouseInBatch">
update emis_warehouse_in_batch set bl_abnormal = '1',abnormal_date=now(),abnormal_desc = #{abnormalDesc}
where serial_no = #{serialNo}
</update>
<delete id="deleteEmisWarehouseInBatchById" parameterType="Long">
update emis_warehouse_in_batch set del_flag='1' where id = #{id}
</delete>