inspect-server/src/main/java/com/yuanchu/mom/pojo/InsUnPass.java
@@ -23,15 +23,16 @@ @ApiModelProperty(value = "主键") @TableId(type = IdType.AUTO) private Integer id; /** * 规格型号 */ @ValueTableShow(value = 2, name = "规格型号") @ValueTableShow(value = 3, name = "规格型号") private String model; /** * 样品名称 */ @ValueTableShow(value = 3, name = "样品名称") @ValueTableShow(value = 2, name = "样品名称") private String sample; /** * 检测项 @@ -47,6 +48,7 @@ * 检测结果 */ @ValueTableShow(value = 6, name = "检测结果") @TableField("`last_value`") private String lastValue; /** * 处理意见 @@ -56,7 +58,7 @@ /** * 委托编号 */ @ValueTableShow(value = 8, name = "委托编号") @ValueTableShow(value = 1, name = "委托编号") private String entrustCode; /** * 用户名 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -34,7 +34,6 @@ import com.yuanchu.mom.utils.QueryWrappers; import com.yuanchu.mom.vo.InsOrderPlanTaskSwitchVo; import com.yuanchu.mom.vo.InsOrderPlanVO; import com.yuanchu.mom.vo.Result; import org.apache.commons.io.IOUtils; import org.apache.poi.xwpf.usermodel.*; import org.springframework.beans.factory.annotation.Value; @@ -705,10 +704,10 @@ tableRenderData.setRows(rows); int countSize = tableRenderData.getRows().get(0).getCells().size(); for (RowRenderData row : tableRenderData.getRows()) { for (CellRenderData cell : row.getCells()) { /*for (CellRenderData cell : row.getCells()) { System.out.print(cell.getParagraphs().get(0).getContents()); } System.out.println(""); System.out.println("");*/ if (row.getCells().size() != countSize) { throw new ErrorException("每行单元格不相等"); } inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
@@ -133,7 +133,7 @@ public int addInsOrder(List<SampleProductDto> list, InsOrder insOrder, List<List<Integer>> pairing) { insOrder.setState(0); String code = customMapper.selectById(insOrder.getCompanyId()).getCode2(); insOrder.setEntrustCode(giveCode.giveCode("JCZX-" + code + "-", "ins_order", "-", "yyyyMMdd")); insOrder.setEntrustCode(giveCode.giveCode("JCZX-" + code + "-", "ins_order", "-", "yyMMdd")); insOrderMapper.insert(insOrder); AtomicInteger count = new AtomicInteger(); list.forEach(a -> { @@ -141,7 +141,7 @@ a.setId(null); a.setInsOrderId(insOrder.getId()); if (StrUtil.isEmpty(a.getSampleCode())) { a.setSampleCode(giveCode.giveCode("", "ins_sample", "", "yyMMdd")+"-"+count.get()); a.setSampleCode(insOrder.getEntrustCode().split("-")[2]+insOrder.getEntrustCode().split("-")[3]+"-"+count.get()); } insSampleMapper.insert(a); if (ObjectUtil.isNotEmpty(a.getInsProduct())) { @@ -190,7 +190,7 @@ } }); for (List<Integer> i : pairing) { SampleProductDto sample = JSON.parseObject(JSON.toJSONString(list.get(i.get(0))), SampleProductDto.class); SampleProductDto sample = JSON.parseObject(JSON.toJSONString(list.get(i.get(0) - 1)), SampleProductDto.class); sample.setSampleCode(list.get(i.get(0)-1).getSampleCode() + "/" +list.get(i.get(1)-1).getSampleCode()); sample.setId(null); insSampleMapper.insert(sample); inspect-server/src/main/resources/static/report-template.docxBinary files differ
