forked from I3-YF/i3plus-mes-pcn-yfai
装箱防错功能开发
jun
11 months ago
parent
0338eb1752
commit
104bd117bb
@ -0,0 +1,38 @@
|
|||||||
|
package cn.estsh.i3plus.ext.mes.pcn.api.busi;
|
||||||
|
|
||||||
|
import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
||||||
|
import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||||
|
import cn.estsh.i3plus.pojo.mes.bean.MesPackage;
|
||||||
|
import cn.estsh.i3plus.pojo.mes.bean.MesPackageDetail;
|
||||||
|
import io.swagger.annotations.ApiOperation;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Description : MES装箱防错
|
||||||
|
* @Reference :
|
||||||
|
* @Author : junsheng.li
|
||||||
|
* @CreateDate 2024/6/7 14:34
|
||||||
|
* @Modify:
|
||||||
|
**/
|
||||||
|
public interface IMesBoxingErrorProofingService {
|
||||||
|
|
||||||
|
|
||||||
|
@ApiOperation(value = "查询包装明细")
|
||||||
|
ListPager<MesPackageDetail> queryMesPackageDetailByPager(MesPackage mesPackage, Pager pager);
|
||||||
|
|
||||||
|
@ApiOperation(value = "扫描")
|
||||||
|
MesPackage doScan(MesPackageDetail mesPackageDetail);
|
||||||
|
|
||||||
|
@ApiOperation(value = "保存包装明细")
|
||||||
|
void saveMesPackageDetails(List<MesPackageDetail> mesPackage, String userName);
|
||||||
|
|
||||||
|
@ApiOperation(value = "更新包装表")
|
||||||
|
void updateMesPackage(MesPackage mesPackage);
|
||||||
|
|
||||||
|
@ApiOperation(value = "更新包装明细")
|
||||||
|
void updateMesPackageDetails(MesPackageDetail mesPackage);
|
||||||
|
|
||||||
|
@ApiOperation(value = "解锁")
|
||||||
|
void unLock(String organizeCode, String userName, String pwd);
|
||||||
|
}
|
||||||
@ -0,0 +1,145 @@
|
|||||||
|
package cn.estsh.i3plus.ext.mes.pcn.apiservice.controller.busi;
|
||||||
|
|
||||||
|
|
||||||
|
import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesBoxingErrorProofingService;
|
||||||
|
import cn.estsh.i3plus.ext.mes.pcn.pojo.constant.MesCommonConstant;
|
||||||
|
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
|
||||||
|
import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
||||||
|
import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||||
|
import cn.estsh.i3plus.pojo.mes.bean.MesPackage;
|
||||||
|
import cn.estsh.i3plus.pojo.mes.bean.MesPackageDetail;
|
||||||
|
import cn.estsh.impp.framework.boot.auth.AuthUtil;
|
||||||
|
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
|
||||||
|
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
|
||||||
|
import cn.estsh.impp.framework.boot.util.ResultBean;
|
||||||
|
import cn.estsh.impp.framework.boot.util.ValidatorBean;
|
||||||
|
import io.swagger.annotations.Api;
|
||||||
|
import io.swagger.annotations.ApiOperation;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
@RestController
|
||||||
|
@Api(tags = "装箱防错")
|
||||||
|
@RequestMapping(MesCommonConstant.MES_YANFEN + "/boxing-error-proofing")
|
||||||
|
@Slf4j
|
||||||
|
public class MesBoxingErrorProofingController {
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private IMesBoxingErrorProofingService mesBoxingErrorProofingService;
|
||||||
|
|
||||||
|
|
||||||
|
@GetMapping("/mes-package-details/query")
|
||||||
|
@ApiOperation(value = "查询包装明细")
|
||||||
|
public ResultBean queryMesPackageDetailByPager(MesPackage mesPackage, Pager pager) {
|
||||||
|
|
||||||
|
try {
|
||||||
|
ValidatorBean.checkNotNull(mesPackage.getPackageNo(), "箱条码不能为空");
|
||||||
|
|
||||||
|
mesPackage.setOrganizeCode(AuthUtil.getOrganizeCode());
|
||||||
|
ListPager<MesPackageDetail> partInspectionListPager = mesBoxingErrorProofingService.queryMesPackageDetailByPager(mesPackage, pager);
|
||||||
|
return ResultBean.success("查询成功").setListPager(partInspectionListPager);
|
||||||
|
} catch (ImppBusiException imppException) {
|
||||||
|
return ResultBean.fail(imppException);
|
||||||
|
} catch (Exception e) {
|
||||||
|
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/do-scan")
|
||||||
|
@ApiOperation(value = "扫描")
|
||||||
|
public ResultBean doScan(MesPackageDetail mesPackageDetail) {
|
||||||
|
|
||||||
|
try {
|
||||||
|
ValidatorBean.checkNotNull(mesPackageDetail.getPackageNo(), "箱条码不能为空");
|
||||||
|
|
||||||
|
mesPackageDetail.setOrganizeCode(AuthUtil.getOrganizeCode());
|
||||||
|
ConvertBean.serviceModelInitialize(mesPackageDetail, AuthUtil.getSessionUser().getUserName());
|
||||||
|
MesPackage mesPackage = mesBoxingErrorProofingService.doScan(mesPackageDetail);
|
||||||
|
return ResultBean.success("扫描成功").setResultObject(mesPackage);
|
||||||
|
} catch (ImppBusiException imppException) {
|
||||||
|
return ResultBean.fail(imppException);
|
||||||
|
} catch (Exception e) {
|
||||||
|
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@PostMapping("/mes-package-details/saveAll")
|
||||||
|
@ApiOperation(value = "保存包装明细")
|
||||||
|
public ResultBean saveMesPackageDetails(@RequestBody List<MesPackageDetail> mesPackageDetailList) {
|
||||||
|
try {
|
||||||
|
//属性校验
|
||||||
|
mesPackageDetailList.forEach(mesPackageDetail -> {
|
||||||
|
ValidatorBean.checkNotNull(mesPackageDetail.getPackageNo(), "箱条码不能为空");
|
||||||
|
});
|
||||||
|
String userName = AuthUtil.getSessionUser().getUserName();
|
||||||
|
mesBoxingErrorProofingService.saveMesPackageDetails(mesPackageDetailList, userName);
|
||||||
|
return ResultBean.success("保存成功");
|
||||||
|
} catch (ImppBusiException imppException) {
|
||||||
|
return ResultBean.fail(imppException);
|
||||||
|
} catch (Exception e) {
|
||||||
|
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@PutMapping("/mes-package/update")
|
||||||
|
@ApiOperation(value = "更新包装表")
|
||||||
|
public ResultBean updateMesPackage(MesPackage mesPackage) {
|
||||||
|
|
||||||
|
try {
|
||||||
|
//属性校验
|
||||||
|
ValidatorBean.checkNotNull(mesPackage.getPackageNo(), "箱条码不能为空");
|
||||||
|
ValidatorBean.checkNotNull(mesPackage.getIsSealed(), "是否封箱不能为空");
|
||||||
|
|
||||||
|
mesPackage.setOrganizeCode(AuthUtil.getOrganizeCode());
|
||||||
|
ConvertBean.serviceModelUpdate(mesPackage, AuthUtil.getSessionUser().getUserName());
|
||||||
|
mesBoxingErrorProofingService.updateMesPackage(mesPackage);
|
||||||
|
return ResultBean.success("保存成功");
|
||||||
|
} catch (ImppBusiException imppException) {
|
||||||
|
return ResultBean.fail(imppException);
|
||||||
|
} catch (Exception e) {
|
||||||
|
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@PutMapping("/mes-package-details/update")
|
||||||
|
@ApiOperation(value = "更新包装明细")
|
||||||
|
public ResultBean updateMesPackageDetails(MesPackageDetail mesPackage) {
|
||||||
|
|
||||||
|
try {
|
||||||
|
//属性校验
|
||||||
|
ValidatorBean.checkNotNull(mesPackage.getPackageNo(), "箱条码不能为空");
|
||||||
|
ValidatorBean.checkNotNull(mesPackage.getSerialNumber(), "替换条码不能为空");
|
||||||
|
ValidatorBean.checkNotNull(mesPackage.getOldSerialNumber(), "替换源条码不能为空");
|
||||||
|
|
||||||
|
ConvertBean.serviceModelUpdate(mesPackage, AuthUtil.getSessionUser().getUserName());
|
||||||
|
mesBoxingErrorProofingService.updateMesPackageDetails(mesPackage);
|
||||||
|
return ResultBean.success("保存成功");
|
||||||
|
} catch (ImppBusiException imppException) {
|
||||||
|
return ResultBean.fail(imppException);
|
||||||
|
} catch (Exception e) {
|
||||||
|
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/unLock")
|
||||||
|
@ApiOperation(value = "解锁")
|
||||||
|
public ResultBean unLock(String pwd) {
|
||||||
|
try {
|
||||||
|
//属性校验
|
||||||
|
ValidatorBean.checkNotNull(pwd, "密码不能为空");
|
||||||
|
|
||||||
|
mesBoxingErrorProofingService.unLock(AuthUtil.getOrganizeCode(), AuthUtil.getSessionUser().getUserName(), pwd);
|
||||||
|
return ResultBean.success("解锁成功");
|
||||||
|
} catch (ImppBusiException imppException) {
|
||||||
|
return ResultBean.fail(imppException);
|
||||||
|
} catch (Exception e) {
|
||||||
|
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue