forked from I3-YF/i3plus-mes-pcn-yfai
Merge remote-tracking branch 'origin/uat-temp-nht-202502180000-shippingkanban' into uat-temp-wj-chongqingdaqu-prod
commit
7b04194349
@ -0,0 +1,4 @@
|
||||
package cn.estsh.i3plus.ext.mes.pcn.api.busi;
|
||||
|
||||
public interface IMesShippingKanbanCfgDetailService {
|
||||
}
|
||||
@ -0,0 +1,10 @@
|
||||
package cn.estsh.i3plus.ext.mes.pcn.api.busi;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesShippingKanbanCfgModel;
|
||||
import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesShippingKanbanModel;
|
||||
|
||||
public interface IMesShippingKanbanCfgService {
|
||||
MesShippingKanbanCfgModel queryShippingKanbanCfg(String organizeCode);
|
||||
void doSaveShippingKanbanCfg(MesShippingKanbanCfgModel request, String organizeCode, String username);
|
||||
MesShippingKanbanModel queryShippingKanbanContext(String organizeCode);
|
||||
}
|
||||
@ -0,0 +1,67 @@
|
||||
package cn.estsh.i3plus.ext.mes.pcn.apiservice.controller.busi;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesShippingKanbanCfgService;
|
||||
import cn.estsh.i3plus.ext.mes.pcn.pojo.constant.MesCommonConstant;
|
||||
import cn.estsh.i3plus.ext.mes.pcn.pojo.model.MesShippingKanbanCfgModel;
|
||||
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 io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.util.StringUtils;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
/**
|
||||
* @Description: 产线与班组的对应关系
|
||||
* @Author: gsz
|
||||
* @Date: 2024/5/25 18:16
|
||||
* @Modify:
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesShippingKanbanCfg")
|
||||
public class MesShippingKanbanCfgController {
|
||||
@Autowired
|
||||
private IMesShippingKanbanCfgService shippingKanbanCfgService;
|
||||
|
||||
@GetMapping("/query")
|
||||
@ApiOperation(value = "查询发运看板配置项")
|
||||
public ResultBean queryShippingKanbanCfg(String organizeCode) {
|
||||
try {
|
||||
organizeCode = !StringUtils.isEmpty(organizeCode) ? organizeCode : AuthUtil.getOrganize().getOrganizeCode();
|
||||
return ResultBean.success("查询成功").setResultObject(shippingKanbanCfgService.queryShippingKanbanCfg(organizeCode));
|
||||
} catch (ImppBusiException imppException) {
|
||||
return ResultBean.fail(imppException);
|
||||
} catch (Exception e) {
|
||||
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
|
||||
}
|
||||
}
|
||||
|
||||
@PostMapping("/save")
|
||||
@ApiOperation(value = "保存发运看板配置项")
|
||||
public ResultBean saveShippingKanbanCfg(@RequestBody MesShippingKanbanCfgModel request) {
|
||||
try {
|
||||
String organizeCode = !StringUtils.isEmpty(request.getOrganizeCode()) ? request.getOrganizeCode() : AuthUtil.getOrganize().getOrganizeCode();
|
||||
shippingKanbanCfgService.doSaveShippingKanbanCfg(request, organizeCode, request.getUsername());
|
||||
return ResultBean.success("保存成功");
|
||||
} catch (ImppBusiException imppException) {
|
||||
return ResultBean.fail(imppException);
|
||||
} catch (Exception e) {
|
||||
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
|
||||
}
|
||||
}
|
||||
|
||||
@GetMapping("/queryContext")
|
||||
@ApiOperation(value = "查询发运看板内容")
|
||||
public ResultBean queryShippingKanbanContext(String organizeCode) {
|
||||
try {
|
||||
organizeCode = !StringUtils.isEmpty(organizeCode) ? organizeCode : AuthUtil.getOrganize().getOrganizeCode();
|
||||
return ResultBean.success("查询成功").setResultObject(shippingKanbanCfgService.queryShippingKanbanContext(organizeCode));
|
||||
} catch (ImppBusiException imppException) {
|
||||
return ResultBean.fail(imppException);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.ext.mes.pcn.apiservice.controller.busi;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.pcn.pojo.constant.MesCommonConstant;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
/**
|
||||
* @Description: 产线与班组的对应关系
|
||||
* @Author: gsz
|
||||
* @Date: 2024/5/25 18:16
|
||||
* @Modify:
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping(MesCommonConstant.MES_YANFEN + "/mesShippingKanbanCfgDetail")
|
||||
public class MesShippingKanbanCfgDetailController {
|
||||
}
|
||||
@ -0,0 +1,8 @@
|
||||
package cn.estsh.i3plus.ext.mes.pcn.apiservice.serviceimpl.busi;
|
||||
|
||||
import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesShippingKanbanCfgDetailService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
public class MesShippingKanbanCfgDetailServiceImpl implements IMesShippingKanbanCfgDetailService {
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,23 @@
|
||||
package cn.estsh.i3plus.ext.mes.pcn.pojo.model;
|
||||
|
||||
import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingKanbanCfg;
|
||||
import cn.estsh.i3plus.pojo.mes.bean.shipping.MesShippingKanbanCfgDetail;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class MesShippingKanbanCfgModel {
|
||||
@ApiParam("组织代码")
|
||||
private String organizeCode;
|
||||
|
||||
@ApiParam("用户名")
|
||||
private String username;
|
||||
|
||||
@ApiParam("看板配置项")
|
||||
private MesShippingKanbanCfg config;
|
||||
|
||||
@ApiParam("看板配置明细")
|
||||
private List<MesShippingKanbanCfgDetail> details;
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.ext.mes.pcn.pojo.model;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class MesShippingKanbanModel {
|
||||
@ApiParam("看板标题")
|
||||
private String kanbanTitle;
|
||||
|
||||
@ApiParam("指标明细")
|
||||
private List<MesShippingKanbanViewModel> details = new ArrayList<>();
|
||||
}
|
||||
@ -0,0 +1,26 @@
|
||||
package cn.estsh.i3plus.ext.mes.pcn.pojo.model;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class MesShippingKanbanViewModel {
|
||||
|
||||
@ApiParam("名称")
|
||||
private String detailName;
|
||||
|
||||
@ApiParam("排序")
|
||||
private Integer orderNumber;
|
||||
|
||||
@ApiParam("计算值")
|
||||
private List<String> values = new ArrayList<>();
|
||||
|
||||
@ApiParam("范围描述")
|
||||
private String rangDescription;
|
||||
|
||||
@ApiParam("颜色")
|
||||
private String color;
|
||||
}
|
||||
Loading…
Reference in New Issue