新增出入库信息接口

jyzb-biz/src/main/java/com/junmp/jyzb/controller/OutAndInboundController.java

@@ -69,6 +69,13 @@ public class OutAndInboundController {
         return ApiRes.success(logSummaryService.ShowInOutRecordsByItems(req));
     }
 
+    @PostMapping(path = "/ShowInOutRecords",name = "出入库数据展示#enable")
+    @ApiOperation("出入库数据展示")
+    public ApiRes<PageResult<LogSummary>> ShowInOutRecords( ){
+        return ApiRes.success(logSummaryService.ShowInOutRecords());
+    }
+
+
     //通过装备id查询某一件装备的出入库记录
 
     @PostMapping(path="/ShowInOutRecordsByEqs",name="出入库记录装备id查询展示#enable")

jyzb-biz/src/main/java/com/junmp/jyzb/entity/LogDetail.java

@@ -147,6 +147,9 @@ public class LogDetail implements Serializable {
     @TableField(exist = false)
     private String userName;
 
+    @TableField(value = "org_id")
+    private Long orgId;
+
     private static final long serialVersionUID = 1L;
 
 

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/LogSummaryMapper.java

@@ -20,6 +20,8 @@ import java.util.List;
 public interface LogSummaryMapper extends BaseMapper<LogSummary> {
 
     List<TjOutAndInDto> TjOutAndInCount(@Param("req") TjOrgCountReq req);
+
+    List<LogSummary> ShowInOutRecords();
 }
 
 

jyzb-biz/src/main/java/com/junmp/jyzb/service/LogSummaryService.java

@@ -21,4 +21,6 @@ public interface LogSummaryService extends IService<LogSummary> {
 
     //单警柜返回出入库结果
     Boolean processOutInRecords(CabinetLogsRecordReq req);
+
+    PageResult<LogSummary> ShowInOutRecords();
 }

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/LogSummaryServiceImpl.java

@@ -81,6 +81,9 @@ public class LogSummaryServiceImpl extends ServiceImpl<LogSummaryMapper, LogSumm
     @Resource
     private SysFileInfoService sysFileInfoService;
 
+    @Resource
+    private LogSummaryMapper logSummaryMapper;
+
     //根据条件查询出入库记录
     @Override
     public PageResult<LogSummary> ShowInOutRecordsByItems(LogSummaryReq req) {
@@ -237,6 +240,12 @@ public class LogSummaryServiceImpl extends ServiceImpl<LogSummaryMapper, LogSumm
         return null;
     }
 
+    @Override
+    public PageResult<LogSummary> ShowInOutRecords() {
+        List<LogSummary> list=logSummaryMapper.ShowInOutRecords();
+        return null;
+    }
+
     //    对出入库记录进行分类汇总存储()
     public List<NormalInOutDto> saveInOutRecords(OutInLogsReq req) {
 
@@ -317,6 +326,7 @@ public class LogSummaryServiceImpl extends ServiceImpl<LogSummaryMapper, LogSumm
                 LogDetail logDetail = new LogDetail();
                 BeanPlusUtil.copyProperties(detailLogReq, logDetail);
                 logDetail.setSummaryId(logSummary.getId());
+                logDetail.setOrgId(logSummary.getOrgId());
                 logDetail.setBussinessType(logSummary.getBussinessType());
                 logDetail.setCreateTime(DateTimeUtil.getCurrentDateTime());
                 logDetail.setBussinessType(logreq.getBussinessType());

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderMainServiceImpl.java

@@ -332,8 +332,11 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         }
         //如果是无单据转业务
         if (ObjectUtil.isNotNull(req.getLogSummaryId())){
-            logSummaryService.update(new LambdaUpdateWrapper<LogSummary>().set(LogSummary::getOrderMainId,order.getId())
-                    .set(LogSummary::getOrderCode,order.getOrderCode()).eq(LogSummary::getId,req.getLogSummaryId()));
+            logSummaryService.update(new LambdaUpdateWrapper<LogSummary>()
+                    .set(LogSummary::getOrderMainId,order.getId())
+                    .set(LogSummary::getOrderCode,order.getOrderCode())
+                    .set(LogSummary::getBussinessType,order.getBussinessType())
+                    .eq(LogSummary::getId,req.getLogSummaryId()));
         }
 
         return list;
@@ -904,12 +907,16 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
                     for (DetailJsonReq child:childJson) {
                         s = s+child.getLocationName()+"--"+uploadDetailReq.getTypeName()+"【"+
                                 uploadDetailReq.getSizeName()+"】，单价："+uploadDetailReq.getPrice()+"，数量实入："+child.getNum()+"，记账："+child.getModifyQuantity()+"\n";
-                       data.setOrgId(uploadDetailReq.getOrgId());
+                       data.setPlanNum(uploadDetailReq.getPlanNum());
+//                       data.setOrgId(uploadDetailReq.getOrgId());
                        data.setWarehouseId(child.getLocationId());
                        data.setSizeId(uploadDetailReq.getSizeId());
                        data.setTypeId(uploadDetailReq.getTypeId());
                        data.setPrice(uploadDetailReq.getPrice());
                        data.setModifyQuantity(child.getModifyQuantity());
+                       data.setSizeName(uploadDetailReq.getSizeName());
+                       data.setTypeName(uploadDetailReq.getTypeName());
+                       data.setWarehouseName(child.getLocationName());
                        orderDetailReqList.add(data);
                     }
 
@@ -1098,7 +1105,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         List<Object[]> searchCriteria=new ArrayList<>();
         for (UpdateOrderDetailReq upReq: orderDetailReqList) {
 
-            Object[] criteria=new Object[]{upReq.getOrgId(),upReq.getWarehouseId(),upReq.getTypeId(),upReq.getSizeId(),upReq.getPrice()};
+            Object[] criteria=new Object[]{orgId,upReq.getWarehouseId(),upReq.getTypeId(),upReq.getSizeId(),upReq.getPrice()};
             searchCriteria.add(criteria);
 
         }

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/TjServiceImpl.java

@@ -387,10 +387,10 @@ public class TjServiceImpl implements TjService {
         }
 
         //查询出来的组织机构进行判断，如果该组织机构下的装备装备总数为0，那么将该组织机构从list中移除
-        if (req.getRemoveEmpty()){
-            tjOrgPriceDtoList.removeIf(tjOrgEqsDto -> tjOrgEqsDto.getStartNum() == 0 && tjOrgEqsDto.getEndNum() == 0
-                    && tjOrgEqsDto.getDestoryNum()==0);
-        }
+//        if (req.getRemoveEmpty()){
+//            tjOrgPriceDtoList.removeIf(tjOrgEqsDto -> tjOrgEqsDto.getStartNum() == 0 && tjOrgEqsDto.getEndNum() == 0
+//                    && tjOrgEqsDto.getDestoryNum()==0);
+//        }
 
         //对组织机构进行排序
         Comparator<TjOrgPriceDto> orgComparator = createOrgComparator();

jyzb-biz/src/main/resources/mapper/LogSummaryMapper.xml

@@ -57,6 +57,7 @@
         GROUP BY months.month, years.year
         ORDER BY year, month;
     </select>
+    <select id="ShowInOutRecords" resultType="com.junmp.jyzb.entity.LogSummary"></select>
 
 
 </mapper>