mes/mes-lqqt
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

流转单接口修改

Browse Source
This commit is contained in:
yinjinlu-pc\尹金路 2024-11-24 18:39:18 +08:00
parent 9d1089843a
commit 92e300607d
9 changed files with 74 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ktg-admin/pom.xml
View File

@ -67,6 +67,18 @@
<artifactId>ktg-mes</artifactId>
</dependency>
<!-- 打印模块-->
<dependency>
<groupId>com.ktg</groupId>
<artifactId>ktg-print</artifactId>
</dependency>
<!-- IOT模块-->
<dependency>
<groupId>com.ktg</groupId>
<artifactId>ktg-iot</artifactId>
</dependency>
</dependencies>
<build>

1
ktg-common/src/main/java/com/ktg/common/constant/UserConstants.java
View File

@ -233,6 +233,7 @@ public class UserConstants
public static final String BARCODE_TYPE_WORKORDER = "WORKORDER";
public static final String BARCODE_TYPE_TOOL = "TOOL";
public static final String BARCODE_TYPE_SN = "SN";
public static final String BARCODE_TYPE_PROCARD ="PROCARD";
/**

9
ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProCardController.java
View File

@ -7,6 +7,7 @@ import com.ktg.common.constant.UserConstants;
import com.ktg.common.utils.StringUtils;
import com.ktg.mes.pro.domain.ProWorkorder;
import com.ktg.mes.pro.service.IProWorkorderService;
import com.ktg.mes.wm.utils.WmBarCodeUtil;
import com.ktg.system.strategy.AutoCodeUtil;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
@ -40,6 +41,9 @@ public class ProCardController extends BaseController
@Autowired
private IProCardService proCardService;
@Autowired
private WmBarCodeUtil wmBarCodeUtil;
/**
* 查询工序流转卡列表
*/
@ -83,8 +87,9 @@ public class ProCardController extends BaseController
@PostMapping
public AjaxResult add(@RequestBody ProCard proCard)
{
return toAjax(proCardService.insertProCard(proCard));
int ret = proCardService.insertProCard(proCard);
wmBarCodeUtil.generateBarCode(UserConstants.BARCODE_TYPE_PROCARD,proCard.getCardId(),proCard.getCardCode(),"");
return toAjax(ret);
}
/**

8
ktg-mes/src/main/java/com/ktg/mes/pro/controller/mobile/ProCardMobController.java
View File

@ -60,6 +60,14 @@ public class ProCardMobController extends BaseController {
@PreAuthorize("@ss.hasPermi('mes:pro:procard:list')")
@GetMapping("/getStationList")
public AjaxResult getStationList(ProCard card){
if(!StringUtils.isNotNull(card.getWorkorderId())){
return AjaxResult.error("请传递生产工单ID参数");
}
if(!StringUtils.isNotNull(card.getWorkstationId())){
return AjaxResult.error("请传递工作站ID参数");
}
List<ProCard> list = proCardService.getStationList(card);
return AjaxResult.success(list);
}

4
ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmSnController.java
View File

@ -94,11 +94,11 @@ public class WmSnController extends BaseController
@PreAuthorize("@ss.hasPermi('mes:pro:procard:list')")
@GetMapping("/getStationList")
public AjaxResult getStationList(WmSn sn){
if(!StringUtils.isNotNull(sn.getWorkOrderId())){
if(!StringUtils.isNotNull(sn.getWorkorderId())){
return AjaxResult.error("请指定生产工单ID");
}
if(StringUtils.isNotNull(sn.getWorkStationId())){
if(StringUtils.isNotNull(sn.getWorkstationId())){
return AjaxResult.error("请指定工作站!");
}

20
ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmSnMobController.java
View File

@ -7,11 +7,13 @@ import com.ktg.common.core.controller.BaseController;
import com.ktg.common.core.domain.AjaxResult;
import com.ktg.common.core.page.TableDataInfo;
import com.ktg.common.enums.BusinessType;
import com.ktg.common.utils.StringUtils;
import com.ktg.common.utils.poi.ExcelUtil;
import com.ktg.mes.wm.domain.WmSn;
import com.ktg.mes.wm.service.IWmSnService;
import com.ktg.system.strategy.AutoCodeUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
@ -53,6 +55,24 @@ public class WmSnMobController extends BaseController {
return getDataTable(list);
}
@ApiOperation("根据生产工单和工作站查询所有SN流转记录")
@GetMapping("/getStationList")
public AjaxResult getStationList(WmSn sn){
if(StringUtils.isNotNull(sn.getWorkorderId())){
return AjaxResult.error("请输入生产工单ID参数");
}
if(StringUtils.isNotNull(sn.getWorkstationId())){
return AjaxResult.error("请输入工作站ID参数");
}
List<WmSn> snList = wmSnService.getStationList(sn);
return AjaxResult.success(snList);
}
/**
* 导出SN码列表
*/

