Browse Source

[fix]生产管理:

生产入库、委内入库单列表页面
委内入库数据库表
新增 委内加工费总价 字段
 委内入库实体类新增成员变量
 mapper.xml新增字段,修改后端查询列表语句,修改后端修改语句,修改后端插入语句
dev
liuxiaoxu 5 months ago
parent
commit
f85a779384
  1. 14
      ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpInboundOrder.java
  2. 8
      ruoyi-admin/src/main/resources/mapper/erp/ErpInboundOrderMapper.xml
  3. 2
      ruoyi-admin/src/main/resources/templates/erp/inboundOrder/inboundOrder.html

14
ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpInboundOrder.java

@ -5,6 +5,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
import java.math.BigDecimal;
import java.util.List; import java.util.List;
/** /**
@ -95,7 +96,9 @@ public class ErpInboundOrder extends BaseEntity
@Excel(name = "入库数量") @Excel(name = "入库数量")
private Long storageNum; private Long storageNum;
/** 委内加工费总价 */
@Excel(name = "委内加工费总价")
private BigDecimal processingFeeTotal;
private List<ErpInboundOrderDetail> inboundDetails; private List<ErpInboundOrderDetail> inboundDetails;
public void setId(Long id) public void setId(Long id)
@ -279,6 +282,14 @@ public class ErpInboundOrder extends BaseEntity
return storageNum; return storageNum;
} }
public BigDecimal getProcessingFeeTotal() {
return processingFeeTotal;
}
public void setProcessingFeeTotal(BigDecimal processingFeeTotal) {
this.processingFeeTotal = processingFeeTotal;
}
public List<ErpInboundOrderDetail> getInboundDetails() { public List<ErpInboundOrderDetail> getInboundDetails() {
return inboundDetails; return inboundDetails;
} }
@ -315,6 +326,7 @@ public class ErpInboundOrder extends BaseEntity
.append("qualityQualifiedNum", getQualityQualifiedNum()) .append("qualityQualifiedNum", getQualityQualifiedNum())
.append("qualityUnqualifiedNum", getQualityUnqualifiedNum()) .append("qualityUnqualifiedNum", getQualityUnqualifiedNum())
.append("storageNum", getStorageNum()) .append("storageNum", getStorageNum())
.append("processingFeeTotal", getProcessingFeeTotal())
.append("inboundDetails",getInboundDetails()) .append("inboundDetails",getInboundDetails())
.toString(); .toString();
} }

8
ruoyi-admin/src/main/resources/mapper/erp/ErpInboundOrderMapper.xml

@ -30,6 +30,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="qualityQualifiedNum" column="quality_qualified_num" /> <result property="qualityQualifiedNum" column="quality_qualified_num" />
<result property="qualityUnqualifiedNum" column="quality_unqualified_num" /> <result property="qualityUnqualifiedNum" column="quality_unqualified_num" />
<result property="storageNum" column="storage_num" /> <result property="storageNum" column="storage_num" />
<result property="processingFeeTotal" column="processing_fee_total" />
</resultMap> </resultMap>
<sql id="selectErpInboundOrderVo"> <sql id="selectErpInboundOrderVo">
@ -58,7 +60,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.num_total, a.num_total,
a.quality_qualified_num, a.quality_qualified_num,
a.quality_unqualified_num, a.quality_unqualified_num,
a.storage_num a.storage_num,
a.processing_fee_total
from erp_inbound_order a from erp_inbound_order a
</sql> </sql>
@ -107,6 +110,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="qualityQualifiedNum != null">quality_qualified_num,</if> <if test="qualityQualifiedNum != null">quality_qualified_num,</if>
<if test="qualityUnqualifiedNum != null">quality_unqualified_num,</if> <if test="qualityUnqualifiedNum != null">quality_unqualified_num,</if>
<if test="storageNum != null">storage_num,</if> <if test="storageNum != null">storage_num,</if>
<if test="processingFeeTotal != null">processing_fee_total,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="delFlag != null">#{delFlag},</if> <if test="delFlag != null">#{delFlag},</if>
@ -133,6 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="qualityQualifiedNum != null">#{qualityQualifiedNum},</if> <if test="qualityQualifiedNum != null">#{qualityQualifiedNum},</if>
<if test="qualityUnqualifiedNum != null">#{qualityUnqualifiedNum},</if> <if test="qualityUnqualifiedNum != null">#{qualityUnqualifiedNum},</if>
<if test="storageNum != null">#{storageNum},</if> <if test="storageNum != null">#{storageNum},</if>
<if test="processingFeeTotal != null">#{processingFeeTotal},</if>
</trim> </trim>
</insert> </insert>
@ -163,6 +168,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="qualityQualifiedNum != null">quality_qualified_num = #{qualityQualifiedNum},</if> <if test="qualityQualifiedNum != null">quality_qualified_num = #{qualityQualifiedNum},</if>
<if test="qualityUnqualifiedNum != null">quality_unqualified_num = #{qualityUnqualifiedNum},</if> <if test="qualityUnqualifiedNum != null">quality_unqualified_num = #{qualityUnqualifiedNum},</if>
<if test="storageNum != null">storage_num = #{storageNum},</if> <if test="storageNum != null">storage_num = #{storageNum},</if>
<if test="processingFeeTotal != null">processing_fee_total = #{processingFeeTotal},</if>
</trim> </trim>
where id = #{id} where id = #{id}
</update> </update>

2
ruoyi-admin/src/main/resources/templates/erp/inboundOrder/inboundOrder.html

@ -175,7 +175,7 @@
}, },
{ {
title: '委内加工费总价', title: '委内加工费总价',
field: 'numTotal', field: 'processingFeeTotal',
}, },
{ {
title: '品质合格数量', title: '品质合格数量',

Loading…
Cancel
Save