diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbcnp.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbcnp.java index 1cf6053..5836dcf 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbcnp.java +++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbcnp.java @@ -1,16 +1,12 @@ package com.dsic.gj_erp.bean.jcsj; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Entity; -import javax.persistence.Id; import java.io.Serializable; /** @@ -19,49 +15,110 @@ import java.io.Serializable; *

* * @author xn - * @since 2023-09-15 + * @since 2023-12-18 */ @Data @EqualsAndHashCode(callSuper = false) @ApiModel(value="EmSbcnp对象", description="") -@TableName("em_sbcnp") -//@Entity public class EmSbcnp implements Serializable { private static final long serialVersionUID=1L; - @ApiModelProperty(value = "设备编号") - // @Id - @TableId(value = "id", type = IdType.ASSIGN_UUID) - private String id; + @ApiModelProperty(value = "跨位") + private String kw; - private String sbbh; + @ApiModelProperty(value = "工序") + private String gx; - @ApiModelProperty(value = "设备名称") - @TableField("SBMC") - private String sbmc; + @ApiModelProperty(value = "产能单位") + private String cndw; - @ApiModelProperty(value = "产能") - private Double sbcn; + @ApiModelProperty(value = "白班最小产能") + private Double zxcnBb; - @ApiModelProperty(value = "产能单位（张/米/...）") - private String dw; + @ApiModelProperty(value = "白班最大产能") + private Double zdcnBb; - @ApiModelProperty(value = "产能单位时间(天 或小时)") - private String dwsj; + @ApiModelProperty(value = "夜班最小产能") + private Double zxcnYb; + @ApiModelProperty(value = "夜班最大产能") + private Double zdcnYb; - @ApiModelProperty(value = "所属部门") - @TableField("SZCS") - private String szcs; + @ApiModelProperty(value = "合计") + private Double cnhj; - @ApiModelProperty(value = "跨位") - @TableField("KW") - private String kw; + @ApiModelProperty(value = "划线白班最小产能") + private Double zxcnBb1; - @ApiModelProperty(value = "工序") - @TableField("GX") - private String gx; + @ApiModelProperty(value = "划线白班最大产能") + private Double zdcnBb1; + + @ApiModelProperty(value = "划线夜班最小产能") + private Double zxcnYb1; + + @ApiModelProperty(value = "划线夜班最大产能") + private Double zdcnYb1; + + @ApiModelProperty(value = "合计") + private Double cnhj1; + + @ApiModelProperty(value = "坡口白班最小产能") + private Double zxcnBb2; + + @ApiModelProperty(value = "坡口白班最大产能") + private Double zdcnBb2; + + @ApiModelProperty(value = "坡口夜班最小产能") + private Double zxcnYb2; + + @ApiModelProperty(value = "坡口夜班最大产能") + private Double zdcnYb2; + + @ApiModelProperty(value = "坡口合计") + private Double cnhj2; + + @ApiModelProperty(value = "坡口产能单位") + private String cndw2; + + @ApiModelProperty(value = "打磨白班最小产能") + private Double zxcnBb3; + + @ApiModelProperty(value = "打磨白班最大产能") + private Double zdcnBb3; + + @ApiModelProperty(value = "打磨夜班最小产能") + private Double zxcnYb3; + + @ApiModelProperty(value = "打磨夜班最大产能") + private Double zdcnYb3; + + @ApiModelProperty(value = "打磨合计") + private Double cnhj3; + + @ApiModelProperty(value = "打磨产能单位") + private String cndw3; + + @ApiModelProperty(value = "曲白班最小产能") + private Double zxcnBb4; + + @ApiModelProperty(value = "曲白班最大产能") + private Double zdcnBb4; + + @ApiModelProperty(value = "曲夜班最小产能") + private Double zxcnYb4; + + @ApiModelProperty(value = "曲夜班最大产能") + private Double zdcnYb4; + + @ApiModelProperty(value = "曲合计") + private Double cnhj4; + + @ApiModelProperty(value = "曲产能单位") + private String cndw4; + + @TableId(value = "id", type = IdType.ASSIGN_UUID) + private String id; } diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbcnpController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbcnpController.java index 6122888..f859690 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbcnpController.java +++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/EmSbcnpController.java @@ -52,7 +52,7 @@ public class EmSbcnpController { @ApiOperation(value = "批量修改") @PostMapping(value = "/update") public ResultBean update(@RequestBody List sbjbbs) { - emSbcnpService.update(sbjbbs); + emSbcnpService.updateBatchById(sbjbbs); return new ResultBean(); } diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java index 971d70d..a3a3ed8 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java +++ b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmYdjhController.java @@ -41,16 +41,11 @@ public class DmYdjhController { .eq(StrUtil.isNotEmpty(map.get("zt")),"zt",map.get("zt")) .ge(StrUtil.isNotEmpty(map.get("yf")), "jssj", DateUtil.beginOfMonth(DateUtil.parseDate(map.get("yf")))) .le(StrUtil.isNotEmpty(map.get("yf")), "jssj", DateUtil.endOfMonth(DateUtil.parseDate(map.get("yf")))) - .orderByAsc("jssj,dc_ch,dc_pl") + .orderByAsc("jssj,dc_ch,dc_pl,zl,lqlb") ); return new ResultBean(list); } - @RequestMapping("/tjydjh") - @AuthFunction - public ResultBean tjydjh(){ - return new ResultBean(service.tjydjh()); - } @RequestMapping("/hz") @AuthFunction @@ -62,12 +57,15 @@ public class DmYdjhController { @AuthFunction public ResultBean tj(@RequestBody List list){ List idList=list.stream().map(DmYdjh::getId).collect(Collectors.toList()); - service.update(new UpdateWrapper().set("zt","01") + service.update(new UpdateWrapper().set("zt","1") .in( "id",idList) ); return new ResultBean(); } + + + @RequestMapping("/xf") @AuthFunction public ResultBean xf(@RequestBody List list){ diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbcnpServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbcnpServiceImpl.java index e3afed1..2d3cef0 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbcnpServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbcnpServiceImpl.java @@ -33,23 +33,17 @@ public class EmSbcnpServiceImpl extends ServiceImpl impl @Override public List getList(JSONObject json) { QueryWrapper queryWrapper=new QueryWrapper<>(); - if(StringUtils.isNotEmpty(json.getString("sbmc"))){ - queryWrapper.eq("SBMC",json.getString("sbmc")); - } if(StringUtils.isNotEmpty(json.getString("kw"))){ queryWrapper.eq("KW",json.getString("kw")); } -// if(StringUtils.isNotEmpty(json.getString("sbmc"))){ -// queryWrapper.eq("SBMC",json.getString("sbmc")); -// } List emSbjbbs=emSbcnpMapper.selectList(queryWrapper.orderByAsc("kw,gx")); return emSbjbbs; } @Override public void save(List emSbcnps) { - List saveList= emSbcnps.stream().filter(emSbcnp -> StringUtils.isNotEmpty(emSbcnp.getSbbh())).collect(Collectors.toList()); - saveBatch(saveList); +// List saveList= emSbcnps.stream().filter(emSbcnp -> StringUtils.isNotEmpty(emSbcnp.getSbbh())).collect(Collectors.toList()); + saveBatch(emSbcnps); } @Override diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java index 2714987..f10e71d 100644 --- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java @@ -149,7 +149,6 @@ public class DmSygdMxServiceImpl extends ServiceImpl i .orderByAsc("gl")); //3.预排产 //TODO 假设：产能测算266.9；又套料图需当天完成 - for (int i = 0; i < gcrlList.size(); i++) { for (int j = 0; j < 266; j++) { int index = 266 * i + j; diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java index 33fa8b3..0807e46 100644 --- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmYdjhServiceImpl.java @@ -58,7 +58,7 @@ public class DmYdjhServiceImpl extends ServiceImpl impleme // List qfxqList= qfxqService.list(new QueryWrapper().eq("substring(db,0,8) ", DateUtil.format(DateUtil.nextMonth(),"yyyy/MM"))); int i = qfxqService.count(new QueryWrapper() .eq("substring(xzglxq,0,8) ", "2023/08")); - if (i < 1) { + if (i < 1) { System.out.println("下月的前方需求信息未导入！"); return null; } @@ -124,13 +124,14 @@ public class DmYdjhServiceImpl extends ServiceImpl impleme map.put("qgList",qgList); return map; } + //下发 派工单状态改为编制 生成零件信息 @Override public void xf(List ydjhList){ //修改状态 List idList=ydjhList.stream().map(DmYdjh::getId).collect(Collectors.toList()); - this.update(new UpdateWrapper().set("zt","02") + this.update(new UpdateWrapper().set("zt","2") .in( "id",idList) ); //修改汇总状态 改为 编制