root
/
smart-erp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/dev' into dev

dev
zhangsiqi 5 months ago
parent
bc7ec4359b f85a779384
commit
b078caa000
3 changed files with 384 additions and 76 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 184
      ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpInboundOrder.java
  2. 83
      ruoyi-admin/src/main/resources/mapper/erp/ErpInboundOrderMapper.xml
  3. 115
      ruoyi-admin/src/main/resources/templates/erp/inboundOrder/inboundOrder.html

184
ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpInboundOrder.java
View File

@ -5,13 +5,14 @@ import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import java.math.BigDecimal;
import java.util.List;
/**
* 入库单对象 erp_inbound_order
*
* @author ruoyi
* @date 2024-04-24
* @date 2024-06-19
*/
public class ErpInboundOrder extends BaseEntity
{
@ -23,10 +24,18 @@ public class ErpInboundOrder extends BaseEntity
/** 删除标志（0代表存在 1代表删除） */
private String delFlag;
/** 品质单号 */
@Excel(name = "品质单号")
private String qualityOrderCode;
/** 生产订单号 */
@Excel(name = "生产订单号")
private String makeNo;
/** 品质状态(0待品质、1部分品质、全部品质) */
@Excel(name = "品质状态(0待品质、1部分品质、全部品质)")
private String qualityStatus;
/** 关联销售订单号 */
@Excel(name = "关联销售订单号")
private String saleNo;
@ -47,6 +56,49 @@ public class ErpInboundOrder extends BaseEntity
@Excel(name = "入库数")
private Long inboundNum;
/** 工程员 */
@Excel(name = "工程员")
private String engineerName;
/** 生产订单类型 */
@Excel(name = "生产订单类型")
private String orderType;
/** 客户Id */
@Excel(name = "客户Id")
private String customerId;
/** 客户名称 */
@Excel(name = "客户名称")
private String customerName;
/** 客户订单号 */
@Excel(name = "客户订单号")
private String salesOrderNumber;
/** 物料合计 */
@Excel(name = "物料合计")
private Long materialTotal;
/** 数量合计 */
@Excel(name = "数量合计")
private Long numTotal;
/** 品质合格数量 */
@Excel(name = "品质合格数量")
private Long qualityQualifiedNum;
/** 品质不合格数量 */
@Excel(name = "品质不合格数量")
private Long qualityUnqualifiedNum;
/** 入库数量 */
@Excel(name = "入库数量")
private Long storageNum;
/** 委内加工费总价 */
@Excel(name = "委内加工费总价")
private BigDecimal processingFeeTotal;
private List<ErpInboundOrderDetail> inboundDetails;
public void setId(Long id)
@ -67,6 +119,15 @@ public class ErpInboundOrder extends BaseEntity
{
return delFlag;
}
public void setQualityOrderCode(String qualityOrderCode)
{
this.qualityOrderCode = qualityOrderCode;
}
public String getQualityOrderCode()
{
return qualityOrderCode;
}
public void setMakeNo(String makeNo)
{
this.makeNo = makeNo;
@ -76,6 +137,15 @@ public class ErpInboundOrder extends BaseEntity
{
return makeNo;
}
public void setQualityStatus(String qualityStatus)
{
this.qualityStatus = qualityStatus;
}
public String getQualityStatus()
{
return qualityStatus;
}
public void setSaleNo(String saleNo)
{
this.saleNo = saleNo;
@ -121,6 +191,104 @@ public class ErpInboundOrder extends BaseEntity
{
return inboundNum;
}
public void setEngineerName(String engineerName)
{
this.engineerName = engineerName;
}
public String getEngineerName()
{
return engineerName;
}
public void setOrderType(String orderType)
{
this.orderType = orderType;
}
public String getOrderType()
{
return orderType;
}
public void setCustomerId(String customerId)
{
this.customerId = customerId;
}
public String getCustomerId()
{
return customerId;
}
public void setCustomerName(String customerName)
{
this.customerName = customerName;
}
public String getCustomerName()
{
return customerName;
}
public void setSalesOrderNumber(String salesOrderNumber)
{
this.salesOrderNumber = salesOrderNumber;
}
public String getSalesOrderNumber()
{
return salesOrderNumber;
}
public void setMaterialTotal(Long materialTotal)
{
this.materialTotal = materialTotal;
}
public Long getMaterialTotal()
{
return materialTotal;
}
public void setNumTotal(Long numTotal)
{
this.numTotal = numTotal;
}
public Long getNumTotal()
{
return numTotal;
}
public void setQualityQualifiedNum(Long qualityQualifiedNum)
{
this.qualityQualifiedNum = qualityQualifiedNum;
}
public Long getQualityQualifiedNum()
{
return qualityQualifiedNum;
}
public void setQualityUnqualifiedNum(Long qualityUnqualifiedNum)
{
this.qualityUnqualifiedNum = qualityUnqualifiedNum;
}
public Long getQualityUnqualifiedNum()
{
return qualityUnqualifiedNum;
}
public void setStorageNum(Long storageNum)
{
this.storageNum = storageNum;
}
public Long getStorageNum()
{
return storageNum;
}
public BigDecimal getProcessingFeeTotal() {
return processingFeeTotal;
}
public void setProcessingFeeTotal(BigDecimal processingFeeTotal) {
this.processingFeeTotal = processingFeeTotal;
}
public List<ErpInboundOrderDetail> getInboundDetails() {
return inboundDetails;
@ -140,12 +308,26 @@ public class ErpInboundOrder extends BaseEntity
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.append("qualityOrderCode", getQualityOrderCode())
.append("makeNo", getMakeNo())
.append("qualityStatus", getQualityStatus())
.append("saleNo", getSaleNo())
.append("inboundOrderNo", getInboundOrderNo())
.append("inboundStatus", getInboundStatus())
.append("inboundType", getInboundType())
.append("inboundNum", getInboundNum())
.append("engineerName", getEngineerName())
.append("orderType", getOrderType())
.append("customerId", getCustomerId())
.append("customerName", getCustomerName())
.append("salesOrderNumber", getSalesOrderNumber())
.append("materialTotal", getMaterialTotal())
.append("numTotal", getNumTotal())
.append("qualityQualifiedNum", getQualityQualifiedNum())
.append("qualityUnqualifiedNum", getQualityUnqualifiedNum())
.append("storageNum", getStorageNum())
.append("processingFeeTotal", getProcessingFeeTotal())
.append("inboundDetails",getInboundDetails())
.toString();
}
}

83
ruoyi-admin/src/main/resources/mapper/erp/ErpInboundOrderMapper.xml
View File

@ -12,16 +12,57 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
<result property="qualityOrderCode" column="quality_order_code" />
<result property="makeNo" column="make_no" />
<result property="qualityStatus" column="quality_status" />
<result property="saleNo" column="sale_no" />
<result property="inboundOrderNo" column="inbound_order_no" />
<result property="inboundStatus" column="inbound_status" />
<result property="inboundType" column="inbound_type" />
<result property="inboundNum" column="inbound_num" />
<result property="engineerName" column="engineer_name" />
<result property="orderType" column="order_type" />
<result property="customerId" column="customer_id" />
<result property="customerName" column="customer_name" />
<result property="salesOrderNumber" column="sales_order_number" />
<result property="materialTotal" column="material_total" />
<result property="numTotal" column="num_total" />
<result property="qualityQualifiedNum" column="quality_qualified_num" />
<result property="qualityUnqualifiedNum" column="quality_unqualified_num" />
<result property="storageNum" column="storage_num" />
<result property="processingFeeTotal" column="processing_fee_total" />
</resultMap>
<sql id="selectErpInboundOrderVo">
select a.id, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time, a.remark, a.make_no, a.sale_no, a.inbound_order_no, a.inbound_status, a.inbound_type, a.inbound_num from erp_inbound_order a
select
a.id,
a.del_flag,
a.create_by,
a.create_time,
a.update_by,
a.update_time,
a.remark,
a.quality_order_code,
a.make_no,
a.quality_status,
a.sale_no,
a.inbound_order_no,
a.inbound_status,
a.inbound_type,
a.inbound_num,
a.engineer_name,
a.order_type,
a.customer_id,
a.customer_name,
a.sales_order_number,
a.material_total,
a.num_total,
a.quality_qualified_num,
a.quality_unqualified_num,
a.storage_num,
a.processing_fee_total
from erp_inbound_order a
</sql>
<select id="selectErpInboundOrderList" parameterType="ErpInboundOrder" resultMap="ErpInboundOrderResult">
@ -33,6 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="inboundStatus != null and inboundStatus != ''"> and a.inbound_status = #{inboundStatus}</if>
<if test="inboundType != null and inboundType != ''"> and a.inbound_type = #{inboundType}</if>
<if test="inboundNum != null "> and a.inbound_num = #{inboundNum}</if>
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and a.create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
</where>
</select>
@ -51,11 +93,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if>
<if test="makeNo != null">make_no,</if>
<if test="qualityOrderCode != null">quality_order_code,</if>
<if test="qualityStatus != null">quality_status,</if>
<if test="saleNo != null">sale_no,</if>
<if test="inboundOrderNo != null">inbound_order_no,</if>
<if test="inboundStatus != null">inbound_status,</if>
<if test="inboundType != null">inbound_type,</if>
<if test="inboundNum != null">inbound_num,</if>
<if test="engineerName != null">engineer_name,</if>
<if test="orderType != null">order_type,</if>
<if test="customerId != null">customer_id,</if>
<if test="customerName != null">customer_name,</if>
<if test="salesOrderNumber != null">sales_order_number,</if>
<if test="materialTotal != null">material_total,</if>
<if test="numTotal != null">num_total,</if>
<if test="qualityQualifiedNum != null">quality_qualified_num,</if>
<if test="qualityUnqualifiedNum != null">quality_unqualified_num,</if>
<if test="storageNum != null">storage_num,</if>
<if test="processingFeeTotal != null">processing_fee_total,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="delFlag != null">#{delFlag},</if>
@ -65,11 +120,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if>
<if test="makeNo != null">#{makeNo},</if>
<if test="qualityOrderCode != null">#{qualityOrderCode},</if>
<if test="qualityStatus != null">#{qualityStatus},</if>
<if test="saleNo != null">#{saleNo},</if>
<if test="inboundOrderNo != null">#{inboundOrderNo},</if>
<if test="inboundStatus != null">#{inboundStatus},</if>
<if test="inboundType != null">#{inboundType},</if>
<if test="inboundNum != null">#{inboundNum},</if>
<if test="engineerName != null">#{engineerName},</if>
<if test="orderType != null">#{orderType},</if>
<if test="customerId != null">#{customerId},</if>
<if test="customerName != null">#{customerName},</if>
<if test="salesOrderNumber != null">#{salesOrderNumber},</if>
<if test="materialTotal != null">#{materialTotal},</if>
<if test="numTotal != null">#{numTotal},</if>
<if test="qualityQualifiedNum != null">#{qualityQualifiedNum},</if>
<if test="qualityUnqualifiedNum != null">#{qualityUnqualifiedNum},</if>
<if test="storageNum != null">#{storageNum},</if>
<if test="processingFeeTotal != null">#{processingFeeTotal},</if>
</trim>
</insert>
@ -83,11 +151,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="makeNo != null">make_no = #{makeNo},</if>
<if test="qualityOrderCode != null">quality_order_code = #{qualityOrderCode},</if>
<if test="qualityStatus != null">quality_status = #{qualityStatus},</if>
<if test="saleNo != null">sale_no = #{saleNo},</if>
<if test="inboundOrderNo != null">inbound_order_no = #{inboundOrderNo},</if>
<if test="inboundStatus != null">inbound_status = #{inboundStatus},</if>
<if test="inboundType != null">inbound_type = #{inboundType},</if>
<if test="inboundNum != null">inbound_num = #{inboundNum},</if>
<if test="engineerName != null">engineer_name = #{engineerName},</if>
<if test="orderType != null">order_type = #{orderType},</if>
<if test="customerId != null">customer_id = #{customerId},</if>
<if test="customerName != null">customer_name = #{customerName},</if>
<if test="salesOrderNumber != null">sales_order_number = #{salesOrderNumber},</if>
<if test="materialTotal != null">material_total = #{materialTotal},</if>
<if test="numTotal != null">num_total = #{numTotal},</if>
<if test="qualityQualifiedNum != null">quality_qualified_num = #{qualityQualifiedNum},</if>
<if test="qualityUnqualifiedNum != null">quality_unqualified_num = #{qualityUnqualifiedNum},</if>
<if test="storageNum != null">storage_num = #{storageNum},</if>
<if test="processingFeeTotal != null">processing_fee_total = #{processingFeeTotal},</if>
</trim>
where id = #{id}
</update>

115
ruoyi-admin/src/main/resources/templates/erp/inboundOrder/inboundOrder.html
View File

@ -11,34 +11,19 @@
<div class="select-list">
<ul>
<li>
<label>入库单号：</label>
<input type="text" name="inboundOrderNo"/>
</li>
<li>
<label>关联生产单号：</label>
<label>生产订单号：</label>
<input type="text" name="makeNo"/>
</li>
<li>
<label>客户ID：</label>
<input type="text" name="customerCode"/>
</li>
<li>
<label>客户公司名称：</label>
<input type="text" name="customerCompanyName"/>
</li>
<li>
<label>生产状态：</label>
<select name="inboundType" th:with="type=${@dict.getType('sys_erp_makeStatus')}">
<label>品质状态：</label>
<select name="qualityStatus" th:with="type=${@dict.getType('warehouse_quality_status')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
<label>使用状态：</label>
<select name="useStatus" th:with="type=${@dict.getType('useStatus')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
<label>入库单号：</label>
<input type="text" name="inboundOrderNo"/>
</li>
<li>
<label>入库状态：</label>
@ -48,19 +33,27 @@
</select>
</li>
<li>
<label>品质状态：</label>
<select name="qualityStatus" th:with="type=${@dict.getType('qualityStatus')}">
<label>入库类型：</label>
<select name="inboundType" th:with="type=${@dict.getType('erp_inbound_type')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
<label>品质状态：</label>
<label>生产订单类型：</label>
<select name="orderType" th:with="type=${@dict.getType('sys_order_type')}">
<option value="">所有</option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select>
</li>
<li>
<label>客户Id：</label>
<input type="text" name="customerId"/>
</li>
<li>
<label>客户名称：</label>
<input type="text" name="customerName"/>
</li>
<li class="select-time">
<label>录入时间：</label>
<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/>
@ -103,6 +96,10 @@
var restoreFlag = [[${@permission.hasPermi('erp:inboundOrder:restore')}]];
var inboundStatusDatas = [[${@dict.getType('erp_inbound_status')}]];
var inboundTypeDatas = [[${@dict.getType('erp_inbound_type')}]];
var warehouseQualityStatusDatas = [[${@dict.getType('warehouse_quality_status')}]];
var orderTypeDatas = [[${@dict.getType('sys_order_type')}]];
var prefix = ctx + "erp/inboundOrder";
$(function() {
@ -119,8 +116,21 @@
columns: [
{checkbox: true},
{title: '主键ID',field: 'id',visible: false},
{title: '品质单号',field: ''},
{title: '品质状态',field: '',},
{
title: '品质单号',
field: 'qualityOrderCode',
},
{
title: '生产订单号',
field: 'makeNo',
},
{
title: '仓库品质状态',
field: 'warehouseQualityStatus',
formatter: function(value, row, index) {
return $.table.selectDictLabel(warehouseQualityStatusDatas, value);
}
},
{title: '入库状态',field: 'inboundStatus',
formatter: function(value, row, index) {
return $.table.selectDictLabel(inboundStatusDatas, value);
@ -129,21 +139,56 @@
{title: '入库单号',field: 'inboundOrderNo',},
{title: '关联生产订单号',field: 'makeNo',},
{title: '关联销售订单号',field: 'saleNo',visible: false,},
{title: '生产订单类型',field: '',},
{
title: '工程员',
field: 'engineerName',
},
{title: '生产订单类型',field: 'orderType',
formatter: function(value, row, index) {
return $.table.selectDictLabel(orderTypeDatas, value);
}
},
{title: '入库类型',field: 'inboundType',
formatter: function(value, row, index) {
return $.table.selectDictLabel(inboundTypeDatas, value);
}
},
{title: '客户ID',field: '',},
{title: '客户公司名称',field: '',},
{title: '客户订单号',field: '',},
{title: '物料合计',field: '',},
{title: '数量合计',field: '',},
{title: '委内加工费总价',field: '',},
{title: '品质合格数',field: '',},
{title: '品项不合格数',field: '',},
{title: '入库数',field: 'inboundNum',},
{
title: '客户Id',
field: 'customerId',
},
{
title: '客户公司名称',
field: 'customerName',
},
{
title: '客户订单号',
field: 'salesOrderNumber',
},
{
title: '物料合计',
field: 'materialTotal',
},
{
title: '数量合计',
field: 'numTotal',
},
{
title: '委内加工费总价',
field: 'processingFeeTotal',
},
{
title: '品质合格数量',
field: 'qualityQualifiedNum',
},
{
title: '品质不合格数量',
field: 'qualityUnqualifiedNum',
},
{
title: '入库数量',
field: 'storageNum',
},
{title: '录入人',field: 'inboundUser',},
{title: '录入时间',field: 'inboundTime',},
{title: '更新人',field: '',},

Write Preview
Loading…
Cancel
Save