UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

收费出库明细生成单据bug修改

Browse Source
dev_fifo1.0
anthonywj 2 years ago
parent 79314bbe8c
commit c9d87c8070
4 changed files with 26 additions and 436 deletions
Show Stats Download Patch File Download Diff File

11
src/main/java/com/glxp/api/dao/thrsys/ThrInvOrderDetailMapper.java
Unescape Escape View File

@ -12,17 +12,6 @@ import java.util.List;
@Mapper @Mapper
public interface ThrInvOrderDetailMapper extends BaseMapperPlus<ThrInvOrderDetailMapper, ThrInvOrderDetail, ThrInvOrderDetail> { public interface ThrInvOrderDetailMapper extends BaseMapperPlus<ThrInvOrderDetailMapper, ThrInvOrderDetail, ThrInvOrderDetail> {
int deleteByPrimaryKey(Integer id);
int insert(ThrInvOrderDetail record);
int insertSelective(ThrInvOrderDetail record);
ThrInvOrderDetail selectByPrimaryKey(Integer id);
int updateByPrimaryKeySelective(ThrInvOrderDetail record);
int updateByPrimaryKey(ThrInvOrderDetail record);
List<ThrInvOrderDetail> filterThrOrderDetailDetail(FilterThrInvOrderDetailRequest filterThrInvOrderDetailRequest); List<ThrInvOrderDetail> filterThrOrderDetailDetail(FilterThrInvOrderDetailRequest filterThrInvOrderDetailRequest);

10
src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
Unescape Escape View File

@ -983,27 +983,27 @@ public class IoOrderServiceImpl implements IoOrderService {
IoOrderEntity orderEntity = findByBillNo(billNo); IoOrderEntity orderEntity = findByBillNo(billNo);
ThrOrderUploadBustypesEntity thrOrderUploadBustypesEntity = thrOrderUploadBustypesService.findByAction(orderEntity.getAction()); ThrOrderUploadBustypesEntity thrOrderUploadBustypesEntity = thrOrderUploadBustypesService.findByAction(orderEntity.getAction());
if (thrOrderUploadBustypesEntity == null) { if (thrOrderUploadBustypesEntity == null) {
log.error(billNo + ":" + orderEntity.getAction() + "单据类型未设置自动上传"); // log.error(billNo + ":" + orderEntity.getAction() + "单据类型未设置自动上传");
continue; continue;
} }
if (!thrOrderUploadBustypesEntity.getOrderSource().contains(orderEntity.getFromType() + "")) { if (!thrOrderUploadBustypesEntity.getOrderSource().contains(orderEntity.getFromType() + "")) {
log.error(billNo + ":" + "单据来源不允许自动提交"); // log.error(billNo + ":" + "单据来源不允许自动提交");
continue; continue;
} }
if (IntUtil.value(thrOrderUploadBustypesEntity.getOrderStatus()) == 1) { if (IntUtil.value(thrOrderUploadBustypesEntity.getOrderStatus()) == 1) {
if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_CHECK_REW) { if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_CHECK_REW) {
log.error(billNo + ":" + "非待审核单据"); // log.error(billNo + ":" + "非待审核单据");
continue; continue;
} }
} else if (IntUtil.value(thrOrderUploadBustypesEntity.getOrderStatus()) == 2) { } else if (IntUtil.value(thrOrderUploadBustypesEntity.getOrderStatus()) == 2) {
if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_AUDITED) { if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_AUDITED) {
log.error(billNo + ":" + "非已审核单据"); // log.error(billNo + ":" + "非已审核单据");
continue; continue;
} }
} else if (IntUtil.value(thrOrderUploadBustypesEntity.getOrderStatus()) == 3) { } else if (IntUtil.value(thrOrderUploadBustypesEntity.getOrderStatus()) == 3) {
if (IntUtil.value(orderEntity.getCheckStatus()) != 1) { if (IntUtil.value(orderEntity.getCheckStatus()) != 1) {
log.error(billNo + ":" + "非已确认单据"); // log.error(billNo + ":" + "非已确认单据");
continue; continue;
} }
} }

2
src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderDetailServiceImpl.java
Unescape Escape View File