29
ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmSn.java
View File

@ -50,11 +50,11 @@ public class WmSn extends BaseEntity
private String batchCode;
private Long workOrderId;
private Long workorderId;
private Date inputTime;
private Long workStationId;
private Long workstationId;
/**
* SN码的数量
@ -203,15 +203,6 @@ public class WmSn extends BaseEntity
return attr4;
}
public Long getWorkOrderId() {
return workOrderId;
}
public void setWorkOrderId(Long workOrderId) {
this.workOrderId = workOrderId;
}
public Date getInputTime() {
return inputTime;
}
@ -220,12 +211,20 @@ public class WmSn extends BaseEntity
this.inputTime = inputTime;
}
public Long getWorkStationId() {
return workStationId;
public Long getWorkorderId() {
return workorderId;
}
public void setWorkStationId(Long workStationId) {
this.workStationId = workStationId;
public void setWorkorderId(Long workorderId) {
this.workorderId = workorderId;
}
public Long getWorkstationId() {
return workstationId;
}
public void setWorkstationId(Long workstationId) {
this.workstationId = workstationId;
}
@Override

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

@ -69,8 +69,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from pro_card pc
left join pro_card_process pcp
on pc.card_id = pcp.card_id
where pc.workorder_id = #{workOrderId}
and pc.workstation_id = #{workStationId}
where pc.workorder_id = #{workorderId}
and pcp.workstation_id = #{workstationId}
order by pcp.input_time desc
</select>

16
ktg-mes/src/main/resources/mapper/wm/WmSnMapper.xml
View File

@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="unitOfMeasure" column="unit_of_measure" />
<result property="batchCode" column="batch_code" />
<result property="snNum" column="snNum"></result>
<result property="workOrderId" column="work_order_id"></result>
<result property="workorderId" column="workorder_id"></result>
<result property="inputTime" column="input_time"></result>
<result property="genDate" column="gen_date"></result>
<result property="remark" column="remark" />
@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectWmSnVo">
select sn_id, sn_code, item_id, item_code, item_name, specification, unit_of_measure, batch_code, work_order_id, gen_date, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_sn
select sn_id, sn_code, item_id, item_code, item_name, specification, unit_of_measure, batch_code, workorder_id, gen_date, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_sn
</sql>
<select id="selectWmSnList" parameterType="WmSn" resultMap="WmSnResult">
@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="specification != null and specification != ''"> and specification = #{specification}</if>
<if test="unitOfMeasure != null and unitOfMeasure != ''"> and unit_of_measure = #{unitOfMeasure}</if>
<if test="batchCode != null and batchCode != ''"> and batch_code = #{batchCode}</if>
<if test="workOderId != null and workOrderId != ''"> and work_order_id = #{workOrderId}</if>
<if test="workoderId != null and workorderId != ''"> and workorder_id = #{workorderId}</if>
</where>
</select>
@ -72,8 +72,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from wm_sn sn
left join pro_sn_process ps
on sn.sn_id = ps.sn_id
where sn.work_order_id =#{workOrderId}
and ps.workstation_id = #{workStationId}
where sn.workorder_id =#{workorderId}
and ps.workstation_id = #{workstationId}
order by ps.input_time desc
</select>
@ -88,7 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="specification != null">specification,</if>
<if test="unitOfMeasure != null">unit_of_measure,</if>
<if test="batchCode != null">batch_code,</if>
<if test="workOderId != null">work_order_id,</if>
<if test="workoderId != null">workorder_id,</if>
<if test="genDate !=null">gen_date,</if>
<if test="remark != null">remark,</if>
<if test="attr1 != null">attr1,</if>
@ -108,7 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="specification != null">#{specification},</if>
<if test="unitOfMeasure != null">#{unitOfMeasure},</if>
<if test="batchCode != null">#{batchCode},</if>
<if test="workOderId != null">#{workOrderId},</if>
<if test="workoderId != null">#{workorderId},</if>
<if test="genDate !=null">#{genDate},</if>
<if test="remark != null">#{remark},</if>
<if test="attr1 != null">#{attr1},</if>
@ -132,7 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="specification != null">specification = #{specification},</if>
<if test="unitOfMeasure != null">unit_of_measure = #{unitOfMeasure},</if>
<if test="batchCode != null">batch_code = #{batchCode},</if>
<if test="workOderId != null">work_order_id = #{workOrderId},</if>
<if test="workoderId != null">workorder_id = #{workorderId},</if>
<if test="remark != null">remark = #{remark},</if>
<if test="attr1 != null">attr1 = #{attr1},</if>
<if test="attr2 != null">attr2 = #{attr2},</if>