yinq
/
XMXS-OS-BACK
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change - ERP订单添加明细属性

Browse Source
main
yinq 5 months ago
parent b63034f232
commit 312d3886ad
4 changed files with 231 additions and 88 deletions
Show Stats Download Patch File Download Diff File

7
os-mes/src/main/java/com/os/mes/api/service/impl/ERPPortServiceImpl.java
View File

File diff suppressed because one or more lines are too long

10
os-mes/src/main/java/com/os/mes/prod/domain/ProdOrderInfo.java
Unescape Escape View File

@ -185,6 +185,16 @@ public class ProdOrderInfo extends BaseEntity {
@Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date updatedTime; private Date updatedTime;
private ProdOrderDetail orderDetail;
public ProdOrderDetail getOrderDetail() {
return orderDetail;
}
public void setOrderDetail(ProdOrderDetail orderDetail) {
this.orderDetail = orderDetail;
}
public void setObjId(Long objId) { public void setObjId(Long objId) {
this.objId = objId; this.objId = objId;
} }

49
os-mes/src/main/resources/mapper/mes/prod/ProdOrderDetailMapper.xml
Unescape Escape View File

@ -74,10 +74,10 @@
<result property="PartitionArea" column="PartitionArea"/> <result property="PartitionArea" column="PartitionArea"/>
<result property="EdgeBandingTotalArea" column="EdgeBandingTotalArea"/> <result property="EdgeBandingTotalArea" column="EdgeBandingTotalArea"/>
<result property="WireropeBeltTotalArea" column="WireropeBeltTotalArea"/> <result property="WireropeBeltTotalArea" column="WireropeBeltTotalArea"/>
<result property="createdBy" column="created_by"/> <result property="createBy" column="create_by"/>
<result property="createdTime" column="created_time"/> <result property="createTime" column="create_time"/>
<result property="updatedBy" column="updated_by"/> <result property="updateBy" column="update_by"/>
<result property="updatedTime" column="updated_time"/> <result property="updateTime" column="update_time"/>
</resultMap> </resultMap>
<sql id="selectProdOrderDetailVo"> <sql id="selectProdOrderDetailVo">
@ -150,10 +150,10 @@
PartitionArea, PartitionArea,
EdgeBandingTotalArea, EdgeBandingTotalArea,
WireropeBeltTotalArea, WireropeBeltTotalArea,
created_by, create_by,
created_time, create_time,
updated_by, update_by,
updated_time update_time
from prod_order_detail from prod_order_detail
</sql> </sql>
@ -178,11 +178,6 @@
</if> </if>
<if test="BeltWidth != null ">and BeltWidth = #{BeltWidth}</if> <if test="BeltWidth != null ">and BeltWidth = #{BeltWidth}</if>
<if test="BeltClothLayer != null ">and BeltClothLayer = #{BeltClothLayer}</if> <if test="BeltClothLayer != null ">and BeltClothLayer = #{BeltClothLayer}</if>
<if test="BeltRequiredLength != null ">and BeltRequiredLength = #{BeltRequiredLength}</if>
<if test="GluingRequiredThickness != null ">and GluingRequiredThickness = #{GluingRequiredThickness}</if>
<if test="LowerGlueRequiredThickness != null ">and LowerGlueRequiredThickness =
#{LowerGlueRequiredThickness}
</if>
<if test="LargeClothArea != null ">and LargeClothArea = #{LargeClothArea}</if> <if test="LargeClothArea != null ">and LargeClothArea = #{LargeClothArea}</if>
<if test="SmallClothArea != null ">and SmallClothArea = #{SmallClothArea}</if> <if test="SmallClothArea != null ">and SmallClothArea = #{SmallClothArea}</if>
<if test="BeltTotalArea != null ">and BeltTotalArea = #{BeltTotalArea}</if> <if test="BeltTotalArea != null ">and BeltTotalArea = #{BeltTotalArea}</if>
@ -190,10 +185,6 @@
<if test="PartitionArea != null ">and PartitionArea = #{PartitionArea}</if> <if test="PartitionArea != null ">and PartitionArea = #{PartitionArea}</if>
<if test="EdgeBandingTotalArea != null ">and EdgeBandingTotalArea = #{EdgeBandingTotalArea}</if> <if test="EdgeBandingTotalArea != null ">and EdgeBandingTotalArea = #{EdgeBandingTotalArea}</if>
<if test="WireropeBeltTotalArea != null ">and WireropeBeltTotalArea = #{WireropeBeltTotalArea}</if> <if test="WireropeBeltTotalArea != null ">and WireropeBeltTotalArea = #{WireropeBeltTotalArea}</if>
<if test="createdBy != null and createdBy != ''">and created_by = #{createdBy}</if>
<if test="createdTime != null ">and created_time = #{createdTime}</if>
<if test="updatedBy != null and updatedBy != ''">and updated_by = #{updatedBy}</if>
<if test="updatedTime != null ">and updated_time = #{updatedTime}</if>
</where> </where>
</select> </select>
@ -273,10 +264,10 @@
<if test="PartitionArea != null">PartitionArea,</if> <if test="PartitionArea != null">PartitionArea,</if>
<if test="EdgeBandingTotalArea != null">EdgeBandingTotalArea,</if> <if test="EdgeBandingTotalArea != null">EdgeBandingTotalArea,</if>
<if test="WireropeBeltTotalArea != null">WireropeBeltTotalArea,</if> <if test="WireropeBeltTotalArea != null">WireropeBeltTotalArea,</if>
<if test="createdBy != null">created_by,</if> <if test="createBy != null">create_by,</if>
<if test="createdTime != null">created_time,</if> <if test="createTime != null">create_time,</if>
<if test="updatedBy != null">updated_by,</if> <if test="updateBy != null">update_by,</if>
<if test="updatedTime != null">updated_time,</if> <if test="updateTime != null">update_time,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="SeqNo != null and SeqNo != ''">#{SeqNo},</if> <if test="SeqNo != null and SeqNo != ''">#{SeqNo},</if>
@ -347,10 +338,10 @@
<if test="PartitionArea != null">#{PartitionArea},</if> <if test="PartitionArea != null">#{PartitionArea},</if>
<if test="EdgeBandingTotalArea != null">#{EdgeBandingTotalArea},</if> <if test="EdgeBandingTotalArea != null">#{EdgeBandingTotalArea},</if>
<if test="WireropeBeltTotalArea != null">#{WireropeBeltTotalArea},</if> <if test="WireropeBeltTotalArea != null">#{WireropeBeltTotalArea},</if>
<if test="createdBy != null">#{createdBy},</if> <if test="createBy != null">#{createBy},</if>
<if test="createdTime != null">#{createdTime},</if> <if test="createTime != null">#{createTime},</if>
<if test="updatedBy != null">#{updatedBy},</if> <if test="updateBy != null">#{updateBy},</if>
<if test="updatedTime != null">#{updatedTime},</if> <if test="updateTime != null">#{updateTime},</if>
</trim> </trim>
</insert> </insert>
@ -434,10 +425,10 @@
<if test="PartitionArea != null">PartitionArea = #{PartitionArea},</if> <if test="PartitionArea != null">PartitionArea = #{PartitionArea},</if>
<if test="EdgeBandingTotalArea != null">EdgeBandingTotalArea = #{EdgeBandingTotalArea},</if> <if test="EdgeBandingTotalArea != null">EdgeBandingTotalArea = #{EdgeBandingTotalArea},</if>
<if test="WireropeBeltTotalArea != null">WireropeBeltTotalArea = #{WireropeBeltTotalArea},</if> <if test="WireropeBeltTotalArea != null">WireropeBeltTotalArea = #{WireropeBeltTotalArea},</if>
<if test="createdBy != null">created_by = #{createdBy},</if> <if test="createBy != null">create_by = #{createBy},</if>
<if test="createdTime != null">created_time = #{createdTime},</if> <if test="createTime != null">create_time = #{createTime},</if>
<if test="updatedBy != null">updated_by = #{updatedBy},</if> <if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updatedTime != null">updated_time = #{updatedTime},</if> <if test="updateTime != null">update_time = #{updateTime},</if>
</trim> </trim>
where obj_id = #{objId} where obj_id = #{objId}
</update> </update>

253
os-mes/src/main/resources/mapper/mes/prod/ProdOrderInfoMapper.xml
Unescape Escape View File

@ -32,80 +32,225 @@
<result property="createdTime" column="created_time"/> <result property="createdTime" column="created_time"/>
<result property="updatedBy" column="updated_by"/> <result property="updatedBy" column="updated_by"/>
<result property="updatedTime" column="updated_time"/> <result property="updatedTime" column="updated_time"/>
<association property="orderDetail" javaType="ProdOrderDetail" resultMap="ProdOrderDetailResult" />
</resultMap>
<resultMap id="ProdOrderDetailResult" type="ProdOrderDetail">
<result property="SeqNo" column="SeqNo"/>
<result property="OrderDate" column="OrderDate"/>
<result property="DeliveryDate" column="DeliveryDate"/>
<result property="ProductType" column="ProductType"/>
<result property="ProductStatus" column="ProductStatus"/>
<result property="OrderOwner" column="OrderOwner"/>
<result property="CustomerInfo" column="CustomerInfo"/>
<result property="BeltLengthSpecifications" column="BeltLengthSpecifications"/>
<result property="AreaAndWeight" column="AreaAndWeight"/>
<result property="UsingRawMaterials" column="UsingRawMaterials"/>
<result property="BeltWidth" column="BeltWidth"/>
<result property="BeltClothLayer" column="BeltClothLayer"/>
<result property="BeltRequiredLength" column="BeltRequiredLength"/>
<result property="GluingRequiredThickness" column="GluingRequiredThickness"/>
<result property="LowerGlueRequiredThickness" column="LowerGlueRequiredThickness"/>
<result property="ProductionGluingThickness" column="ProductionGluingThickness"/>
<result property="UpperBufferAdhesiveThickness" column="UpperBufferAdhesiveThickness"/>
<result property="ProductionLowerGlueThickness" column="ProductionLowerGlueThickness"/>
<result property="LowerBufferAdhesiveThickness" column="LowerBufferAdhesiveThickness"/>
<result property="ClothGlueThickness" column="ClothGlueThickness"/>
<result property="SmallClothFabricLayer" column="SmallClothFabricLayer"/>
<result property="SmallClothThickness" column="SmallClothThickness"/>
<result property="IsNeedThicken" column="IsNeedThicken"/>
<result property="EachLayerThickenThickness" column="EachLayerThickenThickness"/>
<result property="ExtraThickeningThickness" column="ExtraThickeningThickness"/>
<result property="TotalProductionThickness" column="TotalProductionThickness"/>
<result property="AdditionalThickness" column="AdditionalThickness"/>
<result property="RecommendedShimThickness" column="RecommendedShimThickness"/>
<result property="SemiFinishedProductWidth" column="SemiFinishedProductWidth"/>
<result property="RollingProductionMeters" column="RollingProductionMeters"/>
<result property="RecommendedPadWidth" column="RecommendedPadWidth"/>
<result property="BigFabricManufacturer" column="BigFabricManufacturer"/>
<result property="FabricSpecifications" column="FabricSpecifications"/>
<result property="EstimatedFabricUsage" column="EstimatedFabricUsage"/>
<result property="ClothWidth" column="ClothWidth"/>
<result property="ClothWeight" column="ClothWeight"/>
<result property="SmallFabricSpecificationsDic" column="SmallFabricSpecificationsDic"/>
<result property="SmallClothWidth" column="SmallClothWidth"/>
<result property="SmallClothUsage" column="SmallClothUsage"/>
<result property="SmallClothWeight" column="SmallClothWeight"/>
<result property="GluingProcess" column="GluingProcess"/>
<result property="UpperLowerGlue" column="UpperLowerGlue"/>
<result property="UpperLowerGlueCoefficient" column="UpperLowerGlueCoefficient"/>
<result property="UpperLowerGlueUsage" column="UpperLowerGlueUsage"/>
<result property="LowerGlue" column="LowerGlue"/>
<result property="LowerGlueCoefficient" column="LowerGlueCoefficient"/>
<result property="LowerGlueUsage" column="LowerGlueUsage"/>
<result property="LargeClothGlue" column="LargeClothGlue"/>
<result property="LargeClothGlueCoefficient" column="LargeClothGlueCoefficient"/>
<result property="LargeClothGlueUsage" column="LargeClothGlueUsage"/>
<result property="BufferGlueUsage" column="BufferGlueUsage"/>
<result property="MiddleGlue" column="MiddleGlue"/>
<result property="MiddleGlueCoefficient" column="MiddleGlueCoefficient"/>
<result property="MiddleGlueUsage" column="MiddleGlueUsage"/>
<result property="SmallBarWidth" column="SmallBarWidth"/>
<result property="SmallBarThickness" column="SmallBarThickness"/>
<result property="SmallBarStandardUsage" column="SmallBarStandardUsage"/>
<result property="FormingArea" column="FormingArea"/>
<result property="RollCoatingArea" column="RollCoatingArea"/>
<result property="RolledFabricArea" column="RolledFabricArea"/>
<result property="SulfurizationArea" column="SulfurizationArea"/>
<result property="LargeClothArea" column="LargeClothArea"/>
<result property="SmallClothArea" column="SmallClothArea"/>
<result property="BeltTotalArea" column="BeltTotalArea"/>
<result property="SkirtArea" column="SkirtArea"/>
<result property="PartitionArea" column="PartitionArea"/>
<result property="EdgeBandingTotalArea" column="EdgeBandingTotalArea"/>
<result property="WireropeBeltTotalArea" column="WireropeBeltTotalArea"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
</resultMap> </resultMap>
<sql id="selectProdOrderInfoVo"> <sql id="selectProdOrderInfoVo">
select obj_id, select poi.obj_id,
order_code, poi.order_code,
sale_order_code, poi.sale_order_code,
sale_order_line_number, poi.sale_order_line_number,
material_code, poi.material_code,
material_name, poi.material_name,
matkl, poi.matkl,
bom_code, poi.bom_code,
order_amount, poi.order_amount,
complete_amount, poi.complete_amount,
order_type, poi.order_type,
order_status, poi.order_status,
finish_flag, poi.finish_flag,
begin_date, poi.begin_date,
end_date, poi.end_date,
real_begin_date, poi.real_begin_date,
real_end_date, poi.real_end_date,
factory_code, poi.factory_code,
is_release, poi.is_release,
work_center_code, poi.work_center_code,
routing_code, poi.routing_code,
print_name, poi.print_name,
is_flag, poi.is_flag,
created_by, poi.created_by,
created_time, poi.created_time,
updated_by, poi.updated_by,
updated_time poi.updated_time,
from prod_order_info pod.SeqNo,
pod.OrderDate,
pod.DeliveryDate,
pod.ProductType,
pod.ProductStatus,
pod.OrderOwner,
pod.CustomerInfo,
pod.BeltLengthSpecifications,
pod.AreaAndWeight,
pod.UsingRawMaterials,
pod.BeltWidth,
pod.BeltClothLayer,
pod.BeltRequiredLength,
pod.GluingRequiredThickness,
pod.LowerGlueRequiredThickness,
pod.ProductionGluingThickness,
pod.UpperBufferAdhesiveThickness,
pod.ProductionLowerGlueThickness,
pod.LowerBufferAdhesiveThickness,
pod.ClothGlueThickness,
pod.SmallClothFabricLayer,
pod.SmallClothThickness,
pod.IsNeedThicken,
pod.EachLayerThickenThickness,
pod.ExtraThickeningThickness,
pod.TotalProductionThickness,
pod.AdditionalThickness,
pod.RecommendedShimThickness,
pod.SemiFinishedProductWidth,
pod.RollingProductionMeters,
pod.RecommendedPadWidth,
pod.BigFabricManufacturer,
pod.FabricSpecifications,
pod.EstimatedFabricUsage,
pod.ClothWidth,
pod.ClothWeight,
pod.SmallFabricSpecificationsDic,
pod.SmallClothWidth,
pod.SmallClothUsage,
pod.SmallClothWeight,
pod.GluingProcess,
pod.UpperLowerGlue,
pod.UpperLowerGlueCoefficient,
pod.UpperLowerGlueUsage,
pod.LowerGlue,
pod.LowerGlueCoefficient,
pod.LowerGlueUsage,
pod.LargeClothGlue,
pod.LargeClothGlueCoefficient,
pod.LargeClothGlueUsage,
pod.BufferGlueUsage,
pod.MiddleGlue,
pod.MiddleGlueCoefficient,
pod.MiddleGlueUsage,
pod.SmallBarWidth,
pod.SmallBarThickness,
pod.SmallBarStandardUsage,
pod.FormingArea,
pod.RollCoatingArea,
pod.RolledFabricArea,
pod.SulfurizationArea,
pod.LargeClothArea,
pod.SmallClothArea,
pod.BeltTotalArea,
pod.SkirtArea,
pod.PartitionArea,
pod.EdgeBandingTotalArea,
pod.WireropeBeltTotalArea
from prod_order_info poi
left join prod_order_detail pod on pod.SeqNo = poi.order_code
</sql> </sql>
<select id="selectProdOrderInfoList" parameterType="ProdOrderInfo" resultMap="ProdOrderInfoResult"> <select id="selectProdOrderInfoList" parameterType="ProdOrderInfo" resultMap="ProdOrderInfoResult">
<include refid="selectProdOrderInfoVo"/> <include refid="selectProdOrderInfoVo"/>
<where> <where>
<if test="orderCode != null and orderCode != ''">and order_code = #{orderCode}</if> <if test="orderCode != null and orderCode != ''">and poi.order_code = #{orderCode}</if>
<if test="saleOrderCode != null and saleOrderCode != ''">and sale_order_code = #{saleOrderCode}</if> <if test="saleOrderCode != null and saleOrderCode != ''">and poi.sale_order_code = #{saleOrderCode}</if>
<if test="saleOrderLineNumber != null and saleOrderLineNumber != ''">and sale_order_line_number = <if test="saleOrderLineNumber != null and saleOrderLineNumber != ''">and sale_order_line_number =
#{saleOrderLineNumber} #{saleOrderLineNumber}
</if> </if>
<if test="materialCode != null and materialCode != ''">and material_code = #{materialCode}</if> <if test="materialCode != null and materialCode != ''">and poi.material_code = #{materialCode}</if>
<if test="materialName != null and materialName != ''">and material_name like concat('%', #{materialName}, <if test="materialName != null and materialName != ''">and poi.material_name like concat('%', #{materialName},
'%') '%')
</if> </if>
<if test="matkl != null and matkl != ''">and matkl = #{matkl}</if> <if test="matkl != null and matkl != ''">and poi.matkl = #{matkl}</if>
<if test="bomCode != null and bomCode != ''">and bom_code = #{bomCode}</if> <if test="bomCode != null and bomCode != ''">and poi.bom_code = #{bomCode}</if>
<if test="orderAmount != null ">and order_amount = #{orderAmount}</if> <if test="orderAmount != null ">and poi.order_amount = #{orderAmount}</if>
<if test="completeAmount != null ">and complete_amount = #{completeAmount}</if> <if test="completeAmount != null ">and poi.complete_amount = #{completeAmount}</if>
<if test="orderType != null and orderType != ''">and order_type = #{orderType}</if> <if test="orderType != null and orderType != ''">and poi.order_type = #{orderType}</if>
<if test="orderStatus != null and orderStatus != ''">and order_status = #{orderStatus}</if> <if test="orderStatus != null and orderStatus != ''">and poi.order_status = #{orderStatus}</if>
<if test="finishFlag != null and finishFlag != ''">and finish_flag = #{finishFlag}</if> <if test="finishFlag != null and finishFlag != ''">and poi.finish_flag = #{finishFlag}</if>
<if test="params.beginBeginDate != null and params.beginBeginDate != '' and params.endBeginDate != null and params.endBeginDate != ''"> <if test="params.beginBeginDate != null and params.beginBeginDate != '' and params.endBeginDate != null and params.endBeginDate != ''">
and begin_date between #{params.beginBeginDate} and #{params.endBeginDate} and poi.begin_date between #{params.beginBeginDate} and #{params.endBeginDate}
</if> </if>
<if test="endDate != null ">and end_date = #{endDate}</if> <if test="endDate != null ">and poi.end_date = #{endDate}</if>
<if test="realBeginDate != null ">and real_begin_date = #{realBeginDate}</if> <if test="realBeginDate != null ">and poi.real_begin_date = #{realBeginDate}</if>
<if test="realEndDate != null ">and real_end_date = #{realEndDate}</if> <if test="realEndDate != null ">and poi.real_end_date = #{realEndDate}</if>
<if test="factoryCode != null and factoryCode != ''">and factory_code = #{factoryCode}</if> <if test="factoryCode != null and factoryCode != ''">and poi.factory_code = #{factoryCode}</if>
<if test="isRelease != null and isRelease != ''">and is_release = #{isRelease}</if> <if test="isRelease != null and isRelease != ''">and poi.is_release = #{isRelease}</if>
<if test="workCenterCode != null and workCenterCode != ''">and work_center_code = #{workCenterCode}</if> <if test="workCenterCode != null and workCenterCode != ''">and poi.work_center_code = #{workCenterCode}</if>
<if test="routingCode != null and routingCode != ''">and routing_code = #{routingCode}</if> <if test="routingCode != null and routingCode != ''">and poi.routing_code = #{routingCode}</if>
<if test="printName != null and printName != ''">and print_name like concat('%', #{printName}, '%')</if> <if test="printName != null and printName != ''">and poi.print_name like concat('%', #{printName}, '%')</if>
<if test="isFlag != null and isFlag != ''">and is_flag = #{isFlag}</if> <if test="isFlag != null and isFlag != ''">and poi.is_flag = #{isFlag}</if>
<if test="createdBy != null and createdBy != ''">and created_by = #{createdBy}</if> <if test="createdBy != null and createdBy != ''">and poi.created_by = #{createdBy}</if>
<if test="createdTime != null ">and created_time = #{createdTime}</if> <if test="createdTime != null ">and poi.created_time = #{createdTime}</if>
<if test="updatedBy != null and updatedBy != ''">and updated_by = #{updatedBy}</if> <if test="updatedBy != null and updatedBy != ''">and poi.updated_by = #{updatedBy}</if>
<if test="updatedTime != null ">and updated_time = #{updatedTime}</if> <if test="updatedTime != null ">and poi.updated_time = #{updatedTime}</if>
</where> </where>
</select> </select>
<select id="selectProdOrderInfoByObjId" parameterType="Long" resultMap="ProdOrderInfoResult"> <select id="selectProdOrderInfoByObjId" parameterType="Long" resultMap="ProdOrderInfoResult">
<include refid="selectProdOrderInfoVo"/> <include refid="selectProdOrderInfoVo"/>
where obj_id = #{objId} where poi.obj_id = #{objId}
</select> </select>
<insert id="insertProdOrderInfo" parameterType="ProdOrderInfo" useGeneratedKeys="true" keyProperty="objId"> <insert id="insertProdOrderInfo" parameterType="ProdOrderInfo" useGeneratedKeys="true" keyProperty="objId">

Write Preview
Loading…
Cancel
Save