sun15684712291/impm_zxf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0820-需求变更

Browse Source
This commit is contained in:
sunyg
2025-08-25 17:14:57 +08:00
parent 8b5f2389de
commit c320999eba
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProWorkorderController.java
View File

@@ -170,7 +170,7 @@ public class ProWorkorderController extends BaseController
if (!workorder.getProductId().equals(proWorkorder.getProductId())){ if (!workorder.getProductId().equals(proWorkorder.getProductId())){
MdItem savedItem = mdItemService.selectMdItemById(workorder.getProductId()); MdItem savedItem = mdItemService.selectMdItemById(workorder.getProductId());
MdItem newItem = mdItemService.selectMdItemById(proWorkorder.getProductId()); MdItem newItem = mdItemService.selectMdItemById(proWorkorder.getProductId());
if (!savedItem.getItemCode().equals(newItem.getItemCode())){ if (!savedItem.getItemTypeCode().equals(newItem.getItemTypeCode())){
return AjaxResult.error("修改产品时，只能修改同类产品"); return AjaxResult.error("修改产品时，只能修改同类产品");
} }
} }

4
ktg-mes/src/main/resources/mapper/pro/ProWorkorderMapper.xml
View File

@@ -244,10 +244,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="machineryName != null and machineryName != ''">and t1.machinery_name = #{machineryName}</if> <if test="machineryName != null and machineryName != ''">and t1.machinery_name = #{machineryName}</if>
<if test="jobStatus != null and jobStatus != ''">and t2.job_status = #{jobStatus}</if> <if test="jobStatus != null and jobStatus != ''">and t2.job_status = #{jobStatus}</if>
<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 --> <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
AND date_format(t1.finish_date,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d') AND date_format(t6.issue_date,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
</if> </if>
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 --> <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
AND date_format(t1.finish_date,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d') AND date_format(t6.issue_date,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if> </if>
</where> </where>
order by t1.create_time desc order by t1.create_time desc