@ -35,7 +35,7 @@ public class ThrInvOrderDetailServiceImpl implements ThrInvOrderDetailService {
@Override @Override
public int delThrInvOrderDetail(Integer id) { public int delThrInvOrderDetail(Integer id) {
return thrInvOrderDetailMapper.deleteByPrimaryKey(id); return thrInvOrderDetailMapper.deleteById(id);
} }
@Override @Override

439
src/main/resources/mybatis/mapper/thrsys/ThrInvOrderDetailMapper.xml
Unescape Escape View File

@ -1,424 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.glxp.api.dao.thrsys.ThrInvOrderDetailMapper"> <mapper namespace="com.glxp.api.dao.thrsys.ThrInvOrderDetailMapper">
<resultMap id="BaseResultMap" type="com.glxp.api.entity.thrsys.ThrInvOrderDetail"> <select id="filterThrOrderDetailDetail" parameterType="com.glxp.api.req.thrsys.FilterThrInvOrderDetailRequest"
<!--@mbg.generated--> resultType="com.glxp.api.entity.thrsys.ThrInvOrderDetail">
<!--@Table thr_inv_order_detail--> SELECT *
<id column="id" jdbcType="INTEGER" property="id" /> FROM thr_inv_order_detail
<result column="orderIdFk" jdbcType="VARCHAR" property="orderIdFk" /> <where>
<result column="cpmctymc" jdbcType="VARCHAR" property="cpmctymc" /> <if test="orderIdFk != '' and orderIdFk != null">
<result column="relId" jdbcType="INTEGER" property="relId" /> AND orderIdFk = #{orderIdFk}
<result column="thrCode" jdbcType="VARCHAR" property="thrCode" /> </if>
<result column="nameCode" jdbcType="VARCHAR" property="nameCode" /> </where>
<result column="ggxh" jdbcType="VARCHAR" property="ggxh" /> </select>
<result column="batchNo" jdbcType="VARCHAR" property="batchNo" />
<result column="measname" jdbcType="VARCHAR" property="measname" />
<result column="price" jdbcType="DECIMAL" property="price" />
<result column="productionDate" jdbcType="TIMESTAMP" property="productionDate" />
<result column="expireDate" jdbcType="TIMESTAMP" property="expireDate" />
<result column="ylqxzcrbarmc" jdbcType="VARCHAR" property="ylqxzcrbarmc" />
<result column="zczbhhzbapzbh" jdbcType="VARCHAR" property="zczbhhzbapzbh" />
<result column="inCount" jdbcType="VARCHAR" property="inCount" />
<result column="outCount" jdbcType="VARCHAR" property="outCount" />
<result column="supName" jdbcType="VARCHAR" property="supName" />
<result column="deptName" jdbcType="VARCHAR" property="deptName" />
<result column="deptCode" jdbcType="VARCHAR" property="deptCode" />
<result column="invName" jdbcType="VARCHAR" property="invName" />
<result column="invCode" jdbcType="VARCHAR" property="invCode" />
<result column="spaceCode" jdbcType="VARCHAR" property="spaceCode" />
<result column="spaceName" jdbcType="VARCHAR" property="spaceName" />
<result column="reCount" jdbcType="VARCHAR" property="reCount" />
<result column="mainAction" jdbcType="VARCHAR" property="mainAction" />
<result column="manufacturer" jdbcType="VARCHAR" property="manufacturer" />
<result column="remark" jdbcType="VARCHAR" property="remark" />
<result column="udiCode" jdbcType="VARCHAR" property="udiCode" />
<result column="serialNo" jdbcType="VARCHAR" property="serialNo" />
<result column="sickerCode" jdbcType="VARCHAR" property="sickerCode" />
<result column="sickerName" jdbcType="VARCHAR" property="sickerName" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
id, orderIdFk, cpmctymc, relId, thrCode, nameCode, ggxh, batchNo, measname, price,
productionDate, expireDate, ylqxzcrbarmc, zczbhhzbapzbh, inCount, outCount, supName,
deptName, deptCode, invName, invCode, spaceCode, spaceName, reCount, mainAction,
manufacturer, remark,udiCode,serialNo,sickerCode,sickerName
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
<!--@mbg.generated-->
select
<include refid="Base_Column_List" />
from thr_inv_order_detail
where id = #{id,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
<!--@mbg.generated-->
delete from thr_inv_order_detail
where id = #{id,jdbcType=INTEGER}
</delete>
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.glxp.api.entity.thrsys.ThrInvOrderDetail" useGeneratedKeys="true">
<!--@mbg.generated-->
insert into thr_inv_order_detail (orderIdFk, cpmctymc, relId,
thrCode, nameCode, ggxh,
batchNo, measname, price,
productionDate, expireDate, ylqxzcrbarmc,
zczbhhzbapzbh, inCount, outCount,
supName, deptName, deptCode,
invName, invCode, spaceCode,
spaceName, reCount, mainAction,
manufacturer, remark,udiCode,serialNo,sickerCode,sickerName)
values (#{orderIdFk,jdbcType=VARCHAR}, #{cpmctymc,jdbcType=VARCHAR}, #{relId,jdbcType=INTEGER},
#{thrCode,jdbcType=VARCHAR}, #{nameCode,jdbcType=VARCHAR}, #{ggxh,jdbcType=VARCHAR},
#{batchNo,jdbcType=VARCHAR}, #{measname,jdbcType=VARCHAR}, #{price,jdbcType=DECIMAL},
#{productionDate,jdbcType=TIMESTAMP}, #{expireDate,jdbcType=TIMESTAMP}, #{ylqxzcrbarmc,jdbcType=VARCHAR},
#{zczbhhzbapzbh,jdbcType=VARCHAR}, #{inCount,jdbcType=VARCHAR}, #{outCount,jdbcType=VARCHAR},
#{supName,jdbcType=VARCHAR}, #{deptName,jdbcType=VARCHAR}, #{deptCode,jdbcType=VARCHAR},
#{invName,jdbcType=VARCHAR}, #{invCode,jdbcType=VARCHAR}, #{spaceCode,jdbcType=VARCHAR},
#{spaceName,jdbcType=VARCHAR}, #{reCount,jdbcType=VARCHAR}, #{mainAction,jdbcType=VARCHAR},
#{manufacturer,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{udiCode,jdbcType=VARCHAR}, #{serialNo,jdbcType=VARCHAR}
, #{sickerCode,jdbcType=VARCHAR}, #{sickerName,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.glxp.api.entity.thrsys.ThrInvOrderDetail" useGeneratedKeys="true">
<!--@mbg.generated-->
insert into thr_inv_order_detail
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="orderIdFk != null">
orderIdFk,
</if>
<if test="cpmctymc != null">
cpmctymc,
</if>
<if test="relId != null">
relId,
</if>
<if test="thrCode != null">
thrCode,
</if>
<if test="nameCode != null">
nameCode,
</if>
<if test="ggxh != null">
ggxh,
</if>
<if test="batchNo != null">
batchNo,
</if>
<if test="measname != null">
measname,
</if>
<if test="price != null">
price,
</if>
<if test="productionDate != null">
productionDate,
</if>
<if test="expireDate != null">
expireDate,
</if>
<if test="ylqxzcrbarmc != null">
ylqxzcrbarmc,
</if>
<if test="zczbhhzbapzbh != null">
zczbhhzbapzbh,
</if>
<if test="inCount != null">
inCount,
</if>
<if test="outCount != null">
outCount,
</if>
<if test="supName != null">
supName,
</if>
<if test="deptName != null">
deptName,
</if>
<if test="deptCode != null">
deptCode,
</if>
<if test="invName != null">
invName,
</if>
<if test="invCode != null">
invCode,
</if>
<if test="spaceCode != null">
spaceCode,
</if>
<if test="spaceName != null">
spaceName,
</if>
<if test="reCount != null">
reCount,
</if>
<if test="mainAction != null">
mainAction,
</if>
<if test="manufacturer != null">
manufacturer,
</if>
<if test="remark != null">
remark,
</if>
<if test="udiCode != null">
udiCode,
</if>
<if test="serialNo != null">
serialNo,
</if>
<if test="sickerCode != null">
sickerCode,
</if>
<if test="sickerName != null">
sickerName,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="orderIdFk != null">
#{orderIdFk,jdbcType=VARCHAR},
</if>
<if test="cpmctymc != null">
#{cpmctymc,jdbcType=VARCHAR},
</if>
<if test="relId != null">
#{relId,jdbcType=INTEGER},
</if>
<if test="thrCode != null">
#{thrCode,jdbcType=VARCHAR},
</if>
<if test="nameCode != null">
#{nameCode,jdbcType=VARCHAR},
</if>
<if test="ggxh != null">
#{ggxh,jdbcType=VARCHAR},
</if>
<if test="batchNo != null">
#{batchNo,jdbcType=VARCHAR},
</if>
<if test="measname != null">
#{measname,jdbcType=VARCHAR},
</if>
<if test="price != null">
#{price,jdbcType=DECIMAL},
</if>
<if test="productionDate != null">
#{productionDate,jdbcType=TIMESTAMP},
</if>
<if test="expireDate != null">
#{expireDate,jdbcType=TIMESTAMP},
</if>
<if test="ylqxzcrbarmc != null">
#{ylqxzcrbarmc,jdbcType=VARCHAR},
</if>
<if test="zczbhhzbapzbh != null">
#{zczbhhzbapzbh,jdbcType=VARCHAR},
</if>
<if test="inCount != null">
#{inCount,jdbcType=VARCHAR},
</if>
<if test="outCount != null">
#{outCount,jdbcType=VARCHAR},
</if>
<if test="supName != null">
#{supName,jdbcType=VARCHAR},
</if>
<if test="deptName != null">
#{deptName,jdbcType=VARCHAR},
</if>
<if test="deptCode != null">
#{deptCode,jdbcType=VARCHAR},
</if>
<if test="invName != null">
#{invName,jdbcType=VARCHAR},
</if>
<if test="invCode != null">
#{invCode,jdbcType=VARCHAR},
</if>
<if test="spaceCode != null">
#{spaceCode,jdbcType=VARCHAR},
</if>
<if test="spaceName != null">
#{spaceName,jdbcType=VARCHAR},
</if>
<if test="reCount != null">
#{reCount,jdbcType=VARCHAR},
</if>
<if test="mainAction != null">
#{mainAction,jdbcType=VARCHAR},
</if>
<if test="manufacturer != null">
#{manufacturer,jdbcType=VARCHAR},
</if>
<if test="remark != null">
#{remark,jdbcType=VARCHAR},
</if>
<if test="udiCode != null">
#{udiCode,jdbcType=VARCHAR},
</if>
<if test="serialNo != null">
#{serialNo,jdbcType=VARCHAR},
</if>
<if test="sickerCode != null">
#{sickerCode,jdbcType=VARCHAR},
</if>
<if test="sickerName != null">
#{sickerName,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.glxp.api.entity.thrsys.ThrInvOrderDetail">
<!--@mbg.generated-->
update thr_inv_order_detail
<set>
<if test="orderIdFk != null">
orderIdFk = #{orderIdFk,jdbcType=VARCHAR},
</if>
<if test="cpmctymc != null">
cpmctymc = #{cpmctymc,jdbcType=VARCHAR},
</if>
<if test="relId != null">
relId = #{relId,jdbcType=INTEGER},
</if>
<if test="thrCode != null">
thrCode = #{thrCode,jdbcType=VARCHAR},
</if>
<if test="nameCode != null">
nameCode = #{nameCode,jdbcType=VARCHAR},
</if>
<if test="ggxh != null">
ggxh = #{ggxh,jdbcType=VARCHAR},
</if>
<if test="batchNo != null">
batchNo = #{batchNo,jdbcType=VARCHAR},
</if>
<if test="measname != null">
measname = #{measname,jdbcType=VARCHAR},
</if>
<if test="price != null">
price = #{price,jdbcType=DECIMAL},
</if>
<if test="productionDate != null">
productionDate = #{productionDate,jdbcType=TIMESTAMP},
</if>
<if test="expireDate != null">
expireDate = #{expireDate,jdbcType=TIMESTAMP},
</if>
<if test="ylqxzcrbarmc != null">
ylqxzcrbarmc = #{ylqxzcrbarmc,jdbcType=VARCHAR},
</if>
<if test="zczbhhzbapzbh != null">
zczbhhzbapzbh = #{zczbhhzbapzbh,jdbcType=VARCHAR},
</if>
<if test="inCount != null">
inCount = #{inCount,jdbcType=VARCHAR},
</if>
<if test="outCount != null">
outCount = #{outCount,jdbcType=VARCHAR},
</if>
<if test="supName != null">
supName = #{supName,jdbcType=VARCHAR},
</if>
<if test="deptName != null">
deptName = #{deptName,jdbcType=VARCHAR},
</if>
<if test="deptCode != null">
deptCode = #{deptCode,jdbcType=VARCHAR},
</if>
<if test="invName != null">
invName = #{invName,jdbcType=VARCHAR},
</if>
<if test="invCode != null">
invCode = #{invCode,jdbcType=VARCHAR},
</if>
<if test="spaceCode != null">
spaceCode = #{spaceCode,jdbcType=VARCHAR},
</if>
<if test="spaceName != null">
spaceName = #{spaceName,jdbcType=VARCHAR},
</if>
<if test="reCount != null">
reCount = #{reCount,jdbcType=VARCHAR},
</if>
<if test="mainAction != null">
mainAction = #{mainAction,jdbcType=VARCHAR},
</if>
<if test="manufacturer != null">
manufacturer = #{manufacturer,jdbcType=VARCHAR},
</if>
<if test="remark != null">
remark = #{remark,jdbcType=VARCHAR},
</if>
<if test="udiCode != null">
udiCode = #{udiCode,jdbcType=VARCHAR},
</if>
<if test="serialNo != null">
serialNo = #{serialNo,jdbcType=VARCHAR},
</if>
<if test="sickerCode != null">
sickerCode = #{sickerCode,jdbcType=VARCHAR},
</if>
<if test="sickerName != null">
sickerName = #{sickerName,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKey" parameterType="com.glxp.api.entity.thrsys.ThrInvOrderDetail">
<!--@mbg.generated-->
update thr_inv_order_detail
set orderIdFk = #{orderIdFk,jdbcType=VARCHAR},
cpmctymc = #{cpmctymc,jdbcType=VARCHAR},
relId = #{relId,jdbcType=INTEGER},
thrCode = #{thrCode,jdbcType=VARCHAR},
nameCode = #{nameCode,jdbcType=VARCHAR},
ggxh = #{ggxh,jdbcType=VARCHAR},
batchNo = #{batchNo,jdbcType=VARCHAR},
measname = #{measname,jdbcType=VARCHAR},
price = #{price,jdbcType=DECIMAL},
productionDate = #{productionDate,jdbcType=TIMESTAMP},
expireDate = #{expireDate,jdbcType=TIMESTAMP},
ylqxzcrbarmc = #{ylqxzcrbarmc,jdbcType=VARCHAR},
zczbhhzbapzbh = #{zczbhhzbapzbh,jdbcType=VARCHAR},
inCount = #{inCount,jdbcType=VARCHAR},
outCount = #{outCount,jdbcType=VARCHAR},
supName = #{supName,jdbcType=VARCHAR},
deptName = #{deptName,jdbcType=VARCHAR},
deptCode = #{deptCode,jdbcType=VARCHAR},
invName = #{invName,jdbcType=VARCHAR},
invCode = #{invCode,jdbcType=VARCHAR},
spaceCode = #{spaceCode,jdbcType=VARCHAR},
spaceName = #{spaceName,jdbcType=VARCHAR},
reCount = #{reCount,jdbcType=VARCHAR},
mainAction = #{mainAction,jdbcType=VARCHAR},
manufacturer = #{manufacturer,jdbcType=VARCHAR},
remark = #{remark,jdbcType=VARCHAR},
udiCode = #{udiCode,jdbcType=VARCHAR},
serialNo = #{serialNo,jdbcType=VARCHAR},
sickerCode = #{sickerCode,jdbcType=VARCHAR},
sickerName = #{sickerName,jdbcType=VARCHAR}
where id = #{id,jdbcType=INTEGER}
</update>
<select id="filterThrOrderDetailDetail" parameterType="com.glxp.api.req.thrsys.FilterThrInvOrderDetailRequest"
resultType="com.glxp.api.entity.thrsys.ThrInvOrderDetail">
SELECT *
FROM thr_inv_order_detail
<where>
<if test="orderIdFk != '' and orderIdFk != null">
AND orderIdFk = #{orderIdFk}
</if>
</where>
</select>
<delete id="deleteBatchByThrCodeIds">
delete from thr_inv_order_detail
where thrCode in
<if test="list != null and list.size() != 0">
<foreach collection="list" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</delete>
<delete id="deleteBatchByThrCodeIds">
delete
from thr_inv_order_detail
where thrCode in
<if test="list != null and list.size() != 0">
<foreach collection="list" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</delete>
</mapper> </mapper>

Write Preview
Loading…
Cancel
Save