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

SN流转记录相关功能

Browse Source
This commit is contained in:
yinjinlu-pc\尹金路 2024-12-06 12:04:05 +08:00
parent a529dc1bc9
commit 16fa600703
6 changed files with 81 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ktg-mes/src/main/java/com/ktg/mes/md/controller/mobile/MdProductSIPMobController.java Normal file
View File

@ -0,0 +1,36 @@
package com.ktg.mes.md.controller.mobile;
import com.ktg.common.core.controller.BaseController;
import com.ktg.common.core.page.TableDataInfo;
import com.ktg.mes.md.domain.MdProductSip;
import com.ktg.mes.md.service.IMdProductSipService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* @author yinjinlu
* @description
* @date 2024/12/5
*/
@RestController
@RequestMapping("/mobile/md/sip")
public class MdProductSIPMobController extends BaseController {
@Autowired
private IMdProductSipService mdProductSipService;
/**
* 查询产品SIP列表
*/
@GetMapping("/list")
public TableDataInfo list(MdProductSip mdProductSip)
{
startPage();
List<MdProductSip> list = mdProductSipService.selectMdProductSipList(mdProductSip);
return getDataTable(list);
}
}

1
ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProSnProcessController.java
View File

@ -77,6 +77,7 @@ public class ProSnProcessController extends BaseController
@PostMapping
public AjaxResult add(@RequestBody ProSnProcess proSnProcess)
{
return toAjax(proSnProcessService.insertProSnProcess(proSnProcess));
}

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

@ -146,7 +146,7 @@ public class ProCardProcessMobController extends BaseController {
* @param cardProcess
* @return
*/
@ApiOperation("根据流转卡号查询所有的生产任务")
@ApiOperation("根据流转卡号和工作站查询所有的生产任务")
@PreAuthorize("@ss.hasPermi('mes:pro:procard:list')")
@GetMapping("/getCardProTask")
public AjaxResult getCardProTask(ProCardProcess cardProcess){

8
ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProCardProcess.java
View File

@ -46,13 +46,13 @@ public class ProCardProcess extends BaseEntity
private String processName;
/** 进入工序时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "进入工序时间", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "进入工序时间", width = 30, dateFormat = "yyyy-MM-dd hh:mm:ss")
private Date inputTime;
/** 出工序时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "出工序时间", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "出工序时间", width = 30, dateFormat = "yyyy-MM-dd hh:mm:ss")
private Date outputTime;
/** 投入数量 */

37
ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmBarcodeMobController.java Normal file
View File

@ -0,0 +1,37 @@
package com.ktg.mes.wm.controller.mobile;
import com.ktg.common.core.domain.AjaxResult;
import com.ktg.mes.wm.domain.WmBarcode;
import com.ktg.mes.wm.service.IWmBarcodeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* @author yinjinlu
* @description
* @date 2024/12/5
*/
@RestController
@RequestMapping("/mobile/wm/barcode")
public class WmBarcodeMobController {
@Autowired
private IWmBarcodeService wmBarcodeService;
/**
* 获取某个对象的二维码地址
* @return
*/
@GetMapping("/getBarcodeUrl")
public AjaxResult getBarcodeUrl(WmBarcode wmBarcode){
List<WmBarcode> list = wmBarcodeService.selectWmBarcodeList(wmBarcode);
if(!CollectionUtils.isEmpty(list)){
return AjaxResult.success(list.get(0));
}
return AjaxResult.success();
}
}

2
ktg-system/src/main/resources/mapper/system/SysAutoCodeRuleMapper.xml
View File

@ -40,6 +40,7 @@
<if test="ruleName != null and ruleName != ''">
AND rule_name like concat('%', #{ruleName}, '%')
</if>
order by create_time desc
</select>
<select id="findById" parameterType="Long" resultMap="SysAutoCodeRuleResult">
@ -103,6 +104,7 @@
<update id="updateSysAutoCodeRule" parameterType="SysAutoCodeRule">
update sys_auto_code_rule
<set>
<if test="ruleCode !=null and ruleCode !=''">rule_code = #{ruleCode},</if>
rule_name = #{ruleName},
<if test="ruleDesc !=null and ruleDesc !=''">rule_desc = #{ruleDesc},</if>
max_length = #{maxLength},