云箭线边库

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/dao/MMeterialMapper.java

@@ -1,7 +1,12 @@
 package com.github.zuihou.business.productionReadyCenter.dao;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.github.zuihou.base.mapper.SuperMapper;
 import com.github.zuihou.business.productionReadyCenter.entity.MMeterial;
+import com.github.zuihou.business.productionReadyCenter.entity.Plate;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -15,5 +20,5 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public interface MMeterialMapper extends SuperMapper<MMeterial> {
-
+    IPage<MMeterial> pageList(IPage page, @Param(Constants.WRAPPER) Wrapper<MMeterial> queryWrapper);
 }

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/service/MMeterialService.java

@@ -1,12 +1,15 @@
 package com.github.zuihou.business.productionReadyCenter.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.zuihou.base.service.SuperService;
 import com.github.zuihou.business.productionReadyCenter.dto.AutoNodeSaveDTO;
 import com.github.zuihou.business.productionReadyCenter.dto.MMeterialSaveDTO;
 import com.github.zuihou.business.productionReadyCenter.dto.MMeterialUpdateDTO;
 import com.github.zuihou.business.productionReadyCenter.entity.AutoNode;
 import com.github.zuihou.business.productionReadyCenter.entity.MMeterial;
+import com.github.zuihou.business.productionReadyCenter.entity.MMeterialReceiveLog;
 import com.github.zuihou.business.productionReadyCenter.entity.MToolClamp;
+import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
 
 /**
  * <p>
@@ -19,6 +22,8 @@ import com.github.zuihou.business.productionReadyCenter.entity.MToolClamp;
  */
 public interface MMeterialService extends SuperService<MMeterial> {
 
+    IPage<MMeterial> pageList(IPage page, LbqWrapper<MMeterial> wrapper);
+
     MMeterial save(MMeterialSaveDTO data);
 
 

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/service/impl/MMeterialServiceImpl.java

@@ -9,6 +9,7 @@ import com.github.zuihou.business.productionReadyCenter.dto.MMeterialUpdateDTO;
 import com.github.zuihou.business.productionReadyCenter.dto.PlateSaveDTO;
 import com.github.zuihou.business.productionReadyCenter.dto.PlateUpdateDTO;
 import com.github.zuihou.business.productionReadyCenter.entity.MMeterial;
+import com.github.zuihou.business.productionReadyCenter.entity.MMeterialReceiveLog;
 import com.github.zuihou.business.productionReadyCenter.entity.MToolClamp;
 import com.github.zuihou.business.productionReadyCenter.entity.Plate;
 import com.github.zuihou.business.productionReadyCenter.service.MMeterialService;
@@ -36,6 +37,11 @@ import org.springframework.transaction.annotation.Transactional;
 @Slf4j
 @Service
 public class MMeterialServiceImpl extends SuperServiceImpl<MMeterialMapper, MMeterial> implements MMeterialService {
+
+    @Override
+    public IPage<MMeterial> pageList(IPage page, LbqWrapper<MMeterial> wrapper) {
+        return baseMapper.pageList(page, wrapper);
+    }
     @Override
     public MMeterial save(MMeterialSaveDTO data) {
         MMeterial module = BeanPlusUtil.toBean(data, MMeterial.class);

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/productionReadyCenter/MMeterialMapper.xml

@@ -24,4 +24,26 @@
         meterial_code, equipment_name, trade_mark, specification, handle_status, status, num
     </sql>
 
+    <select id="pageList" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from (
+            SELECT
+            m.*,a.num
+            FROM
+            imcs_m_meterial m
+            LEFT JOIN (
+            SELECT
+            meterial_id,
+            sum(
+            ifnull(l.batch_stand, 0) - ifnull(l.used_num, 0)
+            ) num
+            FROM
+            imcs_m_meterial_receive_log l
+            GROUP BY
+            l.meterial_id
+            ) a on m.id = a.meterial_id
+        ) s ${ew.customSqlSegment}
+    </select>
+
 </mapper>

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/productionReadyCenter/MMeterialController.java

@@ -7,6 +7,7 @@ import com.github.zuihou.base.controller.SuperController;
 import com.github.zuihou.base.request.PageParams;
 import com.github.zuihou.business.productionReadyCenter.dto.*;
 import com.github.zuihou.business.productionReadyCenter.entity.MMeterial;
+import com.github.zuihou.business.productionReadyCenter.entity.MToolClamp;
 import com.github.zuihou.business.productionReadyCenter.entity.Tray;
 import com.github.zuihou.business.productionReadyCenter.entity.TrayPosition;
 import com.github.zuihou.business.productionReadyCenter.service.MMeterialService;
@@ -50,6 +51,23 @@ import java.util.stream.Collectors;
 public class MMeterialController extends SuperController<MMeterialService, Long, MMeterial, MMeterialPageDTO, MMeterialSaveDTO, MMeterialUpdateDTO> {
 
 
+    @Override
+    public void query(PageParams<MMeterialPageDTO> params, IPage<MMeterial> page, Long defSize) {
+
+        MMeterialPageDTO data = params.getModel();
+        QueryWrap<MMeterial> wrap = handlerWrapper(null, params);
+        LbqWrapper<MMeterial> wrapper = wrap.lambda();
+
+        MMeterial meterial = BeanUtil.toBean(data, MMeterial.class);
+        wrapper.like(MMeterial::getMeterialCode, meterial.getMeterialCode())
+                .like(MMeterial::getTradeMark, meterial.getTradeMark() )
+                .like(MMeterial::getSpecification, meterial.getSpecification() )
+                .eq(MMeterial::getStatus, meterial.getStatus())
+                .eq(MMeterial::getEquipmentName, meterial.getEquipmentName())
+                .orderByDesc(MMeterial::getCreateTime);
+        IPage<MMeterial> list= baseService.pageList(page, wrapper);
+    }
+
     @ApiOperation(value = "查询原材料", notes = "查询原材料")
     @PostMapping("/all")
     public R<List<MMeterial>> list() {

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/entity/MMeterial.java

@@ -102,7 +102,7 @@ public class MMeterial extends Entity<Long> {
     private String status;
 
     @ApiModelProperty(value = "")
-    @TableField("num")
+    @TableField(exist = false)
     @Excel(name = "")
     private Integer num;
 

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/entity/MMeterialReceiveLog.java

@@ -125,6 +125,15 @@ public class MMeterialReceiveLog extends Entity<Long> {
     private String tradeMark;
 
 
+    /**
+     * 批量标准
+     */
+    @ApiModelProperty(value = "消耗数量")
+    @TableField("used_num")
+    @Excel(name = "消耗数量")
+    private Integer usedNum;
+
+
     @Builder
     public MMeterialReceiveLog(Long id, LocalDateTime createTime, Long createUser, LocalDateTime updateTime, Long updateUser, 
                     Long meterialId, String furnaceBatchNo, String bomBatchNo, Integer batchStand, String factory,