zhangyuewww преди 3 години
родител
ревизия
7445d3e1b0

+ 3 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/InOutWarehouseTaskServiceImpl.java

@@ -564,6 +564,9 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
      */
     @Override
     public InOutWarehouseTask getContractNo(String compId,String warehouseName){
+        if (compId == null || compId.isEmpty()) {
+            compId = AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getCompId();
+        }
         InOutWarehouseTask inOutWarehouseTask = new InOutWarehouseTask();
         List<InOutWarehouseTask> stringList = inOutWarehouseTaskService.selectList(new EntityWrapper<InOutWarehouseTask>()
                 .eq("comp_id",compId)

+ 5 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WeighingManagementServiceImpl.java

@@ -361,6 +361,11 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
             if (qualityInspectionManagement!=null) {
                 weighingManagement.setQualityInspectionManagement(qualityInspectionManagement);
             }
+            WarehouseInOutDetail warehouseInOutDetail=warehouseInOutDetailService.selectOne(new EntityWrapper<WarehouseInOutDetail>()
+                    .eq("info_id", weighingManagement.getWarehouseInOutId()));
+            if (warehouseInOutDetail!=null){
+                weighingManagement.setInOutDetailId(warehouseInOutDetail.getId());
+            }
             weighingManagement.setCodeUrl(qrCodeUtil.generateQRCodeImage(qualityInspectionManagement.getCompId()+"&"+qualityInspectionManagement.getQualityNo()+"&"+warehouseBaseInfo.getId(),800,800,"",qualityInspectionManagement.getId()));
 
         }