basic-server/src/main/java/com/ruoyi/basic/dto/InventoryDetailDTO.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,52 @@ package com.ruoyi.basic.dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @Data public class InventoryDetailDTO { // æ¥èª ifs_inventory_quantity @ApiModelProperty(value = "ifs_inventory_quantityID") private Integer id; @ApiModelProperty(value = "é¶ä»¶æè¿°") private String partDesc; @ApiModelProperty(value = "SNå·") private String lotBatchNo; @ApiModelProperty(value = "é¶ä»¶å·") private String partNo; // æ¥èª ifs_part_props_record @ApiModelProperty(value = "ç»ç¼é¢è²") private String insulationColor; @ApiModelProperty(value = "æ¤å¥é¢è²") private String outerColor; @ApiModelProperty(value = "è½½å ·ç¼å·") private String drumNo; @ApiModelProperty(value = "èµ·å§ç±³æ ") private String startMeterMark; @ApiModelProperty(value = "æªæ¢ç±³æ ") private String endMeterMark; // æ¥èª ins_order @ApiModelProperty(value = "å ¥åºæ¶é´") private Date updateTime; @ApiModelProperty(value = "æ£æµç»è®º") private Integer insState; // é»è¾è®¡ç®å段ï¼æ£éªäºº (COALESCE åçç»æ) @ApiModelProperty(value = "æ£æµäººå") private String inspectorName; } inspect-server/src/main/java/com/ruoyi/inspect/controller/InsOrderController.java
@@ -1,15 +1,12 @@ package com.ruoyi.inspect.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.basic.dto.InventoryDetailDTO; import com.ruoyi.basic.mapper.IfsInventoryQuantityMapper; import com.ruoyi.basic.pojo.IfsInventoryQuantity; import com.ruoyi.basic.pojo.StandardProductList; import com.ruoyi.common.core.domain.Result; import com.ruoyi.common.utils.JackSonUtil; import com.ruoyi.framework.exception.ErrorException; import com.ruoyi.inspect.dto.*; import com.ruoyi.inspect.pojo.InsOrder; @@ -26,13 +23,10 @@ import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.servlet.ServletException; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.HashMap; @@ -236,6 +230,13 @@ return Result.success(insOrderService.labelOrderPrinting(ids)); } @ApiOperation(value = "å¤è´ä¸åæåæ ç¾æå°") @PostMapping("/labelOutsideOrderPrinting") public Result<List<InventoryDetailDTO>> labelOutsideOrderPrinting(@RequestBody Map<String, Object> param) { List<Integer> ids = (List<Integer>) param.get("ids"); return Result.success(insOrderService.labelOutsideOrderPrinting(ids)); } @ApiOperation(value = "æ ¹æ®è®¢åidæ¥è¯¢æ ·å") @GetMapping("/getSampleByOrderId") public Result<List<InsSample>> getSampleByOrderId(Integer insOrderId) { inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsOrderMapper.java
@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.basic.dto.IfsInventoryQuantityDto; import com.ruoyi.basic.dto.InventoryDetailDTO; import com.ruoyi.basic.pojo.StructureTestObject; import com.ruoyi.inspect.dto.SampleOrderDto; import com.ruoyi.inspect.dto.SampleProductDto2; @@ -37,6 +39,7 @@ IPage<SampleProductDto2> selectSampleAndProductByOrderId(@Param("page") IPage<SampleProductDto2> page, @Param("ew") QueryWrapper<SampleProductDto2> ew, @Param("id") Integer id); List<Map<String, String>> selectDeviceList(@Param("managementNumbers") Set<String> managementNumbers); List<SampleDefectsFatherVo> selectSampleDefects(Page page, @Param("inspectionItems") String inspectionItems, @Param("orderNumber") String orderNumber); String getStandardMethodCode(@Param("id") Integer id); @@ -51,6 +54,7 @@ /** * æ¥è¯¢æ£éªç»æ * * @param ids * @return */ @@ -58,6 +62,7 @@ /** * è·åæ¹éæ£éªçæ»æ° * * @param id * @return */ @@ -65,13 +70,13 @@ /** * è·å线è¯é¢è² * * @param id * @return */ List<String> selectSampleCableTag(@Param("id") Integer id); /** * * @param orderId * @return */ @@ -79,6 +84,7 @@ /** * åªæ¥è¯¢é»è®¤ç¬¬ä¸ä¸ªç产å * * @param id * @return */ @@ -86,20 +92,19 @@ /** * æ¥è¯¢æ¥åå¾ * * @param * @return */ List<Map<String, Object>> selectCalendarWorkByWeek(@Param("day") Integer day); /** * * @param partNo * @return */ StructureTestObject selectProductByPartNo(@Param("partNo") String partNo); /** * * @param partNo * @return */ @@ -107,19 +112,24 @@ /** * æåæ ç¾æå° * * @param ids * @return */ List<InsOrderPrintingVo> labelOrderPrinting(@Param("ids") List<Integer> ids); List<InventoryDetailDTO> labelOutsideOrderPrinting(@Param("ids") List<Integer> ids); /** * æ¥è¯¢å¯¼åºä¿¡æ¯ * * @return */ List<SampleOrderDto> rawAllInsOrderExport(@Param("ew") QueryWrapper<SampleOrderDto> ew, @Param("laboratory") String laboratory, @Param("isOrderAll") String isOrderAll); /** * æ ¹æ®è®¢åæ¥è¯¢è¯éªå®¤ * * @param insOrderId * @return */ @@ -127,6 +137,7 @@ /** * æ¥è¯¢è®¢åä¿¡æ¯ * * @param insSampleId * @return */ @@ -134,6 +145,7 @@ /** * æ ¹æ®è®¢åidæ¥è¯¢è®¢å导åºä¿¡æ¯ * * @param orderIds * @return */ @@ -141,6 +153,7 @@ /** * æ¥è¯¢å½åæ¶é´æ¯å¦æ该æ£æµé¡¹çæ½æ ·è®¡å订å * * @param itmeId æ ·åId * @param startTime å¼å§æ¶é´ * @param endTime ç»ææ¶é´ inspect-server/src/main/java/com/ruoyi/inspect/service/InsOrderService.java
@@ -3,6 +3,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.basic.dto.IfsInventoryQuantityDto; import com.ruoyi.basic.dto.InventoryDetailDTO; import com.ruoyi.basic.pojo.IfsInventoryQuantity; import com.ruoyi.basic.pojo.StandardProductList; import com.ruoyi.common.core.domain.Result; @@ -51,6 +53,7 @@ /** * ä¿®æ¹è®¢ååå· * * @param insOrder */ void updateEntrustCode(InsOrder insOrder); @@ -58,11 +61,11 @@ List<InsUnqualifiedRetestProduct> getRetestResult(Integer insProductId); void updateIfsInventoryQuantity(Long id); /** * éæä¸å * * @param list * @param copperInsOrder * @return @@ -71,6 +74,7 @@ /** * ä¿®æ¹å§æç¼å· * * @param insOrder */ void updateOrderEntrustCode(InsOrder insOrder); @@ -78,6 +82,7 @@ /** * ä¿®æ¹æ£éªä¸åå 容 * * @param insOrderUpdateDto * @return */ @@ -85,13 +90,17 @@ /** * æåæ ç¾æå° * * @param ids * @return */ List<InsOrderPrintingVo> labelOrderPrinting(List<Integer> ids); List<InventoryDetailDTO> labelOutsideOrderPrinting(List<Integer> ids); /** * æ ¹æ®æ ·åidæ¥è¯¢æ£éªé¡¹æ * * @param insSampleId * @return */ @@ -99,6 +108,7 @@ /** * æ·»å éæ¼çæ£éªé¡¹ * * @param omitOrderProductDto * @return */ @@ -106,6 +116,7 @@ /** * æåæ£éªåå¯¼åº * * @param sampleOrderDto * @param response */ @@ -113,12 +124,14 @@ /** * ä¿®æ¹æ ·ååå· * * @param insSample */ void updateSampleModel(InsSample insSample); /** * æ¥è¯¢å½åæ¶é´æ¯å¦æ²¡æ该æ£æµé¡¹çæ½æ ·è®¡å * * @param sampleList * @param insOrder * @return @@ -128,6 +141,7 @@ /** * 移åºæä½ * * @param one * @return */ inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
@@ -16,6 +16,8 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.basic.dto.IfsInventoryQuantityDto; import com.ruoyi.basic.dto.InventoryDetailDTO; import com.ruoyi.basic.mapper.IfsInventoryQuantityMapper; import com.ruoyi.basic.mapper.StandardProductListMapper; import com.ruoyi.basic.mapper.StructureItemParameterMapper; @@ -87,7 +89,6 @@ private SpotCheckQuarterItemMapper spotCheckQuarterItemMapper; private StandardProductListMapper standardProductListMapper; private StructureItemParameterMapper structureItemParameterMapper; //è·åæ£éªä¸åæ°æ® @@ -406,6 +407,7 @@ /** * æ·»å æ£éªé¡¹ * * @param sampleId * @param productList */ @@ -453,6 +455,7 @@ /** * å®¡æ ¸æ£éªå * * @param insOrder * @return */ @@ -552,6 +555,7 @@ /** * è·åifsåºåä¿¡æ¯ * * @param * @return */ @@ -660,8 +664,9 @@ /** * idæ¯åææçid * * <p> * ä¿®æ¹è®¢ååå· * * @param insOrder */ @Override @@ -726,6 +731,7 @@ /** * ä¿®æ¹éè´è®¢åæ¥æ¶ç¶æ, é¿å åæ» * * @param id */ @Transactional @@ -737,6 +743,7 @@ /** * æ°å¢éåä¸ä¸å * * @param list * @param insOrder * @return @@ -822,6 +829,7 @@ /** * ä¿®æ¹å§æä¸åç¼å· * * @param insOrder */ @Override @@ -872,6 +880,7 @@ /** * ä¿®æ¹æ£éªä¸åå 容 * * @param insOrderUpdateDto * @return */ @@ -897,6 +906,7 @@ /** * æåæ ç¾æå° * * @param ids * @return */ @@ -905,8 +915,14 @@ return insOrderMapper.labelOrderPrinting(ids); } @Override public List<InventoryDetailDTO> labelOutsideOrderPrinting(List<Integer> ids) { return insOrderMapper.labelOutsideOrderPrinting(ids); } /** * æ ¹æ®æ ·åidæ¥è¯¢æ£éªé¡¹æ * * @param insSampleId * @return */ @@ -935,6 +951,7 @@ /** * æ·»å éæ¼çæ£éªé¡¹ * * @param omitOrderProductDto * @return */ @@ -970,6 +987,7 @@ /** * æåæ£éªåå¯¼åº * * @param sampleOrderDto * @param response */ @@ -1024,6 +1042,7 @@ /** * ä¿®æ¹æ ·ååå· * * @param insSample */ @Override @@ -1042,6 +1061,7 @@ /** * æ¥è¯¢å½åæ¶é´æ¯å¦æ²¡æ该æ£æµé¡¹çæ½æ ·è®¡å * * @param sampleList * @param insOrder * @return @@ -1159,6 +1179,7 @@ /** * ifs移åºæä½ * * @param inventoryQuantity * @return */ @@ -1254,6 +1275,7 @@ /** * å ä¿®æ¹éè´è®¢åæ¹æ¬¡å·, åè¿è¡ç§»åºæä½ * * @param one * @param toLocation */ inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -408,6 +408,43 @@ </foreach> </select> <!-- å¤è´ä¸åæåæ ç¾æå° --> <select id="labelOutsideOrderPrinting" resultType="com.ruoyi.basic.dto.InventoryDetailDTO"> SELECT iiq.id, iiq.part_desc, iiq.lot_batch_no, iiq.part_no, ippr.insulation_color, ippr.outer_color, ippr.drum_no, ippr.start_meter_mark, ippr.end_meter_mark, io.update_time, io.ins_state, -- æ£éªäººæ¥è¯¢ï¼ä¼å åææ´¾çè´è´£äººï¼å¦æ没æåå订åå建人 COALESCE(isu.userName, u.name) AS inspector_name FROM ifs_inventory_quantity iiq LEFT JOIN ifs_part_props_record ippr ON ippr.ifs_inventory_id = iiq.id LEFT JOIN ins_order io ON io.ifs_inventory_id = iiq.id AND io.state != -1 -- å ³èç¨æ·è¡¨ï¼ç¨äºè·å订åå建人å§å LEFT JOIN user u ON io.create_user = u.id -- å ³èåæ¥è¯¢ï¼ç¨äºè·å ins_sample_user 表ä¸ææ´¾çæ£éªè´è´£äºº LEFT JOIN ( SELECT ins_sample_id, GROUP_CONCAT(DISTINCT uu.name SEPARATOR ',') AS userName FROM ins_sample_user isu_inner LEFT JOIN user uu ON isu_inner.user_id = uu.id WHERE isu_inner.state = 0 GROUP BY ins_sample_id ) isu ON isu.ins_sample_id = io.id WHERE iiq.id IN <foreach collection="ids" index="index" open="(" separator="," close=")" item="val"> #{val} </foreach> </select> <!-- æ¥è¯¢æ£éªåæ°æ® --> <select id="rawAllInsOrderExport" resultType="com.ruoyi.inspect.dto.SampleOrderDto"> select *
